effective_orders 6.14.0 → 6.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbb9b1f68ae5470c0d64b4e7d27ca32cdcd21c99ce4cdcf36cd06182852bf85
-  data.tar.gz: 91732e8679f53cc672cdcf888e79680882cf83fe92a955d95e8a299719eb18ba
+  metadata.gz: 6bd29353ae8797a9589a4a80bd592c376f008e82df8c216ec691967e4c4e5a96
+  data.tar.gz: 5bff3315e5bd67b4e23eb90c1fb17e8d5267c9a21d12efe5791230f7f675e729
 SHA512:
-  metadata.gz: 974902ddc3095ec659b94e6af5ad8c45ae29ca52f1fa790cf6f787f22ecbc48d2bf1127c50ca0b9d396471700a928c30c734d8dd812b75a204d6ff1e4cc6f572
-  data.tar.gz: 1b02ad24cb46a6377c68a68dbe705e23a201860f4696ca1122237c5d228e01ee72951a05dd74e4ebda2cc92c41fc2c01e2e1bf7f62881fc51cb58f46abfa543c
+  metadata.gz: b8bafbde6a79e146b216f982ee6b292c93966918e9f2d8e74a21b9951d352dbe10c8d57e5380eb9482b3163bb7f5ced4a17b69884c1987d6ca767020e904ddaa
+  data.tar.gz: 76f4706faff04901d8a4061125624560bfcad049bd2be920095c46cc53cf6f7954fb13668a808622135dd95b23f286db5322dea3290b51a7d4dfc22cd237ee6c

data/app/helpers/effective_orders_helper.rb

@@ -119,12 +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, skip_order: false)
+  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: nil)
     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, skip_order: false)
+  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: nil)
+    skip_order = order.delayed_payment_date_upcoming? if skip_order.nil?
     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/effective/order.rb

@@ -566,6 +566,12 @@ module Effective
       "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%F')}"
     end
 
+    def delayed_payment_date_past?
+      return false unless delayed?
+      delayed_payment_date <= Time.zone.now.to_date
+    end
+
+    # This is checked by an effective_orders view helper. When upcoming we only collect card info.
     def delayed_payment_date_upcoming?
       return false unless delayed?
       delayed_payment_date > Time.zone.now.to_date
@@ -576,11 +582,6 @@ module Effective
       delayed_payment_date == Time.zone.now.to_date
     end
 
-    def delayed_payment_date_past?
-      return false unless delayed?
-      delayed_payment_date < Time.zone.now.to_date
-    end
-
     def pending_refund?
       return false if EffectiveOrders.buyer_purchases_refund?
       return false if purchased?

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

@@ -9,7 +9,7 @@
 .effective-order-purchase-actions
   - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url }
 
-  - if EffectiveOrders.delayed? && order.delayed?
+  - if EffectiveOrders.delayed? && order.delayed_payment_date_upcoming?
     = render partial: '/effective/orders/delayed/form', locals: provider_locals
 
   - elsif EffectiveOrders.free? && order.free?

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

@@ -5,6 +5,7 @@
   = render partial: 'effective/orders/order_header', locals: { order: order }
   = render partial: 'effective/orders/order_payment', locals: { order: order }
   = render partial: 'effective/orders/order_shipping', locals: { order: order }
+  = render partial: 'effective/orders/order_declined', locals: { order: order }
   = render partial: 'effective/orders/order_deferred', locals: { order: order }
   = render partial: 'effective/orders/order_notes', locals: { order: order }
   = render partial: 'effective/orders/order_items', locals: { order: order }

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

@@ -0,0 +1,10 @@
+- if order.declined?
+  .effective-order-declined
+    %table.table
+      %thead
+        %tr
+          %th Payment Declined
+      %tbody
+        %tr
+          %td
+            Your card was declined by the payment processor: #{order.declined_reason}

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

@@ -13,4 +13,10 @@
       -# This is set by the deluxe.js javascript on Submit
       = f.hidden_field :payment_intent, required: true
 
+      - if EffectiveOrders.deluxe[:environment] == 'sandbox'
+        .alert.alert-info.mb-4
+          This is the #{Rails.env.upcase} SERVER.
+          %br
+          Use credit card number 4242 4242 4242 4242 with any future expiry and any CVC.
+
       = render('effective/orders/deluxe/element')

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

@@ -7,4 +7,10 @@
   -# This is set by the deluxe.js javascript on Submit
   = f.hidden_field :payment_intent, required: true
 
+  - if EffectiveOrders.deluxe[:environment] == 'sandbox'
+    .alert.alert-info.mb-4
+      This is the #{Rails.env.upcase} SERVER.
+      %br
+      Use credit card number 4242 4242 4242 4242 with any future expiry and any CVC.
+
   = render('effective/orders/deluxe_delayed/element')

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.14.0'.freeze
+  VERSION = '6.14.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.14.0
+  version: 6.14.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -286,6 +286,7 @@ files:
 - app/views/effective/orders/_layout.html.haml
 - app/views/effective/orders/_order.html.haml
 - app/views/effective/orders/_order_actions.html.haml
+- app/views/effective/orders/_order_declined.html.haml
 - app/views/effective/orders/_order_deferred.html.haml
 - app/views/effective/orders/_order_footer.html.haml
 - app/views/effective/orders/_order_header.html.haml