effective_orders 6.13.0 → 6.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5523fdde5cab838b117069bf24a20a0bc0509265ebbccc033447eb2d5faa9f95
-  data.tar.gz: 4c4040b7ba4845fb531005e97cd18096d3fb915be1c8a041d1fbbdff649d811e
+  metadata.gz: 4499fc477da7ba7d00a8550057e754772594ca4622fdfc498ec6ff054b19eb30
+  data.tar.gz: f8c09cce9f19c1e872ae4e1d27e3928d1be8ee0a29dc42d421c0a058bb8e0840
 SHA512:
-  metadata.gz: 36f22450eeeb3ffbd0755f9f840ae4be8ffd39d7a6ba9095005ee51044781d05a616f929adfe58b7a42678b42c85135c82dfdb572767ca527b6bd35a357e02d7
-  data.tar.gz: 927f6c0dcd4f715010fd073e056357a875222cc026b84159db6616c1ba2d36815017fab998f648969d39dba3950f53b7f5543a7f5319ad5fa835c6e9b8213d54
+  metadata.gz: 8bd284864d14aedf394014d9cbea8fca1309a8856564c6f03f5dfe606d3cf123184cbda1d6a61fbfe0b2fdbe0e23be04c9d5979d0d3e371c43e3765e4f614264
+  data.tar.gz: df32798cf7ebd2b0614e28befadef7f1ab391ffd0124c0748b74139f579cdcc6b8919c35c0307c47ed5fdade567a48cb54008cf765ebae39680baca5cd1874f2

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

@@ -131,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/order.rb

@@ -563,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?
@@ -664,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

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/lib/effective_orders/version.rb

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