spree_gateway 3.7.4 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ab0991265fe493eef93a0ee098892bd46682c56ab554ae773831ae2b154115b
-  data.tar.gz: ea290e80beadd38e792c4218180bad4a65505ac038e7c5b21e19f0a18d63cb24
+  metadata.gz: b54b6ec2e6137ae258ac3d108c715f3a8bf2e534c8f3ee13946529831fdf6c8e
+  data.tar.gz: 95e413abf6077ee0ed9cf92d260be0ad44de0888334d94b6d60b8b68002e85fd
 SHA512:
-  metadata.gz: 0ce78bd6a8b62af2de0ac1e73abb6844ea16385d3ff121c033070b6c965f1e87e52d7a3eced0d35ced01d127eef3057dd8132f561555ac89780363b179e2e40f
-  data.tar.gz: 9a0ac382a6aa612965f0ad22950ec96a907c069c71a06e8f319987582ad64691cb718bbda349ddd7b7d6accb9bc23f548e43908fb157b692c13395d468c8f96c
+  metadata.gz: b94ebcae1a0004d780547e34f73764093a84ab49a36a6c31bbc5177b7094c6c609a545da6684d262eb65155550c8c6eb1eb528118a1258ef2b090512c862afa7
+  data.tar.gz: 2facdc1ebd849fe10fffb1b2ab0daebef9e90d7178bcad1a29fd3cd896935fc12c2f828dd48e01644557f3abf21320b76402c150ba8399b309fbbc5d9a83a668

data/.travis.yml

@@ -1,51 +1,44 @@
-sudo: required
-dist: trusty
+os: linux
+dist: bionic
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+services:
+  - mysql
+  - postgresql
 
 language: ruby
 
-addons:
-  chrome: stable
-  postgresql: 9.4
+rvm:
+  - 2.6
 
 env:
-  - DB=postgres
   - DB=mysql
+  - DB=postgres
 
 gemfile:
-  - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_4_0.gemfile
+  # - gemfiles/spree_4_1.gemfile
+  - gemfiles/spree_4_2.gemfile
   - gemfiles/spree_master.gemfile
 
-script:
-  - bundle exec rake test_app
-  - bundle exec rake spec
-
-rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.8
-
-matrix:
-    allow_failures:
-      - gemfile: gemfiles/spree_master.gemfile
-    exclude:
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_5.gemfile
+jobs:
+  allow_failures:
+    - gemfile: gemfiles/spree_master.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
-  - unzip ~/chromedriver_linux64.zip -d ~/
-  - rm ~/chromedriver_linux64.zip
-  - sudo mv -f ~/chromedriver /usr/local/share/
-  - sudo chmod +x /usr/local/share/chromedriver
-  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+
+before_script:
+  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
+  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
+  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
+  - unzip chromedriver_linux64.zip -d ~/bin
+
+script:
+  - bundle exec rake test_app
+  - bundle exec rake spec

data/Appraisals

@@ -1,16 +1,10 @@
-appraise 'spree-3-5' do
-  gem 'spree', '~> 3.5.0'
+appraise 'spree-4-1' do
+  gem 'spree', '~> 4.1.0'
   gem 'rails-controller-testing'
 end
 
-appraise 'spree-3-7' do
-  gem 'spree', '~> 3.7.0'
-  gem 'sass-rails'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-4-0' do
-  gem 'spree', '~> 4.0.0.rc2'
+appraise 'spree-4-2' do
+  gem 'spree', '~> 4.2.0.beta'
   gem 'rails-controller-testing'
 end
 

data/app/models/spree/check.rb

@@ -0,0 +1,41 @@
+module Spree
+  class Check < Spree::Base
+
+    attr_accessor :imported
+
+    belongs_to :payment_method
+    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
+               optional: true
+    has_many :payments, as: :source
+
+    scope :with_payment_profile, -> { where.not(gateway_customer_profile_id: nil) }
+
+    validates :account_holder_name, presence: true
+    validates :account_holder_type, presence: true, inclusion: { in: %w[Individual Company] }
+    validates :account_number, presence: true, numericality: { only_integer: true }
+    validates :routing_number, presence: true, numericality: { only_integer: true }
+
+    def has_payment_profile?
+      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
+    end
+
+    def actions
+      %w[capture void credit]
+    end
+
+    def can_capture?(payment)
+      payment.pending? || payment.checkout?
+    end
+
+    # Indicates whether its possible to void the payment.
+    def can_void?(payment)
+      !payment.failed? && !payment.void?
+    end
+
+    # Indicates whether its possible to credit the payment.  Note that most gateways require that the
+    # payment be settled first which generally happens within 12-24 hours of the transaction.
+    def can_credit?(payment)
+      payment.completed? && payment.credit_allowed > 0
+    end
+  end
+end

data/app/models/spree/gateway/stripe_ach_gateway.rb

@@ -0,0 +1,60 @@
+module Spree
+  class Gateway::StripeAchGateway < Gateway::StripeGateway
+
+    def method_type
+      'stripe_ach'
+    end
+
+    def payment_source_class
+      Check
+    end
+
+    def verify(source, **gateway_options)
+      provider.verify(source, gateway_options)
+    end
+
+    def create_profile(payment)
+      return unless payment.source&.gateway_customer_profile_id.nil?
+
+      options = {
+        email: payment.order.user&.email || payment.order.email,
+        login: preferred_secret_key,
+      }.merge! address_for(payment)
+
+      source = payment.source
+      bank_account = if source.gateway_payment_profile_id.present?
+                       source.gateway_payment_profile_id
+                     else
+                       source
+                     end
+
+      response = provider.store(bank_account, options)
+
+      if response.success?
+        payment.source.update!({
+                                 gateway_customer_profile_id: response.params['id'],
+                                 gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
+                               })
+
+      else
+        payment.send(:gateway_error, response.message)
+      end
+    end
+
+    def supports?(_source)
+      true
+    end
+
+    def available_for_order?(order)
+      # Stripe ACH payments are supported only for US customers
+      # Therefore we need to check order's addresses
+      return unless order.ship_address_id && order.bill_address_id
+      return unless order.ship_address && order.bill_address_id
+
+      usa_id = ::Spree::Country.find_by(iso: 'US')&.id
+      return false unless usa_id
+
+      order.ship_address.country_id == usa_id && order.bill_address.country_id == usa_id
+    end
+  end
+end

data/app/models/spree/gateway/stripe_elements_gateway.rb

@@ -1,7 +1,57 @@
 module Spree
   class Gateway::StripeElementsGateway < Gateway::StripeGateway
+    preference :intents, :boolean, default: true
+
     def method_type
       'stripe_elements'
     end
+
+    def provider_class
+      if get_preference(:intents)
+        ActiveMerchant::Billing::StripePaymentIntentsGateway
+      else
+        ActiveMerchant::Billing::StripeGateway
+      end
+    end
+
+    def create_profile(payment)
+      return unless payment.source.gateway_customer_profile_id.nil?
+
+      options = {
+        email: payment.order.email,
+        login: preferred_secret_key
+      }.merge! address_for(payment)
+
+      source = update_source!(payment.source)
+      creditcard = source.gateway_payment_profile_id.present? ? source.gateway_payment_profile_id : source
+      response = provider.store(creditcard, options)
+      if response.success?
+        if get_preference(:intents)
+          payment.source.update!(
+            cc_type: payment.source.cc_type,
+            gateway_customer_profile_id: response.params['id'],
+            gateway_payment_profile_id: response.params['sources']['data'].first['id']
+          )
+        else
+          response_cc_type = response.params['sources']['data'].first['brand']
+          cc_type = CARD_TYPE_MAPPING.include?(response_cc_type) ? CARD_TYPE_MAPPING[response_cc_type] : payment.source.cc_type
+          payment.source.update!({
+            cc_type: cc_type, # side-effect of update_source!
+            gateway_customer_profile_id: response.params['id'],
+            gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
+          })
+        end
+      else
+        payment.send(:gateway_error, response.message)
+      end
+    end
+
+    private
+
+    def options_for_purchase_or_auth(money, creditcard, gateway_options)
+      money, creditcard, options = super
+      options[:execute_threed] = get_preference(:intents)
+      return money, creditcard, options
+    end
   end
 end

data/app/models/spree/gateway/stripe_gateway.rb

@@ -54,6 +54,7 @@ module Spree
 
     def create_profile(payment)
       return unless payment.source.gateway_customer_profile_id.nil?
+
       options = {
         email: payment.order.email,
         login: preferred_secret_key,

data/app/models/spree/order_decorator.rb

@@ -0,0 +1,28 @@
+module Spree
+  module OrderDecorator
+    def self.prepended(base)
+      return if base.checkout_steps.key?(:payment_confirm)
+
+      base.insert_checkout_step(
+        :payment_confirm,
+        before: :complete,
+        if: ->(order) { order.intents? }
+      )
+    end
+
+    def process_payments!
+      # Payments are processed in confirm_payment step where after successful
+      # 3D Secure authentication `intent_client_key` is saved for payment.
+      # In case authentication is unsuccessful, `intent_client_key` is removed.
+      return if intents? && payments.valid.last.intent_client_key.present?
+
+      super
+    end
+
+    def intents?
+      payments.valid.map { |p| p.payment_method&.has_preference?(:intents) && p.payment_method&.get_preference(:intents) }.any?
+    end
+  end
+end
+
+Spree::Order.prepend(Spree::OrderDecorator)

data/app/models/spree/payment_decorator.rb

@@ -0,0 +1,34 @@
+module Spree
+  module PaymentDecorator
+    def handle_response(response, success_state, failure_state)
+      self.intent_client_key = response.params['client_secret'] if response.params['client_secret'] && response.success?
+      super
+    end
+
+    def verify!(**options)
+      process_verification(options)
+    end
+
+    private
+
+    def process_verification(**options)
+      protect_from_connection_error do
+        response = payment_method.verify(source, options)
+
+        record_response(response)
+
+        if response.success?
+          unless response.authorization.nil?
+            self.response_code = response.authorization
+
+            source.update(status: response.params['status'])
+          end
+        else
+          gateway_error(response)
+        end
+      end
+    end
+  end
+end
+
+Spree::Payment.prepend(Spree::PaymentDecorator)

data/app/views/spree/checkout/_payment_confirm.html.erb

@@ -0,0 +1,34 @@
+<div id='errorBox' class='errorExplanation alert alert-danger' style='display:none'></div>
+<div id='successBox' class='alert alert-success' style='display:none'></div>
+<div id='infoBox' class='alert alert-info'><%= t('spree.please_wait_for_confirmation_popup') %></div>
+
+<% if @client_secret.present? && @pk_key.present? %>
+  <script type="text/javascript" src="https://js.stripe.com/v3/"></script>
+  <script>
+    var form = document.getElementById('checkout_form_payment_confirm');
+
+    function confirmCardPaymentResponseHandler(response) {
+      $.post("/api/v2/storefront/intents/handle_response", { response: response, order_token: "<%= @order.token %>" }).done(function (result) {
+        form.elements["commit"].disabled = false;
+        $('#successBox').html(result.message);
+        $('#successBox').show();
+        form.submit();
+      }).fail(function(result) {
+        form.elements["commit"].disabled = false;
+        $('#errorBox').html(result.responseJSON.error);
+        $('#errorBox').show();
+      });
+    }
+
+    var stripeElements = Stripe("<%= @pk_key %>");
+    stripeElements.confirmCardPayment("<%= @client_secret %>").then(function(result) {
+      $('#infoBox').hide();
+      confirmCardPaymentResponseHandler(result);
+    });
+
+    document.addEventListener('DOMContentLoaded', function(){
+      form.elements["commit"].value = "continue"
+      form.elements["commit"].disabled = true
+    });
+  </script>
+<% end %>

data/config/initializers/spree_permitted_attributes.rb

@@ -0,0 +1,5 @@
+module Spree
+  module PermittedAttributes
+    @@source_attributes += %i[account_number routing_number account_holder_type account_holder_name status]
+  end
+end

data/config/locales/en.yml

@@ -1,7 +1,19 @@
 ---
 en:
+  activerecord:
+    attributes:
+      spree/check:
+        account_holder_name: Account Holder Name
+        account_holder_type: Account Holder Type
+        account_number: Account Number
+        routing_number: Routing Number
   spree:
+    check: Check
     payment_has_been_cancelled: The payment has been cancelled.
+    please_wait_for_confirmation_popup: Please wait for payment confirmation popup to appear.
+    payment_successfully_authorized: The payment was successfully authorized.
+    order_state:
+      payment_confirm: Verify payment
     log_entry:
       braintree:
         message: Message
@@ -21,3 +33,14 @@ en:
         cvv_result: CVV Result
         cvc_check: CVC Check
         address_zip_check: Address ZIP check
+    stripe:
+      ach:
+        account_holder_name: Account Holder Name
+        account_holder_type: Account Holder Type
+        routing_number: Routing Number
+        account_number: Account Number
+        verify_account_number: Verify Account Number
+        verify_bank_account: Verify Bank Account
+        first_deposit: First Deposit
+        second_deposit: Second Deposit
+    bank_transfer: bank_transfer

data/config/routes.rb

@@ -4,3 +4,15 @@
 Rails.application.routes.draw do
   get '/.well-known/apple-developer-merchantid-domain-association' => 'spree/apple_pay_domain_verification#show'
 end
+
+Spree::Core::Engine.add_routes do
+  namespace :api, defaults: { format: 'json' } do
+    namespace :v2 do
+      namespace :storefront do
+        namespace :intents do
+          post :handle_response
+        end
+      end
+    end
+  end
+end