solidus_paypal_braintree 0.4.0 → 1.0.0

data/app/models/solidus_paypal_braintree/response.rb

@@ -27,7 +27,7 @@ module SolidusPaypalBraintree
         transaction = result.transaction
         options = response_options(transaction).update(
           # For error responses we want to have the CVV code
-          cvv_result: transaction.try!(:cvv_response_code)
+          cvv_result: transaction&.cvv_response_code
         )
         new(false, error_message(result), result.params, options)
       end
@@ -35,6 +35,7 @@ module SolidusPaypalBraintree
       def response_options(transaction)
         # Some error responses do not have a transaction
         return {} if transaction.nil?
+
         {
           authorization: transaction.id,
           avs_result: SolidusPaypalBraintree::AVSResult.build(transaction),
@@ -67,7 +68,7 @@ module SolidusPaypalBraintree
         when 'settlement_declined'
           I18n.t(transaction.processor_settlement_response_code,
             scope: 'solidus_paypal_braintree.processor_settlement_response_codes',
-            default: "#{transaction.processor_settlement_response_text} (#{transaction.processor_settlement_response_code})")
+            default: "#{transaction.processor_settlement_response_text} (#{transaction.processor_settlement_response_code})") # rubocop:disable Layout/LineLength
         else
           I18n.t(transaction.status,
             scope: 'solidus_paypal_braintree.transaction_statuses',

data/app/models/solidus_paypal_braintree/source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
   class Source < SolidusSupport.payment_source_parent_class
     include RequestProtection
@@ -6,19 +8,25 @@ module SolidusPaypalBraintree
     APPLE_PAY = "ApplePayCard"
     CREDIT_CARD = "CreditCard"
 
-    belongs_to :user, class_name: Spree::UserClassHandle.new
+    belongs_to :user, class_name: ::Spree::UserClassHandle.new, optional: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
-    has_many :payments, as: :source, class_name: "Spree::Payment"
+    has_many :payments, as: :source, class_name: "Spree::Payment", dependent: :destroy
 
-    belongs_to :customer, class_name: "SolidusPaypalBraintree::Customer"
+    belongs_to :customer, class_name: "SolidusPaypalBraintree::Customer", optional: true
 
     validates :payment_type, inclusion: [PAYPAL, APPLE_PAY, CREDIT_CARD]
 
     scope(:with_payment_profile, -> { joins(:customer) })
     scope(:credit_card, -> { where(payment_type: CREDIT_CARD) })
 
-    delegate :last_4, :card_type, to: :braintree_payment_method, allow_nil: true
+    delegate :last_4, :card_type, :expiration_month, :expiration_year, :email,
+      to: :braintree_payment_method, allow_nil: true
+
+    # Aliases to match Spree::CreditCard's interface
     alias_method :last_digits, :last_4
+    alias_method :month, :expiration_month
+    alias_method :year, :expiration_year
+    alias_method :cc_type, :card_type
 
     # we are not currenctly supporting an "imported" flag
     def imported
@@ -35,6 +43,7 @@ module SolidusPaypalBraintree
 
     def can_void?(payment)
       return false unless payment.response_code
+
       transaction = protected_request do
         braintree_client.transaction.find(payment.response_code)
       end
@@ -60,7 +69,7 @@ module SolidusPaypalBraintree
     end
 
     def reusable?
-      true
+      token.present?
     end
 
     def credit_card?
@@ -68,13 +77,18 @@ module SolidusPaypalBraintree
     end
 
     def display_number
-      "XXXX-XXXX-XXXX-#{last_digits.to_s.rjust(4, 'X')}"
+      if paypal?
+        email
+      else
+        "XXXX-XXXX-XXXX-#{last_digits.to_s.rjust(4, 'X')}"
+      end
     end
 
     private
 
     def braintree_payment_method
-      return unless braintree_client && credit_card?
+      return unless braintree_client
+
       @braintree_payment_method ||= protected_request do
         braintree_client.payment_method.find(token)
       end

data/app/models/solidus_paypal_braintree/transaction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 
 module SolidusPaypalBraintree

data/app/models/solidus_paypal_braintree/transaction_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 
 module SolidusPaypalBraintree
@@ -6,11 +8,11 @@ module SolidusPaypalBraintree
     include ActiveModel::Validations::Callbacks
     include SolidusPaypalBraintree::CountryMapper
 
-    attr_accessor :country_code, :last_name, :first_name,
-      :city, :zip, :state_code, :address_line_1, :address_line_2
+    attr_accessor :country_code, :name, :city, :zip, :state_code,
+      :address_line_1, :address_line_2, :first_name, :last_name
 
-    validates :first_name, :last_name, :address_line_1, :city, :zip,
-      :country_code, presence: true
+    validates :address_line_1, :city, :zip, :country_code, presence: true
+    validates :name, presence: true, unless: ->(address){ address.first_name.present? }
 
     before_validation do
       self.country_code = country_code.presence || "us"
@@ -29,25 +31,37 @@ module SolidusPaypalBraintree
     end
 
     def spree_country
-      country_code && (@country ||= Spree::Country.find_by(iso: country_code.upcase))
+      country_code && (@country ||= ::Spree::Country.find_by(iso: country_code.upcase))
     end
 
     def spree_state
-      spree_country && state_code && ( @state ||= spree_country.states.where(
-        Spree::State.arel_table[:name].matches(state_code).or(
-          Spree::State.arel_table[:abbr].matches(state_code)
+      spree_country && state_code && ( @state ||= spree_country.states.find_by(
+        ::Spree::State.arel_table[:name].matches(state_code).or(
+          ::Spree::State.arel_table[:abbr].matches(state_code)
         )
-      ).first )
+      ))
     end
 
     def to_spree_address
-      address = Spree::Address.new first_name: first_name,
-        last_name: last_name,
+      address = ::Spree::Address.new(
         city: city,
         country: spree_country,
         address1: address_line_1,
         address2: address_line_2,
         zipcode: zip
+      )
+
+      if !first_name.nil?
+        ::Spree::Deprecation.warn("first_name and last_name are deprecated. Use name instead.", caller)
+        address.first_name = first_name
+        address.last_name = last_name || "(left blank)"
+      elsif address.respond_to? :name
+        address.name = name
+      else
+        first_name, last_name = split_name(name)
+        address.first_name = first_name
+        address.last_name = last_name || "(left blank)"
+      end
 
       if spree_state
         address.state = spree_state
@@ -57,9 +71,13 @@ module SolidusPaypalBraintree
       address
     end
 
+    def split_name(name)
+      name.strip.split(' ', 2)
+    end
+
     # Check to see if this address should match to a state model in the database
     def should_match_state_model?
-      spree_country.try!(:states_required?)
+      spree_country&.states_required?
     end
   end
 end

data/app/models/solidus_paypal_braintree/transaction_import.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 
 module SolidusPaypalBraintree
@@ -25,19 +27,19 @@ module SolidusPaypalBraintree
     end
 
     def source
-      SolidusPaypalBraintree::Source.new nonce: transaction.nonce,
+      SolidusPaypalBraintree::Source.new(
+        nonce: transaction.nonce,
         payment_type: transaction.payment_type,
         payment_method: transaction.payment_method,
         user: user
+      )
     end
 
-    def user
-      order.user
-    end
+    delegate :user, to: :order
 
     def import!(end_state, restart_checkout: false)
       if valid?
-        order.email = user.try!(:email) || transaction.email
+        order.email = user&.email || transaction.email
 
         if address
           order.shipping_address = order.billing_address = address
@@ -46,9 +48,11 @@ module SolidusPaypalBraintree
           order.instance_variable_set("@tax_zone", nil)
         end
 
-        payment = order.payments.new source: source,
+        payment = order.payments.new(
+          source: source,
           payment_method: transaction.payment_method,
           amount: order.total
+        )
 
         order.save!
         order.restart_checkout_flow if restart_checkout
@@ -85,9 +89,9 @@ module SolidusPaypalBraintree
       payment_total = order.payments.where(state: %w[checkout pending]).sum(:amount)
       payment_difference = order.outstanding_balance - payment_total
 
-      if payment_difference != 0
-        payment.update!(amount: payment.amount + payment_difference)
-      end
+      return unless payment_difference != 0
+
+      payment.update!(amount: payment.amount + payment_difference)
     end
   end
 end

data/app/views/spree/api/payments/source_views/_paypal_braintree.json.jbuilder

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.call(payment_source, :id, :token, :created_at)

data/app/views/spree/checkout/existing_payment/_paypal_braintree.html.erb

@@ -0,0 +1,10 @@
+<tr id="<%= dom_id(wallet_payment_source, 'spree')%>" class="<%= cycle('even', 'odd') %>">
+  <td>
+    <%= radio_button_tag "order[wallet_payment_source_id]",
+                          wallet_payment_source.id,
+                          default,
+                          class: "existing-cc-radio" %>
+  </td>
+  <td><%= wallet_payment_source.payment_source.friendly_payment_type %></td>
+  <td><%= wallet_payment_source.payment_source.display_number %></td>
+</tr>

data/app/views/spree/shared/_apple_pay_button.html.erb

@@ -11,8 +11,8 @@
     amount: "<%= current_order.total %>",
     shippingContact: {
       emailAddress: '<%= current_order.email %>',
-      familyName: '<%= address.firstname %>',
-      givenName: '<%= address.lastname %>',
+      givenName: '<%= address.firstname %>',
+      familyName: '<%= address.lastname %>',
       phoneNumber: '<%= address.phone %>',
       addressLines: ['<%= address.address1 %>','<%= address.address2 %>'],
       locality: '<%= address.city %>',

data/app/views/spree/shared/_braintree_errors.html.erb

@@ -1,19 +1,13 @@
 <script type="text/javascript">
-  BraintreeError = {
-    HOSTED_FIELDS_FIELDS_EMPTY: "<%= I18n.t('solidus_paypal_braintree.errors.empty_fields')%>",
-    HOSTED_FIELDS_FIELDS_INVALID: "<%= I18n.t('solidus_paypal_braintree.errors.invalid_fields')%>",
-    HOSTED_FIELDS_FAILED_TOKENIZATION: "<%= I18n.t('solidus_paypal_braintree.errors.invalid_card')%>",
-    HOSTED_FIELDS_TOKENIZATION_NETWORK_ERROR: "<%= I18n.t('solidus_paypal_braintree.errors.network_error')%>",
-    HOSTED_FIELDS_FIELD_DUPLICATE_IFRAME: "<%= I18n.t('solidus_paypal_braintree.errors.duplicate_iframe')%>",
-    HOSTED_FIELDS_TOKENIZATION_FAIL_ON_DUPLICATE: "<%= I18n.t('solidus_paypal_braintree.errors.fail_on_duplicate')%>",
-    HOSTED_FIELDS_TOKENIZATION_CVV_VERIFICATION_FAILED: "<%= I18n.t('solidus_paypal_braintree.errors.cvv_verification_failed')%>",
-
-    getErrorFromSlug: function(slug) {
-      // Default error message
-      error = "<%= I18n.t('solidus_paypal_braintree.errors.default_error')%>"
-      if (slug in BraintreeError)
-        error = BraintreeError[slug]
-      return error
-    }
-  }
+  BraintreeError.DEFAULT = "<%= I18n.t('solidus_paypal_braintree.errors.default_error')%>"
+  BraintreeError.PAYPAL_POPUP_CLOSED = "<%= I18n.t('solidus_paypal_braintree.errors.paypal_popup_closed') %>"
+  BraintreeError.HOSTED_FIELDS_FIELDS_EMPTY = "<%= I18n.t('solidus_paypal_braintree.errors.empty_fields')%>"
+  BraintreeError.HOSTED_FIELDS_FIELDS_INVALID = "<%= I18n.t('solidus_paypal_braintree.errors.invalid_fields')%>"
+  BraintreeError.HOSTED_FIELDS_FAILED_TOKENIZATION = "<%= I18n.t('solidus_paypal_braintree.errors.invalid_card')%>"
+  BraintreeError.HOSTED_FIELDS_TOKENIZATION_NETWORK_ERROR = "<%= I18n.t('solidus_paypal_braintree.errors.network_error')%>"
+  BraintreeError.HOSTED_FIELDS_FIELD_DUPLICATE_IFRAME = "<%= I18n.t('solidus_paypal_braintree.errors.duplicate_iframe')%>"
+  BraintreeError.HOSTED_FIELDS_TOKENIZATION_FAIL_ON_DUPLICATE = "<%= I18n.t('solidus_paypal_braintree.errors.fail_on_duplicate')%>"
+  BraintreeError.HOSTED_FIELDS_TOKENIZATION_CVV_VERIFICATION_FAILED = "<%= I18n.t('solidus_paypal_braintree.errors.cvv_verification_failed')%>"
+  BraintreeError.THREEDS_AUTHENTICATION_FAILED = "<%= t('solidus_paypal_braintree.errors.threeds.authentication_failed') %>";
+  BraintreeError.THREEDS_CARDINAL_SDK_ERROR = "<%= t('solidus_paypal_braintree.errors.threeds.authentication_failed') %>";
 </script>

data/app/views/spree/shared/_braintree_hosted_fields.html.erb

@@ -1,24 +1,30 @@
-<% prefix = "payment_source[#{id}]" %>
+<% if defined?(id) && !defined?(payment_method) %>
+  <% payment_method = Spree::PaymentMethod.find(id) %>
+  <% Spree::Deprecation.warn(
+    "passing id to _braintree_hosted_fields.html.erb is deprecated. Please pass the payment_method directly.",
+    caller
+  ) %>
+<% end %>
 
-<%= render partial: "spree/shared/braintree_errors" %>
+<% prefix = "payment_source[#{payment_method.id}]" %>
 
 <div class="hosted-fields">
   <div class="field" data-hook="card_number">
-    <%= label_tag "card_number#{id}", Spree::CreditCard.human_attribute_name(:number), class: "required" %>
-    <div class="input" id="card_number<%= id %>"></div>
+    <%= label_tag "card_number#{payment_method.id}", Spree::CreditCard.human_attribute_name(:number), class: "required" %>
+    <div class="input" id="card_number<%= payment_method.id %>"></div>
   </div>
 
   <div class="field" data-hook="card_expiration">
-    <%= label_tag "card_expiry#{id}", Spree::CreditCard.human_attribute_name(:expiration), class: "required" %>
-    <div class="input" id="card_expiry<%= id %>"></div>
+    <%= label_tag "card_expiry#{payment_method.id}", Spree::CreditCard.human_attribute_name(:expiration), class: "required" %>
+    <div class="input" id="card_expiry<%= payment_method.id %>"></div>
   </div>
 
   <div class="field" data-hook="card_code">
-    <%= label_tag "card_code#{id}", Spree::CreditCard.human_attribute_name(:card_code), class: "required" %>
-    <div class="input" id="card_code<%= id %>"></div>
+    <%= label_tag "card_code#{payment_method.id}", Spree::CreditCard.human_attribute_name(:card_code), class: "required" %>
+    <div class="input" id="card_code<%= payment_method.id %>"></div>
 
     <a href="/content/cvv" class="info cvvLink" target="_blank">
-      (<%= Spree.t(:what_is_this) %>)
+      (<%= I18n.t("spree.what_is_this") %>)
     </a>
   </div>
 
@@ -26,3 +32,12 @@
   <input type="hidden" name="<%= prefix %>[payment_type]" value="<%= SolidusPaypalBraintree::Source::CREDIT_CARD %>">
   <input type="hidden" id="payment_method_nonce" name="<%= prefix %>[nonce]">
 </div>
+
+
+<script>
+  <% if current_store.braintree_configuration.three_d_secure? %>
+    var threeDSecureOptions = <%= raw braintree_3ds_options_for(current_order).to_json %>;
+  <% end -%>
+  var credit_card_fields_style = <%= raw payment_method.preferred_credit_card_fields_style.to_json %>
+  var placeholder_text = <%= raw payment_method.preferred_placeholder_text.to_json %>
+</script>

data/app/views/spree/shared/_paypal_braintree_head_scripts.html.erb

@@ -1,18 +1,21 @@
 <% content_for :head do %>
-  <script src="https://js.braintreegateway.com/web/3.34.0/js/client.min.js"></script>
-  <script src="https://js.braintreegateway.com/web/3.34.0/js/data-collector.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.67.0/js/client.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.67.0/js/data-collector.min.js"></script>
 
   <% if current_store.braintree_configuration.paypal? %>
-    <script src="https://js.braintreegateway.com/web/3.34.0/js/paypal-checkout.min.js"></script>
-    <script src="https://www.paypalobjects.com/api/checkout.js" data-version-4></script>
+    <script src="https://js.braintreegateway.com/web/3.67.0/js/paypal-checkout.min.js"></script>
   <% end %>
 
   <% if current_store.braintree_configuration.credit_card? %>
-    <script src="https://js.braintreegateway.com/web/3.34.0/js/hosted-fields.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.67.0/js/hosted-fields.min.js"></script>
+
+    <% if current_store.braintree_configuration.three_d_secure? %>
+      <script src="https://js.braintreegateway.com/web/3.67.0/js/three-d-secure.min.js"></script>
+    <% end %>
   <% end %>
 
   <% if current_store.braintree_configuration.apple_pay? %>
-    <script src="https://js.braintreegateway.com/web/3.34.0/js/apple-pay.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.67.0/js/apple-pay.min.js"></script>
   <% end %>
 
   <%= javascript_include_tag "solidus_paypal_braintree/checkout" %>

data/app/views/spree/shared/_paypal_cart_button.html.erb

@@ -1,12 +1,26 @@
 <%= render "spree/shared/paypal_braintree_head_scripts" %>
 
 <div id="paypal-button"></div>
+<div data-pp-message data-pp-placement="payment" data-pp-amount="<%= current_order.total %>"></div>
 
 <script>
   var paypalOptions = {
-    flow: 'vault',
+    flow: '<%= SolidusPaypalBraintree::Gateway.first.preferred_paypal_flow %>',
+    amount: '<%= current_order.total %>',
+    currency: '<%= current_order.currency %>',
     enableShippingAddress: true,
-    environment: '<%= Rails.env.production? ? "production" : "sandbox" %>'
+    environment: '<%= Rails.env.production? ? "production" : "sandbox" %>',
+    locale: '<%= paypal_button_preference(:paypal_button_locale, store: current_store) %>',
+    style: {
+      color: '<%= paypal_button_preference(:paypal_button_color, store: current_store) %>',
+      shape: '<%= paypal_button_preference(:paypal_button_shape, store: current_store) %>',
+      label: '<%= paypal_button_preference(:paypal_button_label, store: current_store) %>',
+      layout: '<%= paypal_button_preference(:paypal_button_layout, store: current_store) %>',
+      <% if paypal_button_preference(:paypal_button_layout, store: current_store) == "horizontal" %>
+        tagline: '<%= paypal_button_preference(:paypal_button_tagline, store: current_store) %>',
+      <% end %>
+      messaging: '<%= paypal_button_preference(:paypal_button_messaging, store: current_store) %>'
+    }
   }
   var options = {
     restart_checkout: true

data/app/views/spree/shared/_paypal_messaging.html.erb

@@ -0,0 +1,13 @@
+<%= render "spree/shared/paypal_braintree_head_scripts" %>
+
+<div data-pp-message data-pp-placement="<%= options[:placement] %>" data-pp-amount="<%= options[:total] %>"></div>
+
+<script>
+  var message = new SolidusPaypalBraintree.createPaypalMessaging(
+    {
+      currency: "<%= options[:currency] %>"
+    }
+  )
+
+  message.initialize();
+</script>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_paypal_braintree"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+app_root = 'spec/dummy'
+
+unless File.exist? "#{app_root}/bin/rails"
+  system "bin/rake", app_root or begin
+    warn "Automatic creation of the dummy app failed"
+    exit 1
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV