effective_orders 6.5.1 → 6.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e50d0522839732f2b09182eed975cfc98db1f63d45702bc36e64a41469d218
-  data.tar.gz: 670ca09718feb451ec82a7afd756a8ce836133142f6054270df26963b99443d9
+  metadata.gz: 71798da0cd20778fab3e106211f2e7b0ef691f38ba568e9161739b6016a54c18
+  data.tar.gz: 5261409794ba913635a2966cc6afc7086f4e31e3cc80aea214716270d65536fc
 SHA512:
-  metadata.gz: 227bd996aa9b95c20413c674527f4bf55cd9464ddecab2f11560bb42eb08094b41d619dfe5b9458a0670a346db7ad4d2763b3aa5b6eaa567fc18a45b8711d596
-  data.tar.gz: 9a34850eeedb567162e452bd5d9165eabf1a34fd151d0fa16b6eb808b813d761d1c558b29de408fd230dbc2361845d629da844258d2470b10c15f85491f7be0b
+  metadata.gz: 9ed613f93dba098d010277e6bf8cd0eeeba6ef9e3f66d417e5010558c31f1132250e1ee83afe9b9f9a1b8356d60e0118a8178ddba4208e0b4927b9eabec8a955
+  data.tar.gz: c19f20987bfb6e0431eba2a0b5e45b70f824202c9a894223891a7f93d5bf16504271918a501153249bd54183aa3f0c04ff1e4b9126666aafcad9dafa7ed9118d

data/app/models/effective/order.rb

@@ -112,6 +112,7 @@ module Effective
       before_validation { assign_user_address }
       before_validation { assign_billing_name }
       before_validation { assign_billing_email }
+      before_validation { assign_order_item_values }
       before_validation { assign_order_values }
       before_validation { assign_order_charges }
     end
@@ -582,6 +583,12 @@ module Effective
       false
     end
 
+    # Called by effective_memberships to update prices from purchasable fees
+    # Not called internally
+    def update_purchasable_attributes
+      present_order_items.each { |oi| oi.update_purchasable_attributes }
+    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
@@ -840,12 +847,14 @@ module Effective
       end
     end
 
-    # This overwrites the prices, taxes, surcharge, etc on every save.
+    # These two overwrites the prices, taxes, surcharge, etc on every save.
     # Does not get run from the before_validate on purchase.
-    def assign_order_values
+    def assign_order_item_values
       # Copies prices from purchasable into order items
       present_order_items.each { |oi| oi.assign_purchasable_attributes }
+    end
 
+    def assign_order_values
       # Calculated from each item
       self.subtotal = get_subtotal()
 

data/app/models/effective/order_item.rb

@@ -37,7 +37,17 @@ module Effective
 
     # This method is called in a before_validation in order.assign_order_values()
     def assign_purchasable_attributes
-      assign_attributes(name: purchasable.purchasable_name, price: purchasable.price, tax_exempt: purchasable.tax_exempt) if purchasable
+      return unless purchasable.present?
+
+      self.name ||= purchasable.purchasable_name
+      self.price ||= purchasable.price
+      self.tax_exempt = purchasable.tax_exempt if self.tax_exempt.nil?
+    end
+
+    def update_purchasable_attributes
+      if purchasable.present? && !marked_for_destruction?
+        assign_attributes(name: purchasable.purchasable_name, price: purchasable.price, tax_exempt: purchasable.tax_exempt)
+      end
     end
 
     def build_purchasable(atts = {})

data/db/migrate/01_create_effective_orders.rb.erb

@@ -48,7 +48,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
 
       t.string    :name
       t.integer   :quantity
-      t.integer   :price, :default => 0
+      t.integer   :price
       t.boolean   :tax_exempt
 
       t.timestamps

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.5.1'.freeze
+  VERSION = '6.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -340,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts