effective_orders 5.9.2 → 5.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8207656323cf7dfe93656598ad79fec2db779f8879d1c89adce3d2c71f66b079
-  data.tar.gz: 705cf2da66eee1acdaf88dd41061d517d7701ec5ff7aa66d0369d1324e177b3e
+  metadata.gz: 35bd45132852365a2cc570b4b6a7fbbf5cc62d42cd9f506710da80a0c77daf82
+  data.tar.gz: e97f9869c710bdfb91cfa35b6b0bc091b429b175cdc7af9b066283d02d90bac6
 SHA512:
-  metadata.gz: 84102e16425ac192cf6f011ed9e10630971fb46beed5d16a433ae19e661e387e215d7242003e414ee76302cbe8c1913ccb86ada31a6caec9c86f32b3b6f0d083
-  data.tar.gz: 44845062ecb7a093b1139d65a4912b6edbc2a261cb119663ea06456981ac4262b97e1e68989039684fcf201afa934b71a89ae8321da56faf6ec3fa5e1741d1c4
+  metadata.gz: 02036ff52d79eaa0c47e6f2353f23b33d6168222abe6337a77880fb7c48d0c7de7b1960235ed2b2dcb9e304aac36b8bddbbf0f1132fee7395bed3638be80c2bd
+  data.tar.gz: 1929601f0588f3cefde7eec8ceec3f796b03822406e9ae1533507a783c3f0867a5c408f21a9954c12eaa225c912817044102c869d1a334660f328a80a9381a2c

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

@@ -13,7 +13,7 @@ module Effective
 
         payment = validate_stripe_payment(stripe_params[:payment_intent_id])
 
-        if payment.blank? || !payment.kind_of?(Hash)
+        if payment.blank?
           return order_declined(payment: payment, provider: 'stripe', declined_url: stripe_params[:declined_url])
         end
 
@@ -37,36 +37,35 @@ module Effective
       end
 
       def validate_stripe_payment(payment_intent_id)
-        begin
-          intent = EffectiveOrders.with_stripe { ::Stripe::PaymentIntent.retrieve(payment_intent_id) }
-
-          raise('status is not succeeded') unless intent.status == 'succeeded'
-          raise('charges are not present') unless intent.charges.present?
-
-          charge = intent.charges.data.first
-          raise('charge not succeeded') unless charge.status == 'succeeded'
-
-          card = charge.payment_method_details.try(:card) || {}
-          active_card = "**** **** **** #{card['last4']} #{card['brand']} #{card['exp_month']}/#{card['exp_year']}" if card.present?
-
-          {
-            charge_id: charge.id,
-            payment_method_id: charge.payment_method,
-            payment_intent_id: intent.id,
-
-            active_card: active_card,
-            card: card['brand'],
-
-            amount: charge.amount,
-            created: charge.created,
-            currency: charge.currency,
-            customer: charge.customer,
-            status: charge.status
-          }.compact
-
-        rescue => e
-          e.message
-        end
+        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'
+
+        # Stripe API version 2022-11-15 and 2022-08-01
+        charge_id = intent.try(:latest_charge) || (intent.charges.data.first.id rescue nil)
+        raise('expected stripe charge_id to be present') if charge_id.blank?
+
+        charge = EffectiveOrders.with_stripe { ::Stripe::Charge.retrieve(charge_id) }
+        raise('expected stripe charge to be present') if charge.blank?
+        return unless charge.status == 'succeeded'
+
+        card = charge.payment_method_details.try(:card) || {}
+        active_card = "**** **** **** #{card['last4']} #{card['brand']} #{card['exp_month']}/#{card['exp_year']}" if card.present?
+
+        {
+          charge_id: charge.id,
+          payment_method_id: charge.payment_method,
+          payment_intent_id: intent.id,
+
+          active_card: active_card,
+          card: card['brand'],
+
+          amount: charge.amount,
+          created: charge.created,
+          currency: charge.currency,
+          customer: charge.customer,
+          status: charge.status
+        }.compact
       end
 
     end

data/app/models/effective/order.rb

@@ -499,7 +499,10 @@ module Effective
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
 
-      send_payment_request_to_buyer! if send_payment_request_to_buyer?
+      if send_payment_request_to_buyer?
+        after_commit { send_payment_request_to_buyer! }
+      end
+
       true
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.9.2'.freeze
+  VERSION = '5.9.4'.freeze
 end

metadata

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