spree_gateway 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1e911eb84eec86826be7b64e8d94b6105b1cee6eee6b6850d2629b0fba1eb9
-  data.tar.gz: a36fcdaff09f3f3e15db2af4bbec15e1625b6bf36cd41c8a45d4b1c93b51e393
+  metadata.gz: '015491170e10b6b22d98da98f5b8e466ae2df12474e5029bff6bd8926d86732e'
+  data.tar.gz: 39713d557a03b1170dc36f4fcf4a6ec2e4fecb45b3a80376b00a23fd396c200b
 SHA512:
-  metadata.gz: 7e92f44b23f2b004564ad303d0c5f67bd312e5d921c3e61235bd48748486624df87866f5bbba7b128fd626c301bb0778f25b22798d804d397f6f9351fd5af946
-  data.tar.gz: 920f697c64fa5290ec1a6bb08a52295365665a86afaa93802a31b91061e8543fd7632c57afd059d0aefc1a8b453798e1e2e11f7c743e2ea81139458965c57eb4
+  metadata.gz: c9d5003e95dc31701dbea5239a10dc587300d27659f29ea6deba81a309df2d24729ec3259d253d99f4c327c7f8889bc52b28dc8015d785fbde376a128d05a6f1
+  data.tar.gz: 11a5083fba9163eabd567cef8173d949d6f6ac5b86a97f3c65281671d3fd82f6ed93d2f4626c2ac39e7ae71d16cc559735a9d5eb4024960041a1ba2128997ba8

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/README.md

