effective_orders 6.5.2 → 6.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd209b4bfdd333ea96dfa7c850a3d136738b8bb355547707d389521dfad03c2
-  data.tar.gz: 2df312bdfb0ecb45095f2dd7067f95f091e3fe0247cfdb44957de1b517eb52ef
+  metadata.gz: 71798da0cd20778fab3e106211f2e7b0ef691f38ba568e9161739b6016a54c18
+  data.tar.gz: 5261409794ba913635a2966cc6afc7086f4e31e3cc80aea214716270d65536fc
 SHA512:
-  metadata.gz: f4d65e073900587f76a08122998cb06d84da8df4006226fb5fd6c272015c277e9440d8719a989b563d5795743fe4a23f0a06cc004d57ed5dd19f4547d544cb8b
-  data.tar.gz: 630ce183e1a5691800eec6ad28fedb074fa6a17dcbb05ff85e8c1f671df5148cd075c09d02193b0ea93bbd77e026fa07af325694e69668e9c9441c87e8ec3ff4
+  metadata.gz: 9ed613f93dba098d010277e6bf8cd0eeeba6ef9e3f66d417e5010558c31f1132250e1ee83afe9b9f9a1b8356d60e0118a8178ddba4208e0b4927b9eabec8a955
+  data.tar.gz: c19f20987bfb6e0431eba2a0b5e45b70f824202c9a894223891a7f93d5bf16504271918a501153249bd54183aa3f0c04ff1e4b9126666aafcad9dafa7ed9118d

data/app/models/effective/order.rb

@@ -583,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

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.2'.freeze
+  VERSION = '6.5.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.5.2
+  version: 6.5.3
 platform: ruby
 authors:
 - Code and Effect