effective_orders 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9249f1d10040622da38e49058f9a644551208f8be9744e5444ce4288432f68ce
-  data.tar.gz: bf7f2ca0477fbfedacf7034b2692d82dfc6fb915c6af66162b95aeab3ba1df3a
+  metadata.gz: 819088f5b5cc1bd4d6965080f951be723aa5f0a10139ba7a724eae767e47b560
+  data.tar.gz: a2b5b57a2612d0b810b90e04481ad221c28335b8f0148e71de223180fa36525e
 SHA512:
-  metadata.gz: '08ba32390474ae77d738d6305845fd1b3797edc880d9a82ac1ac348abf1daf1a77ed6b196c04424ef9feff151fd3a5c8a3305953a91da34f77cfc97ead00d870'
-  data.tar.gz: c817be2902218f0c7a7462859579c606e2905b17891e75f231c141f7902424761d06b715bcaf3c33fa76a4791bbae3c04e3f046be93ba66e39880e1b16af0a76
+  metadata.gz: 31f30605ef8af6b7802264d741c7db94b434bd83ec8d917dbbe3f8e175fc516149806600b3237df2fc533fe486b419075f46a335dc6fdd0a43a993b9625a2ce2
+  data.tar.gz: 33652d1539fb9cc7ad2fbf53fa245272ddb6d17e75e3c2830c2292005169656704dbff0845b2cc1a5c14d93fd4492198dd82ec9fa88bf95274465a3ed995a77f

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/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.1.1'.freeze
+  VERSION = '6.1.2'.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.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails