effective_orders 6.1.1 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9249f1d10040622da38e49058f9a644551208f8be9744e5444ce4288432f68ce
-  data.tar.gz: bf7f2ca0477fbfedacf7034b2692d82dfc6fb915c6af66162b95aeab3ba1df3a
+  metadata.gz: d89c7eaee9322884706dfaacae71335ca4b8284b06ab69459194cb09b523eb53
+  data.tar.gz: 2c667a68c9e3e68fe764cd3386495698d55c8c86c7d213ce5691e0a35f37821c
 SHA512:
-  metadata.gz: '08ba32390474ae77d738d6305845fd1b3797edc880d9a82ac1ac348abf1daf1a77ed6b196c04424ef9feff151fd3a5c8a3305953a91da34f77cfc97ead00d870'
-  data.tar.gz: c817be2902218f0c7a7462859579c606e2905b17891e75f231c141f7902424761d06b715bcaf3c33fa76a4791bbae3c04e3f046be93ba66e39880e1b16af0a76
+  metadata.gz: cadaa028284a3ee34b1cdfefe2165722cec9edd5307771d8c2e7c5f5fa5afff5ccbd3926d0c6a535369b163dd3987eb4be4afef1572aafd5c6367268cb7e9591
+  data.tar.gz: c5cc2bee6db200d5ba490a61f987b5d00df5c7e7bc78c1bf7bfabb11e536ff2899c4fe1c8be3fef886fb62cfff266aa29b8164a0c3e864b8fa4800437e9ce923

data/app/assets/javascripts/effective_orders/providers/stripe.js.coffee

@@ -17,8 +17,19 @@ this.StripeForm ||= class StripeForm
     @card = @stripe.elements().create('card', @style())
 
     @mount()
+    @form.find('.stripe-submit-button').show()
     @form.addClass('initialized')
 
+  destroy: ->
+    @form = $('form[data-stripe-form]').first()
+    return false unless @form.length > 0
+
+    @form.find("input[name$='[payment_intent_id]']").val('')
+    @form.find('#stripe-card-element').html('')
+
+    @form.find('.stripe-submit-button').hide()
+    @form.removeClass('initialized')
+
   style: ->
     style: {
       base: { color: '#32325d', fontSize: '16px', },
@@ -73,7 +84,8 @@ this.StripeForm ||= class StripeForm
 
   errorPayment: (error) ->
     $('#stripe-card-errors').text(error.message)
-    EffectiveForm.invalidate(@form);
+    EffectiveForm.invalidate(@form)
 
 $ -> (new StripeForm()).initialize()
 $(document).on 'turbolinks:load', -> (new StripeForm()).initialize()
+$(document).on 'turbolinks:before-cache', -> (new StripeForm()).destroy()

data/app/controllers/effective/concerns/purchase.rb

@@ -50,6 +50,17 @@ module Effective
         redirect_to declined_url.gsub(':id', @order.to_param.to_s)
       end
 
+      def order_not_processed(declined_url: nil)
+        # No change to the order
+
+        if flash[:danger].blank?
+          flash[:danger] = 'Payment was not processed. Please try again.'
+        end
+
+        declined_url = effective_orders.declined_order_path(':id') if declined_url.blank?
+        redirect_to declined_url.gsub(':id', @order.to_param.to_s)
+      end
+
     end
   end
 end

data/app/controllers/effective/providers/stripe.rb

@@ -11,7 +11,14 @@ module Effective
 
         EffectiveResources.authorize!(self, :update, @order)
 
-        payment = validate_stripe_payment(stripe_params[:payment_intent_id])
+        payment_intent_id = stripe_params[:payment_intent_id]
+
+        if payment_intent_id.blank?
+          flash[:danger] = 'Unable to process stripe order without payment. please try again.'
+          return order_not_processed(declined_url: stripe_params[:declined_url])
+        end
+
+        payment = validate_stripe_payment(payment_intent_id)
 
         if payment.blank?
           return order_declined(payment: payment, provider: 'stripe', declined_url: stripe_params[:declined_url])
@@ -37,6 +44,8 @@ module Effective
       end
 
       def validate_stripe_payment(payment_intent_id)
+        raise('expected stripe payment intent id to be present') if payment_intent_id.blank?
+
         intent = EffectiveOrders.with_stripe { ::Stripe::PaymentIntent.retrieve(payment_intent_id) }
         raise('expected stripe intent to be present') if intent.blank?
         return unless intent.status == 'succeeded'

data/app/helpers/effective_stripe_helper.rb

@@ -60,17 +60,19 @@ module EffectiveStripeHelper
     customer.create_stripe_customer! # Only creates if customer not already present
 
     remember_card = EffectiveOrders.stripe[:remember_card]
+    token_required = customer.token_required?
 
     payment = {
       amount: order.total_with_surcharge,
       currency: EffectiveOrders.stripe[:currency],
       customer: customer.stripe_customer_id,
-      payment_method: (customer.payment_method_id.presence if remember_card),
       description: stripe_order_description(order),
       metadata: { order_id: order.id }
     }
 
-    token_required = customer.token_required?
+    if remember_card && customer.payment_method_id.present?
+      payment[:payment_method] = customer.payment_method_id
+    end
 
     # Always prompt them for a card unless remember card
     token_required = true unless remember_card
@@ -87,13 +89,18 @@ module EffectiveStripeHelper
     payload = {
       key: EffectiveOrders.stripe[:publishable_key],
       client_secret: intent.client_secret,
-      payment_method: intent.payment_method,
-
-      active_card: (customer.active_card if remember_card),
       email: customer.email,
       token_required: token_required
     }
 
+    if remember_card && customer.active_card.present? && intent.payment_method.present?
+      payload[:active_card] = customer.active_card
+    end
+
+    if intent.payment_method.present?
+      payload[:payment_method] = intent.payment_method
+    end
+
     payload
   end
 

data/app/views/effective/orders/stripe/_element.html.haml

@@ -4,5 +4,5 @@
   .col.text-right.mx-2
     %label Details
 
-#stripe-card-element
+#stripe-card-element Loading...
 #stripe-card-errors

data/app/views/effective/orders/stripe/_form.html.haml

@@ -16,7 +16,7 @@
       = f.hidden_field :declined_url, value: declined_url
 
       -# This is set by the stripe.js javascript
-      = f.hidden_field :payment_intent_id
+      = f.hidden_field :payment_intent_id, required: true
 
       - if stripe[:token_required]
         %p Please enter your credit card information.
@@ -27,5 +27,5 @@
         = collapse('Use this card instead...', class: 'update-stripe-payment-method') do
           = render('effective/orders/stripe/element')
 
-      .mt-4
+      .mt-4.stripe-submit-button{style: 'display: none;'}
         = f.submit order_checkout_label(:stripe), center: true, border: false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.1.1'.freeze
+  VERSION = '6.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails