effective_orders 6.6.2 → 6.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a4f7535e5766ae1bff99cbabd94b9b134c381c255a8f745ef6e63f5685f7cb
-  data.tar.gz: e55dd3dd359e7e46bd5bedb251eece208e36cabefef22caaa8c57e3eb84ee9c1
+  metadata.gz: 02717fdbe9f5c91a4c6331982a1af5dd676fc06ababd575d0df0d8d80d2c5849
+  data.tar.gz: de81310a27bedc63d827cc0aaaff6073afa5c634136bceabe2ad7e286964b8c3
 SHA512:
-  metadata.gz: 968a79995bdd6ea7bb51d170145dc375fa6db28095238fad9f18c3e18b6126b4179e692715ae02f68fa707f9c94506418039250691dbf771e690ebe6413784d1
-  data.tar.gz: 0a346ecf19463553ebf8ee7ced123067ac750809036de53ba09775fb72a8d870572bfb49d2d8a16d91a9e41c10ed3aff5bdf4d31f97861ee477cc66399688061
+  metadata.gz: 8792b83fbfc309b9c351665c8f4a3cf34e3d87014c27465c8211d98ae7e1623b16a34cdea8199fab78647b060e75e38f53b89189d955317188e9a630543015d7
+  data.tar.gz: a514c76ef7b8ccba74b3ae81bb2da0a9534193044471811d2a09a9ca65b93d6caa86aa57e27cf90f05041b9a6ef9e591b9f6a224c63b5455e4ca3db60bc1d077

data/app/models/concerns/acts_as_purchasable.rb

@@ -9,6 +9,8 @@
 # add_column :resources, :price, :integer
 # add_column :resources, :tax_exempt, :boolean, default: false
 # add_column :resources, :qb_item_name, :string
+#
+# You can also optionally add :purchased_at :datetime, and purchased_by_id and purchased_by_type
 
 module ActsAsPurchasable
   extend ActiveSupport::Concern
@@ -104,7 +106,7 @@ module ActsAsPurchasable
   end
 
   def purchased_at
-    purchased_order.try(:purchased_at)
+    self[:purchased_at] || purchased_order.try(:purchased_at)
   end
 
   def purchased_by?(user)

data/app/models/effective/order.rb

@@ -459,7 +459,7 @@ module Effective
     end
 
     def purchasables
-      present_order_items.map { |order_item| order_item.purchasable }
+      present_order_items.map { |order_item| order_item.purchasable }.compact
     end
 
     def subtotal
@@ -596,8 +596,8 @@ module Effective
     # 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
-    def mark_as_purchased!
-      purchase!(skip_buyer_validations: true, email: false, skip_quickbooks: true)
+    def mark_as_purchased!(current_user: nil)
+      purchase!(skip_buyer_validations: true, email: false, skip_quickbooks: true, current_user: current_user)
     end
 
     # Effective::Order.new(items: Product.first, user: User.first).purchase!(email: false)
@@ -882,7 +882,18 @@ module Effective
     end
 
     def update_purchasables_purchased_order!
-      order_items.each { |oi| oi.purchasable&.update_column(:purchased_order_id, self.id) }
+      purchasables.each do |purchasable| 
+        columns = {
+          purchased_order_id: id,
+          purchased_at: (purchased_at if purchasable.respond_to?(:purchased_at=)),
+          purchased_by_id: (purchased_by_id if purchasable.respond_to?(:purchased_by_id=)),
+          purchased_by_type: (purchased_by_type if purchasable.respond_to?(:purchased_by_type=))
+        }.compact
+
+        purchasable.update_columns(columns)
+      end
+
+      true
     end
 
     def run_purchasable_callbacks(name)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.6.2'.freeze
+  VERSION = '6.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.6.2
+  version: 6.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails