Fix payments settling

app/models/spree/braintree_checkout.rb

@@ -3,7 +3,7 @@ class BraintreeCheckout < ActiveRecord::Base
     scope :in_state, ->(state) { where(state: state) }
     scope :not_in_state, ->(state) { where.not(state: state) }
 
-    after_save :update_payment_and_order
+    after_commit :update_payment_and_order
 
     FINAL_STATES = %w(authorization_expired processor_declined gateway_rejected failed voided settled settlement_declined refunded released)
 
@@ -66,12 +66,13 @@ def can_credit?(_payment)
     private
 
     def update_payment_and_order
-      if state_changed? && payment
-        utils = Gateway::BraintreeVzeroBase::Utils.new(Gateway::BraintreeVzeroBase.first, order)
-        payment_state = utils.map_payment_status(state)
-        payment.send(payment_action(payment_state))
-        order.update!
-      end
+      return unless (changes = previous_changes[:state])
+      return unless changes[0] != changes[1]
+      return unless payment
+
+      utils = Gateway::BraintreeVzeroBase::Utils.new(Gateway::BraintreeVzeroBase.first, order)
+      payment_state = utils.map_payment_status(state)
+      payment.send(payment_action(payment_state))
     end
 
     def self.braintree_card_type_to_spree(type)

app/models/spree/gateway/braintree_vzero_base.rb

@@ -55,7 +55,7 @@ def authorize(money_in_cents, source, gateway_options)
 
     def settle(amount, checkout, _gateway_options)
       result = Transaction.new(provider, checkout.transaction_id).submit_for_settlement(amount / 100.0)
-      checkout.update_attribute(:state, result.transaction.status)
+      checkout.update(state: result.transaction.status)
       result
     end
 

app/models/spree/payment_decorator.rb

@@ -0,0 +1,9 @@
+Spree::Payment.class_eval do
+  alias_method :original_update_order, :update_order
+
+  def update_order
+    # without reload order was updated with inaccurate data
+    order.reload
+    original_update_order
+  end
+end

app/views/spree/shared/braintree_vzero/_dropin.js

@@ -2,7 +2,7 @@ container: container,
 paypal: {
   singleUse: <%= payment_method.preferred_store_payments_in_vault.eql?('do_not_store') %>,
   amount: <%= @order.total %>,
-  currency: "<%= Spree::Config[:currency] %>",
+  currency: "<%= @order.currency %>",
   enableShippingAddress: true,
   shippingAddressOverride: {
     recipientName: '<%= "#{shipping_address.firstname} #{shipping_address.lastname}" %>',
@@ -34,7 +34,7 @@ onPaymentMethodReceived: function (result) {
       $(formId).append("<input type='hidden' name='payment_method_nonce' value=" + data.nonce + ">");
     else
       $(formId).append("<input type='hidden' name='order[payments_attributes][][braintree_nonce]' value=" + data.nonce + ">");
-    $(formId).submit();
+    $(formId)[0].submit();
   }
 
   if (SpreeBraintreeVzero.threeDSecure && result.type == "CreditCard") {