effective_orders 6.12.2 → 6.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90f1a83b2e9268d377b28a05fbc423bef5618f2270231e018f04bb0f297ea02
-  data.tar.gz: a4ed543e612da4fddbc2086b30de01ed5252cb53f033db9d538468a4cdd361df
+  metadata.gz: 6d365ebd0599f72ed9c5bbf7e9e9f26284647135153befe60799452b87fc1e0c
+  data.tar.gz: 913c9fa4e2d528382652c297d6806fb827c79974baebb9890ddd1854449f98d1
 SHA512:
-  metadata.gz: 923d207995eb5f2861cd8425c57902357c9d5141d5169eec8911703051e9be4ecf9e90da6ee71aad88d777ec503d18bcc6478323620ade521a2b995c839a8d64
-  data.tar.gz: 700ab00a86078101fd05a561b7b8c02098a8941f5a9d645e859bfdbafcc40dd363be9dadc3abfefda4b1a9c33673829451f71eefac07261715cec817641f6b2e
+  metadata.gz: d5fde239931a219f5e15a29a085dd4f056f12174fb4e6331b5b05369d8798518781e7eddae549edb3d3e8d34a9a8a18896a6a271fa0883a15161f75766cad95b
+  data.tar.gz: 2b0daaa3d6a0b0111efe48cac3db3d2b0073a3a8ed3b51ec5e9beaeaadaee604ae515cdc5c309b33c8a4ad28598bfcbdd3c6f345aa95052543588f31dcc1a6bc

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/helpers/effective_orders_helper.rb

@@ -45,7 +45,7 @@ module EffectiveOrdersHelper
     when :deluxe
       'Pay Now'
     when :deluxe_delayed
-      'Save now and charge me later'
+      'Save card and charge me later'
     when :etransfer
       'Pay by E-transfer'
     when :free

data/app/models/concerns/acts_as_purchasable_parent.rb

@@ -39,8 +39,19 @@ module ActsAsPurchasableParent
   end
 
   included do
-    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order'
+
     accepts_nested_attributes_for :orders
+
+    before_destroy do
+      orders.each do |order|
+        raise('unable to destroy a purchasable_parent with purchased orders') if order.purchased?
+        order.voided? ? order.save! : order.void!
+      end
+
+      true
+    end
+
   end
 
 end

data/app/models/effective/deluxe_api.rb

@@ -23,15 +23,51 @@ 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)
       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)
@@ -58,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))
@@ -117,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)
 
@@ -183,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?
 
@@ -223,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
 
@@ -546,13 +548,20 @@ module Effective
       return false unless delayed? 
       return false unless deferred?
       return false unless delayed_payment_intent.present?
-      return false if delayed_payment_date_future?
+      return false if delayed_payment_date_upcoming?
       return false if delayed_payment_purchase_ran_at.present? # We ran before and probably failed
 
       true
     end
 
-    def delayed_payment_date_future?
+    def delayed_payment_info
+      return unless delayed? && deferred?
+      return unless delayed_payment_date_upcoming?
+
+      "Your #{delayed_payment_method} will be charged on #{delayed_payment_date.strftime('%F')} for the full amount of $#{'%0.2f' % total_to_f}"
+    end
+
+    def delayed_payment_date_upcoming?
       return false unless delayed?
       delayed_payment_date > Time.zone.now.to_date
     end
@@ -673,7 +682,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?
@@ -828,6 +839,15 @@ module Effective
       unvoided!(skip_buyer_validations: true)
     end
 
+    def deluxe_delayed_purchase!
+      raise('expected a delayed order') unless delayed?
+      raise('expected a deferred order') unless deferred?
+      raise('expected delayed payment intent') unless delayed_payment_intent.present?
+      raise('expected a deluxe_delayed payment provider') unless payment_provider == 'deluxe_delayed'
+
+      Effective::DeluxeApi.new().purchase_delayed_orders!(self)
+    end
+
     # These are all the emails we send all notifications to
     def emails
       ([purchased_by.try(:email)] + [email] + [user.try(:email)] + Array(organization.try(:billing_emails))).map(&:presence).compact.uniq

data/app/views/effective/orders/_order_deferred.html.haml

@@ -8,6 +8,6 @@
         %tr
           %td
             - if order.delayed?
-              Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')} for the full amount
+              Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
             - else
               Waiting for payment by #{order.payment_provider}

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

@@ -8,18 +8,24 @@
 
         The payment date for this order
 
-        - if order.delayed_payment_date_future?
+        - if order.delayed_payment_date_upcoming?
           is in #{distance} from now on #{order.delayed_payment_date.strftime('%F')}
         - elsif order.delayed_payment_date_today?
           was today
         - else
           was #{distance} ago on #{order.delayed_payment_date.strftime('%F')}
+    
+    - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
 
-    %p
-      Instead of charging your card right away, the following action will securely save a token
-      representing your card information. The full amount will be charged on the payment date.
+    - if order.deferred? && order.delayed?
+      %p Your existing #{order.delayed_payment_method} will be charged on the payment date.
 
-    - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
+      = collapse('Change my card info') do
+        - EffectiveOrders.delayed_providers.each do |provider|
+          = render partial: "/effective/orders/#{provider}/form", locals: provider_locals
+    - else
+      %p
+        Please enter your card information so it can be charged on the payment date.
 
-    - EffectiveOrders.delayed_providers.each do |provider|
-      = render partial: "/effective/orders/#{provider}/form", locals: provider_locals
+      - EffectiveOrders.delayed_providers.each do |provider|
+        = render partial: "/effective/orders/#{provider}/form", locals: provider_locals

data/app/views/effective/orders/delayed/_form_purchase.html.haml

@@ -13,7 +13,7 @@
 
         The payment date for this order
 
-        - if order.delayed_payment_date_future?
+        - if order.delayed_payment_date_upcoming?
           is in #{distance} from now on #{order.delayed_payment_date.strftime('%F')}
         - elsif order.delayed_payment_date_today?
           was today

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.12.2'.freeze
+  VERSION = '6.12.4'.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.2
+  version: 6.12.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails