effective_orders 6.16.4 → 6.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc70e63297bba4d6b81db96f3fde44ea6cd46afb084498cb7e462c2bebe7c8ba
-  data.tar.gz: bbd17f89c21994543925a0ddd5862ad3bc2e47318da9de27c45c41129e924e95
+  metadata.gz: 1694915aa5c646859677437bf8eef6227c2301dd850928cb4d7c179fcf74a17a
+  data.tar.gz: 702d26261725a04e5ef44ae247aa98719204f2090d99f0e7326ec91422f792a2
 SHA512:
-  metadata.gz: '087d6eb535b19ef97af82fe9cfd6b399da6954121e36567b316cbd8576d98b6de3d71dc9d10198bd08670f6ff2ad928591730bfa2fb4ee3175a6986c39dc2fcd'
-  data.tar.gz: 1558fa105fbad61f78be06a0e0757dd823731e205915fb3d780a02eb51ab21feb38354b03c2598e08509e7de35daa22314b9152bde59b0a83d24cbb2f961dfed
+  metadata.gz: eace5c4d6ab80404524a861323b58dff8e7f84af4714ec3001eb29724faf545dda03312a5c92b362364512e93113051c601428455a43689be8912d0318192a96
+  data.tar.gz: c63d78cc2e5e97c66f4995124753722bcd55ba7ed7edc2b28ccf58bf62dc710ad02298339fc8935fc115284efabffda2ac5280ee971ed5d8b88054a134b90ddf

data/app/models/concerns/acts_as_purchasable.rb

@@ -49,14 +49,47 @@ module ActsAsPurchasable
       validates_with Effective::SoldOutValidator, on: :create
     end
 
-    scope :purchased, -> { where.not(purchased_order_id: nil) }
-    scope :not_purchased, -> { where(purchased_order_id: nil) }
-
-    scope :purchased_by, lambda { |user| joins(order_items: :order).where(orders: { purchased_by: user, status: :purchased }).distinct }
-    scope :not_purchased_by, lambda { |user| where.not(id: purchased_by(user)) }
-
-    scope :purchased_or_deferred, -> { joins(order_items: :order).where(orders: { status: [:purchased, :deferred] }) }
-    scope :deferred, -> { joins(order_items: :order).where(orders: { status: :deferred }) }
+    scope :purchased, -> { 
+      if respond_to?(:unarchived)
+        unarchived.where.not(purchased_order_id: nil) 
+      else
+        where.not(purchased_order_id: nil) 
+      end
+    }
+
+    scope :not_purchased, -> { 
+      if respond_to?(:unarchived)
+        unarchived.where(purchased_order_id: nil) 
+      else
+        where(purchased_order_id: nil) 
+      end
+    }
+
+    scope :purchased_or_deferred, -> { 
+      if respond_to?(:unarchived)
+        unarchived.joins(order_items: :order).where(orders: { status: [:purchased, :deferred] }) 
+      else
+        joins(order_items: :order).where(orders: { status: [:purchased, :deferred] }) 
+      end
+    }
+
+    scope :deferred, -> { 
+      if respond_to?(:unarchived)
+        unarchived.joins(order_items: :order).where(orders: { status: :deferred })
+      else
+        joins(order_items: :order).where(orders: { status: :deferred })
+      end
+    }
+
+    scope :purchased_by, -> (user) { 
+      if respond_to?(:unarchived)
+        unarchived.joins(order_items: :order).where(orders: { purchased_by: user, status: :purchased }).distinct 
+      else
+        joins(order_items: :order).where(orders: { purchased_by: user, status: :purchased }).distinct 
+      end
+    }
+
+    scope :not_purchased_by, -> (user) { where.not(id: purchased_by(user)) }
   end
 
   module ClassMethods

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

@@ -4,7 +4,7 @@
     = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow
 
 - unless local_assigns[:skip_order]
-  = render('/effective/orders/order', order: order, no_order_actions: true) 
+  = render('/effective/orders/order', order: order)
 
 .effective-order-purchase-actions
   - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url }

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

@@ -10,7 +10,7 @@
             - if order.delayed?
               %p Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
             - else
-              %p Waiting for payment by #{order.payment_provider}
+              %p Waiting for payment by #{order.payment_provider}.
 
               - if order.payment_provider == "etransfer" && (EffectiveOrders.etransfer[:success] rescue false).present?
                 %p= EffectiveOrders.etransfer[:success].html_safe

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.16.4'.freeze
+  VERSION = '6.17.1'.freeze
 end

metadata

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