solidus_paypal_braintree 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b312aa57cfc45563e9144f43afd85c8f948de70
-  data.tar.gz: 21c6f9335713d620391a3b88dfd0a547bcc3c972
+  metadata.gz: 76631d8678366736ecdab190121377841bafa0df
+  data.tar.gz: bcc44b77f8ad9172d850676dd1784c7e43bad1cc
 SHA512:
-  metadata.gz: 2ece71d9f4adef4898506c4394ff4325a6718f26f0cb3bb9df8cd06922797a024f0fb522e31855586d6adcffcd4168fd94b7618dc4dd533a79dde7d4507fac1b
-  data.tar.gz: 4dadbe474742f3250c38e4bd1be205601c3334d532a67a4b38011dd2be2c8d855e8b77840e83d4e694884874d9c8eb07dbd8e17cb1f83aeb4014467bf3269891
+  metadata.gz: 75c8efca91fcd54a20d88e3e8c09e9c9d45bc14fe2bd662a9cb01cc4b6ff6fcf10c406447ef833246d508850e4e8c1f34e39970d5057d6817f4477ffb0a22dde
+  data.tar.gz: ea6ffff49064914e97b69f08ceaaeadc809b3154cbaccea3f771000f225ac84fe6fd6b267bde462f63f3408bb6c23d6b32dc0fddfac75bb9fa3c07a8e99352f0

data/README.md

@@ -37,25 +37,30 @@ Tokenization Keys, Encryption Keys** section.
 Payment methods can accept preferences either directly entered in admin, or from a static source in code. For most projects we recommend using a static source, so that sensitive account credentials are not stored in the database.
 
 1. Set static preferences in an initializer
-```ruby
-# config/initializers/spree.rb
-Spree::Config.configure do |config|
-  config.static_model_preferences.add(
-    SolidusPaypalBraintree::Gateway,
-    'braintree_credentials', {
-      environment: Rails.env.production? ? 'production' : 'sandbox',
-      merchant_id: ENV['BRAINTREE_MERCHANT_ID'],
-      public_key: ENV['BRAINTREE_PUBLIC_KEY'],
-      private_key: ENV['BRAINTREE_PRIVATE_KEY']
-    }
-  )
-end
-```
-Other optional preferences are discussed below.
+  ```ruby
+  # config/initializers/spree.rb
+  Spree::Config.configure do |config|
+    config.static_model_preferences.add(
+      SolidusPaypalBraintree::Gateway,
+      'braintree_credentials', {
+        environment: Rails.env.production? ? 'production' : 'sandbox',
+        merchant_id: ENV['BRAINTREE_MERCHANT_ID'],
+        public_key: ENV['BRAINTREE_PUBLIC_KEY'],
+        private_key: ENV['BRAINTREE_PRIVATE_KEY']
+      }
+    )
+  end
+  ```
+  Other optional preferences are discussed below.
+
 2. Visit `/admin/payment_methods/new`
+
 3. Set `provider` to SolidusPaypalBraintree::Gateway
+
 4. Click "Save"
+
 5. Choose `braintree_credentials` from the `Preference Source` select
+
 6. Click `Update` to save
 
 Alternatively, create a payment method from the Rails console with:
@@ -68,24 +73,27 @@ SolidusPaypalBraintree::Gateway.new(
 
 ### Configure payment types
 Your payment method can accept payments in three ways: through Paypal, through ApplePay, or with credit card details entered directly by the customer. By default all are disabled for all your site's stores.
+
 1. Visit /solidus_paypal_braintree/configurations/list
+
 2. Check the payment types you'd like to accept. If your site has multiple stores, there'll be a set of checkboxes for each.
+
 3. Click `Save changes` to save
 
-Or from the console:
-```ruby
-Spree::Store.all.each do |store|
-  store.create_braintree_configuration(
-    credit_card: true,
-    paypal: true,
-    apple_pay: true
-  )
-end
-```
+  Or from the console:
+  ```ruby
+  Spree::Store.all.each do |store|
+    store.create_braintree_configuration(
+      credit_card: true,
+      paypal: true,
+      apple_pay: true
+    )
+  end
+  ```
 
-3. If your site uses an unmodified `solidus_frontend`, it should now be ready to take payments. See below for more information on configuring Paypal and ApplePay.
+4. If your site uses an unmodified `solidus_frontend`, it should now be ready to take payments. See below for more information on configuring Paypal and ApplePay.
 
-4. Typical Solidus sites will have customized frontend code, and may require some additional work. Use `lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb` and `app/assets/javascripts/solidus_paypal_braintree/checkout.js` as models.
+5. Typical Solidus sites will have customized frontend code, and may require some additional work. Use `lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb` and `app/assets/javascripts/solidus_paypal_braintree/checkout.js` as models.
 
 ## Apple Pay
 ### Developing with Apple Pay
@@ -101,7 +109,7 @@ The following is a relatively bare-bones implementation to enable Apple Pay on t
 
 ```html
 <% if current_store.braintree_configuration.apple_pay? %>
-  <script src="https://js.braintreegateway.com/web/3.14.0/js/apple-pay.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.22.1/js/apple-pay.min.js"></script>
 
   <button id="apple-pay-button" class="apple-pay-button"></button>
 
@@ -131,7 +139,7 @@ The following is a relatively bare-bones implementation to enable Apple Pay on t
 <% end %>
 ```
 
-### Further information
+### Further Apple Pay information
 Braintree has some [excellent documentation](https://developers.braintreepayments.com/guides/apple-pay/configuration/javascript/v3) on what you'll need to do to get Apple Pay up and running.
 
 For additional information check out [Apple's documentation](https://developer.apple.com/reference/applepayjs/) and [Braintree's documentation](https://developers.braintreepayments.com/guides/apple-pay/client-side/javascript/v3).

data/app/assets/javascripts/solidus_paypal_braintree/constants.js

@@ -9,11 +9,8 @@ SolidusPaypalBraintree = {
 
     // Override to provide your own error messages.
     braintreeErrorHandle: function(braintreeError) {
-      var $contentContainer = $("#content");
-      var $flash = $("<div class='flash error'>" + braintreeError.name + ": " + braintreeError.message + "</div>");
-      $contentContainer.prepend($flash);
-
-      $flash.show().delay(5000).fadeOut(500);
+      BraintreeError.getErrorFromSlug(braintreeError.code);
+      SolidusPaypalBraintree.showError(error);
     },
 
     classes: {
@@ -35,6 +32,13 @@ SolidusPaypalBraintree = {
     }
   },
 
+  showError: function(error) {
+    var $contentContainer = $("#content");
+    var $flash = $("<div class='flash error'>" + error + "</div>");
+    $contentContainer.prepend($flash);
+    $flash.show().delay(5000).fadeOut(500);
+  },
+
   createHostedForm: function() {
     return SolidusPaypalBraintree._factory(SolidusPaypalBraintree.config.classes.hostedForm(), arguments);
   },

data/app/assets/javascripts/solidus_paypal_braintree/paypal_button.js

@@ -91,24 +91,27 @@ SolidusPaypalBraintree.PaypalButton.prototype._transactionParams = function(payl
  * @param {object} payload - The payload returned by Braintree after tokenization
  */
 SolidusPaypalBraintree.PaypalButton.prototype._addressParams = function(payload) {
-  if (payload.details.shippingAddress.recipientName) {
-    var first_name = payload.details.shippingAddress.recipientName.split(" ")[0];
-    var last_name = payload.details.shippingAddress.recipientName.split(" ")[1];
+  var first_name, last_name;
+  var payload_address = payload.details.shippingAddress || payload.details.billingAddress;
+
+  if (payload_address.recipientName) {
+    first_name = payload_address.recipientName.split(" ")[0];
+    last_name = payload_address.recipientName.split(" ")[1];
   }
-  if (first_name == null || last_name == null) {
-    var first_name = payload.details.firstName;
-    var last_name = payload.details.lastName;
+
+  if (!first_name || !last_name) {
+    first_name = payload.details.firstName;
+    last_name = payload.details.lastName;
   }
 
   return {
     "first_name" : first_name,
     "last_name" : last_name,
-    "address_line_1" : payload.details.shippingAddress.line1,
-    "address_line_2" : payload.details.shippingAddress.line2,
-    "city" : payload.details.shippingAddress.city,
-    "state_code" : payload.details.shippingAddress.state,
-    "zip" : payload.details.shippingAddress.postalCode,
-    "country_code" : payload.details.shippingAddress.countryCode
-  }
+    "address_line_1" : payload_address.line1,
+    "address_line_2" : payload_address.line2,
+    "city" : payload_address.city,
+    "state_code" : payload_address.state,
+    "zip" : payload_address.postalCode,
+    "country_code" : payload_address.countryCode
+  };
 };
-

data/app/assets/javascripts/spree/backend/solidus_paypal_braintree.js

@@ -68,8 +68,8 @@ $(function() {
   if (!$paymentForm.length || !$hostedFields.length) { return; }
 
   $.when(
-    $.getScript("https://js.braintreegateway.com/web/3.9.0/js/client.min.js"),
-    $.getScript("https://js.braintreegateway.com/web/3.9.0/js/hosted-fields.min.js")
+    $.getScript("https://js.braintreegateway.com/web/3.22.1/js/client.min.js"),
+    $.getScript("https://js.braintreegateway.com/web/3.22.1/js/hosted-fields.min.js")
   ).done(function() {
     $hostedFields.each(function() {
       var $this = $(this),

data/app/assets/javascripts/spree/frontend/paypal_button.js

@@ -3,9 +3,9 @@
 $(document).ready(function() {
   if (document.getElementById("empty-cart")) {
     $.when(
-      $.getScript("https://js.braintreegateway.com/web/3.14.0/js/client.min.js"),
-      $.getScript("https://js.braintreegateway.com/web/3.14.0/js/paypal.min.js"),
-      $.getScript("https://js.braintreegateway.com/web/3.14.0/js/data-collector.min.js")
+      $.getScript("https://js.braintreegateway.com/web/3.22.1/js/client.min.js"),
+      $.getScript("https://js.braintreegateway.com/web/3.22.1/js/paypal.min.js"),
+      $.getScript("https://js.braintreegateway.com/web/3.22.1/js/data-collector.min.js")
     ).done(function() {
       $('<script/>').attr({
         'data-merchant' : "braintree",

data/app/models/solidus_paypal_braintree/avs_result.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'active_merchant/billing/avs_result'
+
+module SolidusPaypalBraintree
+  class AVSResult < ActiveMerchant::Billing::AVSResult
+    # Mapping took from ActiveMerchant::Billing::BraintreeBlueGateway
+    AVS_MAPPING = {
+      'M' => {
+        'M' => 'M',
+        'N' => 'A',
+        'U' => 'B',
+        'I' => 'B',
+        'A' => 'B'
+      },
+      'N' => {
+        'M' => 'Z',
+        'N' => 'C',
+        'U' => 'C',
+        'I' => 'C',
+        'A' => 'C'
+      },
+      'U' => {
+        'M' => 'P',
+        'N' => 'N',
+        'U' => 'I',
+        'I' => 'I',
+        'A' => 'I'
+      },
+      'I' => {
+        'M' => 'P',
+        'N' => 'C',
+        'U' => 'I',
+        'I' => 'I',
+        'A' => 'I'
+      },
+      'A' => {
+        'M' => 'P',
+        'N' => 'C',
+        'U' => 'I',
+        'I' => 'I',
+        'A' => 'I'
+      },
+      nil => { nil => nil }
+    }.freeze
+
+    class << self
+      private :new
+
+      def build(transaction)
+        new(
+          code: avs_code_from(transaction),
+          street_match: transaction.avs_street_address_response_code,
+          postal_match: transaction.avs_postal_code_response_code
+        )
+      end
+
+      private
+
+      def avs_code_from(transaction)
+        transaction.avs_error_response_code ||
+          AVS_MAPPING[transaction.avs_street_address_response_code][transaction.avs_postal_code_response_code]
+      end
+    end
+  end
+end

data/app/models/solidus_paypal_braintree/gateway.rb

@@ -2,6 +2,11 @@ require 'braintree'
 
 module SolidusPaypalBraintree
   class Gateway < ::Spree::PaymentMethod
+    include RequestProtection
+
+    # Error message from Braintree that gets returned by a non voidable transaction
+    NON_VOIDABLE_STATUS_ERROR_REGEXP = /can only be voided if status is authorized/
+
     TOKEN_GENERATION_DISABLED_MESSAGE = 'Token generation is disabled.' \
       ' To re-enable set the `token_generation_enabled` preference on the' \
       ' gateway to `true`.'.freeze
@@ -15,6 +20,7 @@ module SolidusPaypalBraintree
 
     VOIDABLE_STATUSES = [
       Braintree::Transaction::Status::SubmittedForSettlement,
+      Braintree::Transaction::Status::SettlementPending,
       Braintree::Transaction::Status::Authorized
     ].freeze
 
@@ -64,12 +70,14 @@ module SolidusPaypalBraintree
     #   extra options to send along. e.g.: device data for fraud prevention
     # @return [Response]
     def purchase(money_cents, source, gateway_options)
-      result = braintree.transaction.sale(
-        amount: dollars(money_cents),
-        **transaction_options(source, gateway_options, true)
-      )
+      protected_request do
+        result = braintree.transaction.sale(
+          amount: dollars(money_cents),
+          **transaction_options(source, gateway_options, true)
+        )
 
-      Response.build(result)
+        Response.build(result)
+      end
     end
 
     # Authorize a payment to be captured later.
@@ -81,12 +89,14 @@ module SolidusPaypalBraintree
     #   extra options to send along. e.g.: device data for fraud prevention
     # @return [Response]
     def authorize(money_cents, source, gateway_options)
-      result = braintree.transaction.sale(
-        amount: dollars(money_cents),
-        **transaction_options(source, gateway_options)
-      )
+      protected_request do
+        result = braintree.transaction.sale(
+          amount: dollars(money_cents),
+          **transaction_options(source, gateway_options)
+        )
 
-      Response.build(result)
+        Response.build(result)
+      end
     end
 
     # Collect funds from an authorized payment.
@@ -97,11 +107,13 @@ module SolidusPaypalBraintree
     # @param response_code [String] the transaction id of the payment to capture
     # @return [Response]
     def capture(money_cents, response_code, _gateway_options)
-      result = braintree.transaction.submit_for_settlement(
-        response_code,
-        dollars(money_cents)
-      )
-      Response.build(result)
+      protected_request do
+        result = braintree.transaction.submit_for_settlement(
+          response_code,
+          dollars(money_cents)
+        )
+        Response.build(result)
+      end
     end
 
     # Used to refeund a customer for an already settled transaction.
@@ -111,11 +123,13 @@ module SolidusPaypalBraintree
     # @param response_code [String] the transaction id of the payment to refund
     # @return [Response]
     def credit(money_cents, _source, response_code, _gateway_options)
-      result = braintree.transaction.refund(
-        response_code,
-        dollars(money_cents)
-      )
-      Response.build(result)
+      protected_request do
+        result = braintree.transaction.refund(
+          response_code,
+          dollars(money_cents)
+        )
+        Response.build(result)
+      end
     end
 
     # Used to cancel a transaction before it is settled.
@@ -124,8 +138,10 @@ module SolidusPaypalBraintree
     # @param response_code [String] the transaction id of the payment to void
     # @return [Response]
     def void(response_code, _source, _gateway_options)
-      result = braintree.transaction.void(response_code)
-      Response.build(result)
+      protected_request do
+        result = braintree.transaction.void(response_code)
+        Response.build(result)
+      end
     end
 
     # Will either refund or void the payment depending on its state.
@@ -137,7 +153,9 @@ module SolidusPaypalBraintree
     # @param response_code [String] the transaction id of the payment to void
     # @return [Response]
     def cancel(response_code)
-      transaction = braintree.transaction.find(response_code)
+      transaction = protected_request do
+        braintree.transaction.find(response_code)
+      end
       if VOIDABLE_STATUSES.include?(transaction.status)
         void(response_code, nil, {})
       else
@@ -145,6 +163,32 @@ module SolidusPaypalBraintree
       end
     end
 
+    # Will void the payment depending on its state or return false
+    #
+    # Used by Solidus >= 2.4 instead of +cancel+
+    #
+    # If the transaction has not yet been settled, we can void the transaction.
+    # Otherwise, we return false so Solidus creates a refund instead.
+    #
+    # @api public
+    # @param response_code [String] the transaction id of the payment to void
+    # @return [Response|FalseClass]
+    def try_void(response_code)
+      transaction = braintree.transaction.find(response_code)
+      if transaction.status.in? SolidusPaypalBraintree::Gateway::VOIDABLE_STATUSES
+        # Sometimes Braintree returns a voidable status although it is not voidable anymore.
+        # When we try to void that transaction we receive an error and need to return false
+        # so Solidus can create a refund instead.
+        begin
+          void(response_code, nil, {})
+        rescue ActiveMerchant::ConnectionError => e
+          e.message.match(NON_VOIDABLE_STATUS_ERROR_REGEXP) ? false : raise(e)
+        end
+      else
+        false
+      end
+    end
+
     # Creates a new customer profile in Braintree
     #
     # @api public

data/app/models/solidus_paypal_braintree/response.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+require 'active_merchant/billing/response'
+require_relative 'avs_result'
+
 # Response object that all actions on the gateway should return
 module SolidusPaypalBraintree
   class Response < ActiveMerchant::Billing::Response
@@ -15,36 +20,58 @@ module SolidusPaypalBraintree
 
       def build_success(result)
         transaction = result.transaction
-
-        test = true
-        authorization = transaction.id
-        fraud_review = nil
-        avs_result = nil
-        cvv_result = nil
-
-        options = {
-          test: test,
-          authorization: authorization,
-          fraud_review: fraud_review,
-          avs_result: avs_result,
-          cvv_result: cvv_result
-        }
-
-        new(true, transaction.status, {}, options)
+        new(true, transaction.status, {}, response_options(transaction))
       end
 
       def build_failure(result)
-        new(false, error_message(result))
+        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)
+        )
+        new(false, error_message(result), result.params, options)
+      end
+
+      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),
+          # As we do not provide the CVV while submitting the transaction (for PCI compliance reasons),
+          # we need to ignore the only response we get back (I = not provided).
+          # Otherwise Solidus thinks this payment is risky.
+          cvv_result: nil
+        }
       end
 
       def error_message(result)
         if result.errors.any?
           result.errors.map { |e| "#{e.message} (#{e.code})" }.join(" ")
         else
-          [result.transaction.status,
-           result.transaction.gateway_rejection_reason,
-           result.transaction.processor_settlement_response_code,
-           result.transaction.processor_settlement_response_text].compact.join(" ")
+          transaction_error_message(result.transaction)
+        end
+      end
+
+      # Human readable error message for transaction responses
+      def transaction_error_message(transaction)
+        case transaction.status
+        when 'gateway_rejected'
+          I18n.t(transaction.gateway_rejection_reason,
+            scope: 'solidus_paypal_braintree.gateway_rejection_reasons',
+            default: "#{transaction.status.humanize} #{transaction.gateway_rejection_reason.humanize}")
+        when 'processor_declined'
+          I18n.t(transaction.processor_response_code,
+            scope: 'solidus_paypal_braintree.processor_response_codes',
+            default: "#{transaction.processor_response_text} (#{transaction.processor_response_code})")
+        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})")
+        else
+          I18n.t(transaction.status,
+            scope: 'solidus_paypal_braintree.transaction_statuses',
+            default: transaction.status.humanize)
         end
       end
     end

data/app/models/solidus_paypal_braintree/source.rb

@@ -1,5 +1,7 @@
 module SolidusPaypalBraintree
-  class Source < ApplicationRecord
+  class Source < SolidusSupport.payment_source_parent_class
+    include RequestProtection
+
     PAYPAL = "PayPalAccount"
     APPLE_PAY = "ApplePayCard"
     CREDIT_CARD = "CreditCard"
@@ -32,7 +34,13 @@ module SolidusPaypalBraintree
     end
 
     def can_void?(payment)
-      !payment.failed? && !payment.void?
+      return false unless payment.response_code
+      transaction = protected_request do
+        braintree_client.transaction.find(payment.response_code)
+      end
+      Gateway::VOIDABLE_STATUSES.include?(transaction.status)
+    rescue ActiveMerchant::ConnectionError
+      false
     end
 
     def can_credit?(payment)
@@ -51,19 +59,28 @@ module SolidusPaypalBraintree
       payment_type == PAYPAL
     end
 
+    def reusable?
+      true
+    end
+
     def credit_card?
       payment_type == CREDIT_CARD
     end
 
     def display_number
-      "XXXX-XXXX-XXXX-#{last_digits}"
+      "XXXX-XXXX-XXXX-#{last_digits.to_s.rjust(4, 'X')}"
     end
 
     private
 
     def braintree_payment_method
       return unless braintree_client && credit_card?
-      @braintree_payment_method ||= braintree_client.payment_method.find(token)
+      @braintree_payment_method ||= protected_request do
+        braintree_client.payment_method.find(token)
+      end
+    rescue ActiveMerchant::ConnectionError, ArgumentError => e
+      Rails.logger.warn("#{e}: token unknown or missing for #{inspect}")
+      nil
     end
 
     def braintree_client

data/app/models/solidus_paypal_braintree/transaction.rb

@@ -9,7 +9,6 @@ module SolidusPaypalBraintree
     validates :nonce, presence: true
     validates :payment_method, presence: true
     validates :payment_type, presence: true
-    validates :phone, presence: true
     validates :email, presence: true
 
     validate do

data/app/models/solidus_paypal_braintree/transaction_address.rb

@@ -10,14 +10,14 @@ module SolidusPaypalBraintree
       :city, :zip, :state_code, :address_line_1, :address_line_2
 
     validates :first_name, :last_name, :address_line_1, :city, :zip,
-      :state_code, :country_code, presence: true
+      :country_code, presence: true
 
     before_validation do
       self.country_code = country_code.presence || "us"
     end
 
     validates :spree_country, presence: true
-    validates :spree_state, presence: true, if: :should_match_state_model?
+    validates :state_code, :spree_state, presence: true, if: :should_match_state_model?
 
     def initialize(attributes = {})
       country_name = attributes.delete(:country_name) || ""
@@ -57,10 +57,9 @@ module SolidusPaypalBraintree
       address
     end
 
-    # Check to see if this address should match to a state
-    #   model in the database.
+    # Check to see if this address should match to a state model in the database
     def should_match_state_model?
-      spree_country.present? && spree_country.states.any?
+      spree_country.try!(:states_required?)
     end
   end
 end

data/app/models/solidus_paypal_braintree/transaction_import.rb

@@ -82,10 +82,10 @@ module SolidusPaypalBraintree
 
     def update_payment_total(payment)
       payment_total = order.payments.where(state: %w[checkout pending]).sum(:amount)
-      remaining_total = order.outstanding_balance - payment_total
+      payment_difference = order.outstanding_balance - payment_total
 
-      if remaining_total > 0
-        payment.update!(amount: payment.amount + remaining_total)
+      if payment_difference != 0
+        payment.update!(amount: payment.amount + payment_difference)
       end
     end
   end

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

@@ -0,0 +1,19 @@
+<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
+    }
+  }
+</script>

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

@@ -1,5 +1,7 @@
 <% prefix = "payment_source[#{id}]" %>
 
+<%= render partial: "spree/shared/braintree_errors" %>
+
 <div class="hosted-fields">
   <div class="field" data-hook="card_number">
     <%= label_tag "card_number#{id}", Spree::CreditCard.human_attribute_name(:number), class: "required" %>

data/config/locales/en.yml

@@ -18,6 +18,15 @@ en:
     braintree: Braintree
     nonce: Nonce
     token: Token
+    errors:
+      default_error: "Something bad happened!"
+      empty_fields: "All fields are empty! Please fill out the form."
+      invalid_fields: "Some payment input fields are invalid."
+      invalid_card: "Credit card data is incorrect."
+      network_error: "Network error occurred."
+      duplicate_iframe: "Duplicate Braintree iframe."
+      fail_on_duplicate: "This payment method already exists in your vault."
+      cvv_verification_failed: "CVV did not pass verification."
     payment_type:
       label: Payment Type
       apple_pay_card: Apple Pay
@@ -28,3 +37,16 @@ en:
       tab: Braintree
       update_success: Successfully updated Braintree configurations.
       update_error: An error occurred while updating Braintree configurations.
+    gateway_rejection_reasons:
+      avs: AVS check failed.
+      avs_and_cvv: AVS and CVV check failed.
+      cvv: CVV check failed.
+      duplicate: Duplicate transaction.
+      fraud: Credit card was rejected because of potential fraud.
+      three_d_secure: 3D Secure check failed.
+    transaction_statuses:
+      authorization_expired: Payment authorization has expired.
+      failed: An error occurred when sending the transaction to the processor.
+      gateway_rejected: Gateway rejected this transaction.
+      processor_declined: Processor declined this transaction.
+      settlement_declined: Settlement was declined by processor.

data/config/locales/it.yml

@@ -0,0 +1,11 @@
+it:
+  solidus_paypal_braintree:
+    errors:
+      default_error: "Qualcosa è andato storto."
+      empty_fields: "I campi non possono essere vuoti."
+      invalid_fields: "Alcuni campi non sono corretti."
+      invalid_card: "I dati della carta di credito non sono corretti."
+      network_error: "Si è verificato un errore di rete."
+      duplicate_iframe: "Ci sono due form Braintree."
+      fail_on_duplicate: "Questo metodo di pagamento già esiste."
+      cvv_verification_failed: "Il codice CVV non è corretto."

data/lib/solidus_paypal_braintree.rb

@@ -1,7 +1,7 @@
 require 'solidus_core'
-require 'solidus_support'
 require 'solidus_paypal_braintree/engine'
 require 'solidus_paypal_braintree/country_mapper'
+require 'solidus_paypal_braintree/request_protection'
 
 module SolidusPaypalBraintree
   def self.table_name_prefix

data/lib/solidus_paypal_braintree/engine.rb

@@ -1,3 +1,5 @@
+require 'solidus_support'
+
 module SolidusPaypalBraintree
   class Engine < Rails::Engine
     isolate_namespace SolidusPaypalBraintree
@@ -21,15 +23,7 @@ module SolidusPaypalBraintree
 
     config.to_prepare(&method(:activate).to_proc)
 
-    def self.frontend_available?
-      defined?(Spree::Frontend::Engine) == "constant"
-    end
-
-    def self.backend_available?
-      defined?(Spree::Backend::Engine) == "constant"
-    end
-
-    if frontend_available?
+    if SolidusSupport.frontend_available?
       config.assets.precompile += [
         'solidus_paypal_braintree/checkout.js',
         'solidus_paypal_braintree/frontend.js',
@@ -40,13 +34,19 @@ module SolidusPaypalBraintree
       paths["app/views"] << "lib/views/frontend"
     end
 
-    if backend_available?
+    if SolidusSupport.backend_available?
       config.assets.precompile += ["spree/backend/solidus_paypal_braintree.js"]
       paths["app/controllers"] << "lib/controllers/backend"
 
       # We support Solidus v1.2, which requires some different markup in the
       # source form partial. This will take precedence over lib/views/backend.
-      paths["app/views"] << "lib/views/backend_v1.2" if Gem::Version.new(Spree.solidus_version) < Gem::Version.new('1.3')
+      paths["app/views"] << "lib/views/backend_v1.2" if SolidusSupport.solidus_gem_version < Gem::Version.new('1.3')
+
+      # Solidus v2.4 introduced preference field partials but does not ship a hash field type.
+      # This is solved in Solidus v2.5.
+      if SolidusSupport.solidus_gem_version <= Gem::Version.new('2.5.0')
+        paths["app/views"] << "lib/views/backend_v2.4"
+      end
 
       paths["app/views"] << "lib/views/backend"
     end

data/lib/solidus_paypal_braintree/factories.rb

@@ -1,11 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
   #
   # Example adding this to your spec_helper will load these Factories for use:
   # require 'solidus_paypal_braintree/factories'
 end
 
-FactoryGirl.modify do
+FactoryBot.modify do
   # The Solidus address factory randomizes the zipcode.
   # The OrderWalkThrough we use in the credit card checkout spec uses this factory for the user addresses.
   # For credit card payments we transmit the billing address to braintree, for paypal payments the shipping address.

data/lib/solidus_paypal_braintree/request_protection.rb

@@ -0,0 +1,18 @@
+require 'active_merchant/network_connection_retries'
+
+module SolidusPaypalBraintree
+  module RequestProtection
+    include ActiveMerchant::NetworkConnectionRetries
+
+    def protected_request
+      raise ArgumentError unless block_given?
+      options = {
+        connection_exceptions: {
+          Braintree::BraintreeError => 'Error while connecting to Braintree gateway'
+        },
+        logger: Rails.logger
+      }
+      retry_exceptions(options) { yield }
+    end
+  end
+end

data/lib/solidus_paypal_braintree/version.rb

@@ -1,3 +1,3 @@
 module SolidusPaypalBraintree
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/views/backend_v2.4/spree/admin/shared/preference_fields/_hash.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_hash fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_area attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_area_tag name, value, html_options %>
+  <% end %>
+</div>

data/lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb

@@ -2,19 +2,19 @@
 <% id = payment_method.id %>
 
 <% content_for :head do %>
-  <script src="https://js.braintreegateway.com/web/3.14.0/js/client.min.js"></script>
-  <script src="https://js.braintreegateway.com/web/3.14.0/js/data-collector.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.22.1/js/client.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.22.1/js/data-collector.min.js"></script>
 
   <% if current_store.braintree_configuration.paypal? %>
-    <script src="https://js.braintreegateway.com/web/3.14.0/js/paypal.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.22.1/js/paypal.min.js"></script>
   <% end %>
 
   <% if current_store.braintree_configuration.credit_card? %>
-    <script src="https://js.braintreegateway.com/web/3.14.0/js/hosted-fields.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.22.1/js/hosted-fields.min.js"></script>
   <% end %>
 
   <% if current_store.braintree_configuration.apple_pay? %>
-    <script src="https://js.braintreegateway.com/web/3.14.0/js/apple-pay.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.22.1/js/apple-pay.min.js"></script>
   <% end %>
 
   <%= javascript_include_tag "solidus_paypal_braintree/checkout" %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_braintree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Stembolt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +58,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.65'
+- !ruby/object:Gem::Dependency
+  name: activemerchant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.48'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +171,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -188,16 +202,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +307,7 @@ files:
 - app/controllers/solidus_paypal_braintree/client_tokens_controller.rb
 - app/helpers/braintree_admin_helper.rb
 - app/models/application_record.rb
+- app/models/solidus_paypal_braintree/avs_result.rb
 - app/models/solidus_paypal_braintree/configuration.rb
 - app/models/solidus_paypal_braintree/customer.rb
 - app/models/solidus_paypal_braintree/gateway.rb
@@ -303,9 +318,11 @@ files:
 - app/models/solidus_paypal_braintree/transaction_import.rb
 - app/models/spree/store_decorator.rb
 - app/overrides/admin_navigation_menu.rb
+- app/views/spree/shared/_braintree_errors.html.erb
 - app/views/spree/shared/_braintree_hosted_fields.html.erb
 - config/initializers/braintree.rb
 - config/locales/en.yml
+- config/locales/it.yml
 - config/routes.rb
 - db/migrate/20160830061749_create_solidus_paypal_braintree_sources.rb
 - db/migrate/20160906201711_create_solidus_paypal_braintree_customers.rb
@@ -322,12 +339,14 @@ files:
 - lib/solidus_paypal_braintree/country_mapper.rb
 - lib/solidus_paypal_braintree/engine.rb
 - lib/solidus_paypal_braintree/factories.rb
+- lib/solidus_paypal_braintree/request_protection.rb
 - lib/solidus_paypal_braintree/version.rb
 - lib/views/backend/solidus_paypal_braintree/configurations/_admin_tab.html.erb
 - lib/views/backend/solidus_paypal_braintree/configurations/list.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_paypal_braintree.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_paypal_braintree.html.erb
 - lib/views/backend_v1.2/spree/admin/payments/source_forms/_paypal_braintree.html.erb
+- lib/views/backend_v2.4/spree/admin/shared/preference_fields/_hash.html.erb
 - lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb
 homepage: https://stembolt.com
 licenses:
@@ -349,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Officially supported Paypal/Braintree extension