effective_orders 6.12.3 → 6.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f5fbabf9c4012193962576f7ef67838e17e382740ad3860ab9c9f527ce86787
-  data.tar.gz: 71f6af17259b5b62ee66b2fd993bb085dc8411ad8040c21fa0a3bc639381c655
+  metadata.gz: 5523fdde5cab838b117069bf24a20a0bc0509265ebbccc033447eb2d5faa9f95
+  data.tar.gz: 4c4040b7ba4845fb531005e97cd18096d3fb915be1c8a041d1fbbdff649d811e
 SHA512:
-  metadata.gz: 60eff8ba4e046b46575a23c98daf14b0ba07cf548041826590ac49c3bf193cde6632437baeae38bfe011f37a3cae0e7d3d5d444aeeb0340a0990d1c93a88ce2b
-  data.tar.gz: 9b91126b76b01d50fefc86b31d1a163dfe8164c523f69a2c3a523a827c632faaf0b0b5e13e0174b01450078dd32754a76157b5c4338b39b16b47a10ca1d25c59
+  metadata.gz: 36f22450eeeb3ffbd0755f9f840ae4be8ffd39d7a6ba9095005ee51044781d05a616f929adfe58b7a42678b42c85135c82dfdb572767ca527b6bd35a357e02d7
+  data.tar.gz: 927f6c0dcd4f715010fd073e056357a875222cc026b84159db6616c1ba2d36815017fab998f648969d39dba3950f53b7f5543a7f5319ad5fa835c6e9b8213d54

data/app/datatables/admin/effective_orders_datatable.rb

@@ -104,6 +104,7 @@ module Admin
         col :delayed_payment, visible: false
         col :delayed_payment_date
         col :delayed_payment_intent, visible: false
+        col :delayed_payment_total, as: :price, visible: false
         col :delayed_payment_purchase_ran_at, visible: false
         col :delayed_payment_purchase_result, visible: false
       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.rb

@@ -110,6 +110,15 @@ module ActsAsPurchasable
     self[:tax_exempt] || false
   end
 
+  def purchased_or_deferred?
+    purchased_order_id.present? || orders.any? { |order| order.purchased? || order.deferred? }
+  end
+
+  def purchased_or_deferred_at
+    order = orders.find { |order| order.purchased? } || orders.find { |order| order.deferred? } 
+    order&.purchased_at || order&.deferred_at
+  end
+
   def purchased?
     purchased_order_id.present?
   end

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

@@ -65,7 +65,7 @@ module Effective
     end
 
     # After we store a payment intent we can call purchase! immediately or wait till later.
-    # This calls Authorize Payment and Complete Payment
+    # This calls the /payments Create Payment endpoint
     # Returns true when purchased. Returns false when declined.
     # The response is stored in api.payment() after this is run
     def purchase!(order, payment_intent)
@@ -75,18 +75,10 @@ module Effective
 
       # Start a purchase. Which is an Authorization and a Completion
       self.purchase_response = nil
-
-      # Process Authorization
-      authorization = authorize_payment(order, payment_intent)
-      self.purchase_response = authorization
-
-      valid = [0].include?(authorization['responseCode'])
-      return false unless valid
-
-      ## Complete Payment
-      payment = complete_payment(order, authorization)
+      payment = create_payment(order, payment_intent)
       self.purchase_response = payment
 
+      # Validate
       valid = [0].include?(payment['responseCode'])
       return false unless valid
 
@@ -94,11 +86,35 @@ module Effective
       true
     end
 
+    # Create Payment
+    def create_payment(order, payment_intent)
+      response = post('/payments', params: create_payment_params(order, payment_intent))
+
+      # Sanity check response
+      raise('expected responseCode') unless response.kind_of?(Hash) && response['responseCode'].present?
+
+      # Sanity check response approved vs authorized
+      valid = [0].include?(response['responseCode'])
+
+      # We might be approved for an amount less than the order total. Not sure what to do here
+      if valid && (amountApproved = response['amountApproved']) != (amountAuthorized = order.total_to_f)
+        raise("expected complete payment amountApproved #{amountApproved} to be the same as the amountAuthorized #{amountAuthorized} but it was not")
+      end
+
+      # Generate the card info we can store
+      card = card_info(payment_intent)
+
+      # Return the response merged with the card info
+      response.reverse_merge(card)
+    end
+
+    # The response from last create payment request
     def payment
       raise('expected purchase response to be present') unless purchase_response.kind_of?(Hash)
       purchase_response
     end
 
+    # Called by rake task
     def purchase_delayed_orders!(orders)
       now = Time.zone.now
 
@@ -144,51 +160,7 @@ module Effective
 
     protected
 
