effective_orders 6.12.1 → 6.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a55ea6c14b02fce58218a825c9f936516c0d46a1246b7190a503b97070d394
-  data.tar.gz: 97c6253dfe17a99e7113755e935432b7953c89714ef1a77dff48f6a014204a9e
+  metadata.gz: 4f5fbabf9c4012193962576f7ef67838e17e382740ad3860ab9c9f527ce86787
+  data.tar.gz: 71f6af17259b5b62ee66b2fd993bb085dc8411ad8040c21fa0a3bc639381c655
 SHA512:
-  metadata.gz: 1d4f1885182a55a73e39665ab477f31bb1fc6c801fb04f13f0311fd870ad87edb84f27d8bf5ac0abb456f61fdd236961df650da27e157a7b532629e67e7c567a
-  data.tar.gz: 4c74eaa371c3e9db830ce252cd611068ab727640a836f6e6dac1c7abc05439b7a9beeb0f80bf2374367afbc6a8b37d8e8c1188057f19c2e062b1d0c73436c214
+  metadata.gz: 60eff8ba4e046b46575a23c98daf14b0ba07cf548041826590ac49c3bf193cde6632437baeae38bfe011f37a3cae0e7d3d5d444aeeb0340a0990d1c93a88ce2b
+  data.tar.gz: 9b91126b76b01d50fefc86b31d1a163dfe8164c523f69a2c3a523a827c632faaf0b0b5e13e0174b01450078dd32754a76157b5c4338b39b16b47a10ca1d25c59

data/app/datatables/admin/effective_orders_datatable.rb

@@ -19,7 +19,7 @@ module Admin
         scope :all
         scope :purchased
 
-        scope :deferred if EffectiveOrders.deferred_providers.present?
+        scope :deferred if EffectiveOrders.deferred? || EffectiveOrders.delayed?
         scope :voided
 
         scope :pending_refunds if EffectiveOrders.refund && !EffectiveOrders.buyer_purchases_refund?

data/app/datatables/effective_orders_datatable.rb

@@ -6,7 +6,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope :all
       scope :purchased
 
-      scope :deferred if EffectiveOrders.deferred_providers.present?
+      scope :deferred if EffectiveOrders.deferred? || EffectiveOrders.delayed?
       scope :refunds if EffectiveOrders.refund
       scope :not_purchased
     end

data/app/models/effective/deluxe_api.rb

@@ -23,18 +23,52 @@ module Effective
       self.currency = currency || EffectiveOrders.deluxe.fetch(:currency)
     end
 
-    def payment
-      raise('expected purchase response to be present') unless purchase_response.kind_of?(Hash)
-      purchase_response
+    def health_check
+      get('/')
+    end
+
+    def healthy?
+      response = health_check()
+
+      return false unless response.kind_of?(Hash)
+      return false unless response['appName'].present?
+      return false unless response['environment'].present?
+
+      true
+    end
+
+    # Decode the base64 encoded JSON object into a Hash
+    def decode_payment_intent_payload(payload)
+      raise('expected a string') unless payload.kind_of?(String)
+
+      payment_intent = (JSON.parse(Base64.decode64(payload)) rescue nil)
+
+      raise('expected payment_intent to be a Hash') unless payment_intent.kind_of?(Hash)
+      raise('expected a token payment') unless payment_intent['type'] == 'Token'
+
+      payment_intent
+    end
+
+    # Takes a payment_intent and returns the card info we can store
+    def card_info(payment_intent)
+      token = extract_token(payment_intent)
+
+      # Return the authorization params merged with the card info
+      last4 = token['maskedPan'].to_s.last(4)
+      card = token['cardType'].to_s.downcase
+      date = token['expDate']
+      cvv = token['cvv']
+
+      active_card = "**** **** **** #{last4} #{card} #{date}" if last4.present?
+
+      { 'active_card' => active_card, 'card' => card, 'expDate' => date, 'cvv' => cvv }.compact
     end
 
+    # After we store a payment intent we can call purchase! immediately or wait till later.
     # This calls Authorize Payment and Complete Payment
-    # Returns true if all good.
-    # Returns false if there was an error.
-    # Always sets the @purchase_response which is api.payment
+    # Returns true when purchased. Returns false when declined.
+    # The response is stored in api.payment() after this is run
     def purchase!(order, payment_intent)
-      raise('expected a deluxe payment provider') unless ['deluxe', 'deluxe_delayed'].include?(order.payment_provider)
-
       payment_intent = decode_payment_intent_payload(payment_intent) if payment_intent.kind_of?(String)
       raise('expected payment_intent to be a Hash') unless payment_intent.kind_of?(Hash)
       raise('expected a token payment') unless payment_intent['type'] == 'Token'
@@ -60,21 +94,56 @@ module Effective
       true
     end
 
-    # Health Check
-    def health_check
-      get('/')
+    def payment
+      raise('expected purchase response to be present') unless purchase_response.kind_of?(Hash)
+      purchase_response
     end
 
-    def healthy?
-      response = health_check()
+    def purchase_delayed_orders!(orders)
+      now = Time.zone.now
 
-      return false unless response.kind_of?(Hash)
-      return false unless response['timestamp'].to_s.start_with?(Time.zone.now.strftime('%Y-%m-%d'))
-      return false unless response['environment'].present?
+      Array(orders).each do |order|
+        puts "Trying order #{order.id}"
+
+        begin
+          raise('expected a delayed order') unless order.delayed?
+          raise('expected a deferred order') unless order.deferred?
+          raise('expected delayed payment intent') unless order.delayed_payment_intent.present?
+
+          order.update_columns(delayed_payment_purchase_ran_at: now, delayed_payment_purchase_result: nil)
+
+          purchased = purchase!(order, order.delayed_payment_intent)
+          provider = order.payment_provider
+          payment = self.payment()
+          card = payment["card"]
+
+          if purchased
+            order.assign_attributes(delayed_payment_purchase_result: "success")
+            order.purchase!(payment: payment, provider: provider, card: card, email: true, skip_buyer_validations: true)
+
+            puts "Successfully purchased order #{order.id}"
+          else
+            order.assign_attributes(delayed_payment_purchase_result: "failed with message: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}.")
+            order.decline!(payment: payment, provider: provider, card: card)
+
+            puts "Failed to purchase order #{order.id} #{order.delayed_payment_purchase_result}"
+          end
+
+        rescue => e
+          order.update_columns(delayed_payment_purchase_ran_at: now, delayed_payment_purchase_result: "error: #{e.message}")
+
+          EffectiveLogger.error(e.message, associated: order) if defined?(EffectiveLogger)
+          ExceptionNotifier.notify_exception(e, data: { order_id: order.id }) if defined?(ExceptionNotifier)
+
+          puts "Error purchasing #{order.id}: #{e.message}"
+        end
+      end
 
       true
     end
 
+    protected
+
     # Authorize Payment
     def authorize_payment(order, payment_intent)
       response = post('/payments/authorize', params: authorize_payment_params(order, payment_intent))
@@ -119,19 +188,6 @@ module Effective
       response.reverse_merge(authorization)
     end
 
-    def complete_payment_params(order, payment_intent)
-      raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
-
-      payment_id = extract_payment_id(payment_intent)
-      amount = { amount: order.total_to_f, currency: currency }
-
-      # Params passed into Complete Payment
-      { 
-        paymentId: payment_id, 
-        amount: amount
-      }
-    end
-
     def authorize_payment_params(order, payment_intent)
       raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
 
@@ -185,6 +241,19 @@ module Effective
       }.compact
     end
 
+    def complete_payment_params(order, payment_intent)
+      raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
+
+      payment_id = extract_payment_id(payment_intent)
+      amount = { amount: order.total_to_f, currency: currency }
+
+      # Params passed into Complete Payment
+      { 
+        paymentId: payment_id, 
+        amount: amount
+      }
+    end
+
     def get(endpoint, params: nil)
       query = ('?' + params.compact.map { |k, v| "$#{k}=#{v}" }.join('&')) if params.present?
 
@@ -225,33 +294,6 @@ module Effective
       JSON.parse(result.body)
     end
 
-    # Takes a payment_intent and returns the card info we can store
-    def card_info(payment_intent)
-      token = extract_token(payment_intent)
-
-      # Return the authorization params merged with the card info
-      last4 = token['maskedPan'].to_s.last(4)
-      card = token['cardType'].to_s.downcase
-      date = token['expDate']
-      cvv = token['cvv']
-
-      active_card = "**** **** **** #{last4} #{card} #{date}" if last4.present?
-
-      { 'active_card' => active_card, 'card' => card, 'expDate' => date, 'cvv' => cvv }.compact
-    end
-
-    # Decode the base64 encoded JSON object into a Hash
-    def decode_payment_intent_payload(payload)
-      raise('expected a string') unless payload.kind_of?(String)
-
-      payment_intent = (JSON.parse(Base64.decode64(payload)) rescue nil)
-
-      raise('expected payment_intent to be a Hash') unless payment_intent.kind_of?(Hash)
-      raise('expected a token payment') unless payment_intent['type'] == 'Token'
-
-      payment_intent
-    end
-
     private
 
     def headers

data/app/models/effective/order.rb

@@ -241,7 +241,9 @@ module Effective
       validates :payment_provider, presence: true
 
       validate do
-        errors.add(:payment_provider, "unknown deferred payment provider") unless EffectiveOrders.deferred_providers.include?(payment_provider)
+        unless EffectiveOrders.deferred_providers.include?(payment_provider) || EffectiveOrders.delayed_providers.include?(payment_provider)
+          errors.add(:payment_provider, "unknown deferred payment provider") 
+        end
       end
     end
 
@@ -673,7 +675,9 @@ module Effective
 
         payment: payment_to_h(payment.presence || 'none'),
         payment_provider: (provider.presence || 'none'),
-        payment_card: (card.presence || 'none')
+        payment_card: (card.presence || 'none'),
+
+        delayed_payment_intent: nil # Do not store the delayed payment intent any longer
       )
 
       if current_user&.email.present?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.12.1'.freeze
+  VERSION = '6.12.3'.freeze
 end

data/lib/effective_orders.rb

@@ -185,8 +185,9 @@ module EffectiveOrders
     ].compact
   end
 
+  # Should not include delayed providers
   def self.deferred_providers
-    [('cheque' if cheque?), ('deluxe_delayed' if deluxe_delayed?), ('etransfer' if etransfer?), ('phone' if phone?)].compact
+    [('cheque' if cheque?), ('etransfer' if etransfer?), ('phone' if phone?)].compact
   end
 
   def self.delayed_providers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.12.1
+  version: 6.12.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails