effective_orders 6.12.4 → 6.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d365ebd0599f72ed9c5bbf7e9e9f26284647135153befe60799452b87fc1e0c
-  data.tar.gz: 913c9fa4e2d528382652c297d6806fb827c79974baebb9890ddd1854449f98d1
+  metadata.gz: 4499fc477da7ba7d00a8550057e754772594ca4622fdfc498ec6ff054b19eb30
+  data.tar.gz: f8c09cce9f19c1e872ae4e1d27e3928d1be8ee0a29dc42d421c0a058bb8e0840
 SHA512:
-  metadata.gz: d5fde239931a219f5e15a29a085dd4f056f12174fb4e6331b5b05369d8798518781e7eddae549edb3d3e8d34a9a8a18896a6a271fa0883a15161f75766cad95b
-  data.tar.gz: 2b0daaa3d6a0b0111efe48cac3db3d2b0073a3a8ed3b51ec5e9beaeaadaee604ae515cdc5c309b33c8a4ad28598bfcbdd3c6f345aa95052543588f31dcc1a6bc
+  metadata.gz: 8bd284864d14aedf394014d9cbea8fca1309a8856564c6f03f5dfe606d3cf123184cbda1d6a61fbfe0b2fdbe0e23be04c9d5979d0d3e371c43e3765e4f614264
+  data.tar.gz: df32798cf7ebd2b0614e28befadef7f1ab391ffd0124c0748b74139f579cdcc6b8919c35c0307c47ed5fdade567a48cb54008cf765ebae39680baca5cd1874f2

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

@@ -119,13 +119,13 @@ module EffectiveOrdersHelper
     end
   end
 
-  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
+  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: false)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred, skip_order: skip_order }
     render(partial: 'effective/orders/checkout_step1', locals: locals)
   end
 
-  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
+  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: false)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred, skip_order: skip_order }
     render(partial: 'effective/orders/checkout_step2', locals: locals)
   end
 

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
@@ -122,6 +131,10 @@ module ActsAsPurchasable
     self[:purchased_at] || purchased_order.try(:purchased_at)
   end
 
+  def deferred_at
+    self[:deferred_at] || orders.find { |order| order.deferred? }.try(:deferred_at)
+  end
+
   def purchased_by?(user)
     purchased_orders.any? { |order| order.purchased_by_id == user.id }
   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?
@@ -558,7 +563,7 @@ module Effective
       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}"
+      "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%F')}"
     end
 
     def delayed_payment_date_upcoming?
@@ -659,6 +664,12 @@ module Effective
       present_order_items.each { |oi| oi.update_purchasable_attributes }
     end
 
+    def update_purchasable_attributes!
+      raise('cannot update purchasable attributes of a purchased order') if purchased?
+      update_purchasable_attributes
+      save!
+    end
+
     # Call this as a way to skip over non consequential orders
     # And mark some purchasables purchased
     # This is different than the Mark as Paid payment processor
@@ -744,6 +755,7 @@ module Effective
 
       assign_attributes(
         delayed_payment_intent: payment_intent, 
+        delayed_payment_total: total(),
 
         payment: payment_to_h(payment),
         payment_card: (card.presence || 'none')

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

@@ -3,20 +3,21 @@
   .effective-order-change-items
     = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow
 
-= render('/effective/orders/order', order: order, no_order_actions: true)
+- unless local_assigns[:skip_order]
+  = render('/effective/orders/order', order: order, no_order_actions: true) 
 
 .effective-order-purchase-actions
   - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url }
 
-  - if EffectiveOrders.free? && order.free?
+  - if EffectiveOrders.delayed? && order.delayed?
+    = render partial: '/effective/orders/delayed/form', locals: provider_locals
+
+  - elsif EffectiveOrders.free? && order.free?
     = render partial: '/effective/orders/free/form', locals: provider_locals
 
   - elsif EffectiveOrders.refund? && order.refund?
     = render partial: '/effective/orders/refund/form', locals: provider_locals
 
-  - elsif EffectiveOrders.delayed? && order.delayed?
-    = render partial: '/effective/orders/delayed/form', locals: provider_locals
-
   - else
     - if EffectiveOrders.pretend?
       = render partial: '/effective/orders/pretend/form', locals: provider_locals

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.4'.freeze
+  VERSION = '6.13.1'.freeze
 end

metadata

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