-    # Authorize Payment
-    def authorize_payment(order, payment_intent)
-      response = post('/payments/authorize', params: authorize_payment_params(order, payment_intent))
-
-      # Sanity check response
-      raise('expected responseCode') unless response.kind_of?(Hash) && response['responseCode'].present?
-
-      # Sanity check response approved vs authorized
-      valid = [0].include?(response['responseCode'])
-
-      # We might be approved for an amount less than the order total. Not sure what to do here
-      if valid && (amountApproved = response['amountApproved']) != (amountAuthorized = order.total_to_f)
-        raise("expected authorize payment amountApproved #{amountApproved} to be the same as the amountAuthorized #{amountAuthorized} but it was not")
-      end
-
-      # Generate the card info we can store
-      card = card_info(payment_intent)
-
-      # Return the authorization params merged with the card info
-      response.reverse_merge(card)
-    end
-
-    # Complete Payment
-    def complete_payment(order, authorization)
-      response = post('/payments/complete', params: complete_payment_params(order, authorization))
-
-      # Sanity check response
-      raise('expected responseCode') unless response.kind_of?(Hash) && response['responseCode'].present?
-
-      # Sanity check response approved vs authorized
-      valid = [0].include?(response['responseCode'])
-
-      # We might be approved for an amount less than the order total. Not sure what to do here
-      if valid && (amountApproved = response['amountApproved']) != (amountAuthorized = order.total_to_f)
-        raise("expected complete payment amountApproved #{amountApproved} to be the same as the amountAuthorized #{amountAuthorized} but it was not")
-      end
-
-      # The authorization information
-      authorization = { 'paymentId' => authorization } if authorization.kind_of?(String)
-
-      # Return the complete params merged with the authorization params
-      response.reverse_merge(authorization)
-    end
-
-    def authorize_payment_params(order, payment_intent)
+    def create_payment_params(order, payment_intent)
       raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
 
       token = extract_token(payment_intent)
@@ -232,28 +204,24 @@ module Effective
         ({ name: 'organization_id', value: order.organization_id.to_s } if order.organization_id.present?)
       ].compact
 
-      # Params passed into Authorize Payment
-      {
+      orderData = {
+        autoGenerateOrderId: true,
+        orderID: order.to_param,
+        orderIdIsUnique: true
+      }
+
+      # Params passed into Create Payment
+      params = {
+        paymentType: "Sale",
         amount: amount, 
         paymentMethod: paymentMethod,
         shippingAddress: shippingAddress,
         customData: customData,
+        merchantCategory: "E-Commerce",
+        orderData: orderData
       }.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?
 

data/app/models/effective/order.rb

@@ -100,10 +100,11 @@ module Effective
       delayed_payment         :boolean
       delayed_payment_date    :date
 
-      # When the order goes to checkout we require the delayed_payment_intent
-      # This stores the user's card information in a secure way
+      # When the order goes to checkout we require the delayed_payment_intent and total
+      # This stores the user's card information
       # This is required for the order to become deferred?
       delayed_payment_intent  :text
+      delayed_payment_total   :integer  # Only for reference, not really used. This is the order total we showed them when they last save card info'd
 
       # Set by the rake task that runs 1/day and processes any delayed orders before or on that day
       delayed_payment_purchase_ran_at   :datetime
@@ -192,7 +193,11 @@ module Effective
     # Delayed Payment Validations
     validates :delayed_payment_date, presence: true, if: -> { delayed_payment? }
     validates :delayed_payment_date, absence: true, unless: -> { delayed_payment? }
-    validates :delayed_payment_intent, presence: { message: 'please provide your card information' }, if: -> { delayed? && deferred? }
+
+    with_options(if: -> { delayed? && deferred? }) do
+      validates :delayed_payment_intent, presence: { message: 'please provide your card information' }
+      validates :delayed_payment_total, presence: true
+    end
 
     validate do
       if EffectiveOrders.organization_enabled?
@@ -548,13 +553,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
@@ -737,6 +749,7 @@ module Effective
 
       assign_attributes(
         delayed_payment_intent: payment_intent, 
+        delayed_payment_total: total(),
 
         payment: payment_to_h(payment),
         payment_card: (card.presence || 'none')
@@ -832,6 +845,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/db/migrate/101_create_effective_orders.rb

@@ -43,6 +43,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[6.0]
       t.boolean   :delayed_payment, default: false
       t.date      :delayed_payment_date
       t.text      :delayed_payment_intent
+      t.integer   :delayed_payment_total
       t.datetime  :delayed_payment_purchase_ran_at
       t.text      :delayed_payment_purchase_result
 

data/lib/effective_orders/version.rb

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

metadata

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