@@ -36,30 +36,19 @@ For`PayPal` support head over to [braintree_vzero](https://github.com/spree-cont
 
 1. Add this extension to your Gemfile with this line:
 
-  #### Spree >= 3.1
-
-  ```ruby
-  gem 'spree_gateway', '~> 3.3'
-  ```
-
-  #### Spree 3.0 and Spree 2.x
-
-  ```ruby
-  gem 'spree_gateway', github: 'spree/spree_gateway', branch: 'X-X-stable'
-  ```
-
-  The `branch` option is important: it must match the version of Spree you're using.
-  For example, use `3-0-stable` if you're using Spree `3-0-stable` or any `3.0.x` version.
+    ```ruby
+    gem 'spree_gateway', '~> 3.7'
+    ```
 
 2. Install the gem using Bundler:
-  ```ruby
-  bundle install
-  ```
+    ```ruby
+    bundle install
+    ```
 
 3. Copy & run migrations
-  ```ruby
-  bundle exec rails g spree_gateway:install
-  ```
+    ```ruby
+    bundle exec rails g spree_gateway:install
+    ```
 
 Finally, make sure to **restart your app**. Navigate to *Configuration > Payment Methods > New Payment Method* in the admin panel and you should see that a bunch of additional gateways have been added to the list.
 

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/payment_decorator.rb

@@ -0,0 +1,29 @@
+module Spree
+  module PaymentDecorator
+    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/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,6 +1,14 @@
 ---
 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.
     log_entry:
       braintree:
@@ -21,3 +29,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/db/migrate/20200317135551_add_spree_check_payment_source.rb

@@ -0,0 +1,22 @@
+class AddSpreeCheckPaymentSource < ActiveRecord::Migration[5.1]
+  def change
+    create_table :spree_checks do |t|
+      t.references :payment_method
+      t.references :user
+      t.string "account_holder_name"
+      t.string "account_holder_type"
+      t.string "routing_number"
+      t.string "account_number"
+      t.string "account_type", default: 'checking'
+      t.string "status"
+      t.string "last_digits"
+      t.string "gateway_customer_profile_id"
+      t.string "gateway_payment_profile_id"
+
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.datetime "deleted_at"
+    end
+    add_index :spree_payment_methods, :id
+  end
+end

data/gemfiles/{spree_3_2.gemfile → spree_4_1.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.2.0"
+gem "spree", "~> 4.1.0"
 
 gemspec path: "../"

data/gemfiles/{spree_3_5.gemfile → spree_4_2.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.5.0"
+gem "spree", "~> 4.2.0.beta"
 
 gemspec path: "../"

data/lib/active_merchant/billing/stripe_gateway_decorator.rb

@@ -1,6 +1,19 @@
 module ActiveMerchant
   module Billing
     module StripeGatewayDecorator
+      def verify(source, **options)
+        customer = source.gateway_customer_profile_id
+        bank_account_token = source.gateway_payment_profile_id
+
+        commit(:post, "customers/#{CGI.escape(customer)}/sources/#{bank_account_token}/verify", amounts: options[:amounts])
+      end
+
+      def retrieve(source, **options)
+        customer = source.gateway_customer_profile_id
+        bank_account_token = source.gateway_payment_profile_id
+        commit(:get, "customers/#{CGI.escape(customer)}/bank_accounts/#{bank_account_token}")
+      end
+
       private
 
       def headers(options = {})

data/lib/controllers/spree/apple_pay_domain_verification_controller.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ApplePayDomainVerificationController < Spree::BaseController
+  class ApplePayDomainVerificationController < ::ActionController::Base
     def show
       gateway = Spree::Gateway::StripeApplePayGateway.active.last
 

data/lib/spree_gateway/engine.rb

@@ -32,6 +32,7 @@ module SpreeGateway
       app.config.spree.payment_methods << Spree::Gateway::StripeGateway
       app.config.spree.payment_methods << Spree::Gateway::StripeElementsGateway
       app.config.spree.payment_methods << Spree::Gateway::StripeApplePayGateway
+      app.config.spree.payment_methods << Spree::Gateway::StripeAchGateway
       app.config.spree.payment_methods << Spree::Gateway::UsaEpayTransaction
       app.config.spree.payment_methods << Spree::Gateway::Worldpay
     end

data/lib/spree_gateway/version.rb

@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.7.1'
+    '3.8.0'
   end
 end

data/lib/views/backend/spree/admin/payments/source_forms/_stripe_ach.html.erb

@@ -0,0 +1,86 @@
+<fieldset data-id="bank_transfer">
+  <div id="bank_transfer_form<%= payment_method.id %>" class="margint" data-hook>
+    <% param_prefix = "payment_source[#{payment_method.id}]" %>
+
+    <div data-hook="account_holder_name" class="form-group">
+      <%= label_tag "account_holder_name#{payment_method.id}", raw(Spree.t('stripe.ach.account_holder_name') + required_span_tag) %>
+      <%= text_field_tag "#{param_prefix}[account_holder_name]", '', class: 'required form-control', id: "account_holder_name#{payment_method.id}" %>
+    </div>
+
+    <div data-hook="account_holder_type">
+      <%= label_tag "account_holder_type#{payment_method.id}", raw(Spree.t('stripe.ach.account_holder_type') + required_span_tag) %>
+      <%= select_tag "#{param_prefix}[account_holder_type]", options_for_select(%w(Individual Company)), {id: "account_holder_type#{payment_method.id}", class: 'required form-control'} %>
+    </div>
+
+    <div data-hook="routing_number">
+      <%= label_tag "routing_number#{payment_method.id}", raw(Spree.t('stripe.ach.routing_number') + required_span_tag)%>
+      <%= text_field_tag "#{param_prefix}[routing_number]", '', class: 'required form-control', id: "routing_number#{payment_method.id}", maxlength: 9 %>
+    </div>
+    <div data-hook="account_number">
+      <%= label_tag "account_number#{payment_method.id}", raw(Spree.t('stripe.ach.account_number') + required_span_tag) %>
+      <%= text_field_tag "#{param_prefix}[account_number]", '', class: 'required form-control', id: "account_number#{payment_method.id}" %>
+    </div>
+    <div data-hook="account_number">
+      <%= label_tag "verify_account_number#{payment_method.id}", raw(Spree.t('stripe.ach.verify_account_number') + required_span_tag) %>
+      <%= text_field_tag "#{param_prefix}[verify_account_number]", '', class: 'required form-control', id: "verify_account_number#{payment_method.id}" %>
+    </div>
+  </div>
+</fieldset>
+
+<script type="text/javascript" src="https://js.stripe.com/v3/"></script>
+<script type="text/javascript">
+    var stripe = Stripe("<%= payment_method.preferred_publishable_key %>");
+</script>
+
+<script>
+    stripeResponseHandler = function(response) {
+        var token, paymentMethodId;
+        if (response.error) {
+            $('#stripeError').html(response.error.message);
+            const param_map = {
+                account_holder_name: '#account_holder_name',
+                account_holder_type: '#account_holder_type',
+                account_number: '#account_number',
+                routing_number: '#routing_number'
+            }
+            if (response.error.param){
+                errorField = Spree.stripePaymentMethod.find(param_map[response.error.param])
+                errorField.addClass('error');
+                errorField.parent().addClass('has-error');
+            }
+            return $('#stripeError').show();
+        } else {
+            Spree.stripePaymentMethod.find('#account_holder_name, #account_holder_type, #account_number, #routing_number').prop("disabled", true);
+            token = response.token['id'];
+            paymentMethodId = Spree.stripePaymentMethod.prop('id').split("_")[2];
+            Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][gateway_payment_profile_id]' value='" + token + "'/>");
+            return Spree.stripePaymentMethod.parents("form").trigger('submit');
+        }
+    };
+
+    window.addEventListener('DOMContentLoaded', function() {
+        Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+        Spree.ready(function() {
+            Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+            return $('#new_payment [data-hook=buttons]').click(function() {
+                var params;
+                $('#stripeError').hide();
+                Spree.stripePaymentMethod.find('#account_holder_name, #account_holder_type, #account_number, #routing_number').removeClass('error');
+                if (Spree.stripePaymentMethod.is(':visible')) {
+                    params = $.extend({
+                        country: 'US',
+                        currency: 'usd',
+                        account_holder_name: $('.account_holder_name:visible').val(),
+                        account_holder_type: $('.account_holder_type:visible').val(),
+                        routing_number: $('.routing_number:visible').val(),
+                        account_number: $('.account_number:visible').val()
+                    }, Spree.stripeAdditionalInfo);
+                    stripe.createToken('bank_account', params).then(stripeResponseHandler);
+                    return false;
+                }
+            });
+        });
+    });
+</script>
+