effective_orders 6.16.3 → 6.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d05df34a90172ec81cc5cae1f0cc206236358f70601c644e0468bd860d2481f
-  data.tar.gz: f5f8d8a13a508f10f88d3a45ce3aaebe7280830228900cd53b4025fd2e7d0f28
+  metadata.gz: bcd28b8d2dda1a9982419e2cfbb46de103d59de912ba3c95de4bd213389708cc
+  data.tar.gz: 216dab4a26eeeef06bf80b6a71e462ea0834bb084037bd9116b1057e68e8933c
 SHA512:
-  metadata.gz: c7957c31b1eacf9f6119f327f541636c65ec738742f9dff5c2e2363ebea81d1be1126a58ae8f024489abb0038b7e94159cdca4d91b10160a1c8ad1e12d4c68a5
-  data.tar.gz: ccce3f3ccbfa90884daa1259ddbf1f4d13afce92d05fdaa57acf6f1b1b0b69f18b2d155fc18c39c34d38a9e90c2d976cb34fbe448d174e6f8fc3d3bc2ff86ec2
+  metadata.gz: e8408c08ee2d9efaa894f53b3f01431410a8888af0cd0f37cca76b7bf429ad8fbe925eb239dd5d3db0a9b4f90459d7360a26fdd0e3d0d1a4a7d6da81c43d0011
+  data.tar.gz: 143ab80fe0744376ba4f3b2bbe1b66a4bbb5971de311cca4953458f983cd0f98fc263255a1d2bea249e0eb14c0301ec62ce2c5df6e0c1a33ab591090a5d5c01f

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/models/effective/deluxe_api.rb

@@ -271,7 +271,7 @@ module Effective
         paymentMethod: paymentMethod,
         shippingAddress: shippingAddress,
         customData: customData,
-        merchantCategory: "E-Commerce",
+        merchantCategory: "MOTO",
         orderData: orderData
       }.compact
     end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.16.3'.freeze
+  VERSION = '6.17.0'.freeze
 end

metadata

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