caboose-cms 0.5.124 → 0.5.125

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY5NjcwMmI1ZWJmYWI4NmZkNGE1ZGY2N2M3OWU4NzQ0NTkwOWI2MQ==
+    ZjMxMTI2ZDVkYmZiYjMwOTUwMzM3OTgzM2M4NDIwZjhiNmMyNWM2OQ==
   data.tar.gz: !binary |-
-    MGE2ZmE4MTZjZjkxNWY3YmJmYTQzZmIyYjRjOWY2ZWI3OWExMjBmZg==
+    YTgyNjNlYzllMDgyOTViNzlkYjcxN2Q0NzNlMGE5ZTQ3Zjk5ZTFhOA==
 SHA512:
   metadata.gz: !binary |-
-    YzljNTMwODgxMTgxMjIxN2VjMmM0ZGRjMTA1MGUzZTlhZjFmZDQ5NTRmOWY4
-    ZmRmM2EyNmUxOTE1ODUzZGNhZDAwNjQ5OTQyNmFjNDNkOTJiYjk1NDE0M2Ew
-    MjQ4NDJhNGM1NjMwMTdiNWNkYTRmODlkMDBiOTg4NDFjNTZlYmQ=
+    MzNmYTYyNDVkYzkwZmJkYzVmODhkMmZkZGNlMDM4YjJmNTVkYjY2Y2NiMTVi
+    NzQyMTlhNDU3OTIyNWM5NWUxYmI5NDU2NTgwNWIwMGQxZjc5YjZhNTQzZmJj
+    MTk5NDlkYmZhMTYwYmY2YzAxODcxODFmNDQ0ZDk1ODRkZTI2YTY=
   data.tar.gz: !binary |-
-    NDc3OWE3ODYzYWRmNjkyYTdmZmUyM2IxMmQ1ODQwYmQ1MzAzNTRjMDU5MjQ1
-    YTJmYjA1MWJhYmVlMjQyMGQ2ZDlkOGYyZTFiMTU5ODk5YTMwYjkwOTgwZjI0
-    OGY3Yzc3ZjJmNGY1MDk2Y2U0YTgwZTA5MmU5NmI0YzE0Njg3N2U=
+    YWY0YmI0YjQzNjI5NmE1NjAxZjg5YWIyYzZlOGM3ZDU4YTNlYzFhOGFkNGZi
+    NmJiN2I4OWZkMTc5OTdjYmI1YWNjMTcwMjY4MzA0YmQ1MTg4NmNjMzY3MmJl
+    MzhjYjE4ZDBhMGY5MjJjNTRmNGNjZGFmOTI0OGQ0NDBlM2QxZjQ=

data/app/controllers/caboose/variants_controller.rb

@@ -141,10 +141,12 @@ module Caboose
             v.product.delay(:run_at => 3.seconds.from_now).update_on_sale            
           when 'date_sale_starts'
             v.date_sale_starts = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
-            v.product.delay(:run_at => v.date_sale_starts).update_on_sale                                  
+            v.product.delay(:run_at => v.date_sale_starts).update_on_sale
+            v.product.delay(:run_at => 3.seconds.from_now).update_on_sale
           when 'date_sale_ends'
             v.date_sale_ends = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
-            v.product.delay(:run_at => v.date_sale_ends).update_on_sale                                  
+            v.product.delay(:run_at => v.date_sale_ends).update_on_sale  
+            v.product.delay(:run_at => 3.seconds.from_now).update_on_sale
         end
       end
       resp.success = save && v.save

data/app/models/caboose/product.rb

@@ -107,7 +107,7 @@ module Caboose
       
       self.variants.each do |variant|        
         next if variant.nil? || variant.price.nil? || variant.price <= 0
-        price = variant.on_sale? ? v.sale_price : v.price
+        price = variant.on_sale? ? variant.sale_price : variant.price
         min = price if price < min
         max = price if price > max
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.124'
+  VERSION = '0.5.125'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.124
+  version: 0.5.125
 platform: ruby
 authors:
 - William Barry