caboose-cms 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1dc62676f228e072765b01730da01c40c6de169
-  data.tar.gz: 6e6e41ffc74f7f5f43459a043207e7861dcb26d8
+  metadata.gz: 6e874f1cc3a49bfb9ca519da804aaef5c4da22b2
+  data.tar.gz: dfd0a6d5d8579bf3e507b6c695b87c971f819946
 SHA512:
-  metadata.gz: eac09898d009bf5bbb158eec4d344f95ea06f08d86c8250f2393e5827142fce4e3ed973c8b95fe2fe400efab388c095fc747c0ad44fe0f3ee271d1c00d3fe9c3
-  data.tar.gz: d06ee88853669829c7864fa4a86d774694afa75d497129d4f96e790a7a3ec229980623ae61bbf5866e5f234ff62994d1a5cfc547a2b714aa8aeb94de36812220
+  metadata.gz: 7d53a02acd2f30c9e96127f450dd23904c6dae8b15ae8dc3567e3fd0e403d832c6f1f674416319325e2dea4546487965962ad0f6994853cd1f04f2951e0d024a
+  data.tar.gz: 0e24809540ebf8edafed45437328a6403dc156dea7a8ef0a6bcae3fc46cb27ec4d1dbb67d9de3141f8733b90fc6ea86315e004d0f1c3d0bf76a6a324b2686a82

data/app/controllers/caboose/variant_limits_controller.rb

@@ -39,8 +39,8 @@ module Caboose
         c = VariantLimit.new
         c.user_id = params[:user_id]
         c.variant_id = params[:variant_id]
-        c.min_quantity = 0
-        c.max_quantity = 0
+        c.min_quantity_value = 0
+        c.max_quantity_value = 0
         c.current_value = 0
         c.save
         resp.success = true
@@ -58,11 +58,13 @@ module Caboose
 
         params.each do |k,v|
           case k
-            when "user_id" then variantlimit.user_id = v
-            when "variant_id" then variantlimit.variant_id = v
-            when "min_quantity" then variantlimit.min_quantity = v
-            when "max_quantity" then variantlimit.max_quantity = v
-            when "current_value" then variantlimit.current_value = v
+            when "user_id"            then variantlimit.user_id            = v
+            when "variant_id"         then variantlimit.variant_id         = v
+            when "min_quantity_value" then variantlimit.min_quantity_value = v
+            when "min_quantity_func"  then variantlimit.min_quantity_func  = v
+            when "max_quantity_value" then variantlimit.max_quantity_value = v
+            when "max_quantity_func"  then variantlimit.max_quantity_func  = v
+            when "current_value"      then variantlimit.current_value      = v
           end
         end
 

data/app/models/caboose/schema.rb

@@ -31,7 +31,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::InvoiceTransaction => { :order_id => :invoice_id },
       Caboose::LineItem           => { :order_id => :invoice_id, :order_package_id  => :invoice_package_id },
       Caboose::RetargetingConfig  => { :conversion_id   => :google_conversion_id, :labels_function => :google_labels_function },
-      Caboose::StoreConfig        => { :starting_order_number => :starting_invoice_number }
+      Caboose::StoreConfig        => { :starting_order_number => :starting_invoice_number }                  
     }
   end
 
@@ -96,6 +96,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Site => [:shipping_cost_function],
       Caboose::StoreConfig => [:use_usps, :allowed_shipping_codes, :default_shipping_code, :pp_relay_url, :pp_response_url],
       Caboose::Variant => [:quantity, :on_sale],
+      Caboose::VariantLimit => [:min_quantity, :max_quantity],
       Caboose::Vendor => [:vendor, :vendor_id]
     }
   end
@@ -972,11 +973,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :is_bundle                     , :boolean   , { :default => false }]
       ],
       Caboose::VariantLimit => [
-        [ :variant_id       , :integer ],
-        [ :user_id          , :integer ],
-        [ :min_quantity     , :integer ],
-        [ :max_quantity     , :integer ],
-        [ :current_value    , :integer ]      
+        [ :variant_id         , :integer ],
+        [ :user_id            , :integer ],
+        #[ :min_quantity       , :integer ],
+        #[ :max_quantity       , :integer ],
+        [ :min_quantity_value , :integer ],
+        [ :min_quantity_func  , :text    ],
+        [ :max_quantity_value , :integer ],
+        [ :max_quantity_func  , :text    ],        
+        [ :current_value      , :integer ]      
       ],
       Caboose::Vendor => [
         [ :site_id      , :integer    ],

data/app/models/caboose/variant_limit.rb

@@ -4,13 +4,25 @@ module Caboose
     
     belongs_to :variant
     belongs_to :user    
-    attr_accessible :id ,
-      :variant_id       ,
-      :user_id          ,
-      :min_quantity     ,
-      :max_quantity     ,
+    attr_accessible :id   ,
+      :variant_id         ,
+      :user_id            ,
+      :min_quantity_value ,
+      :min_quantity_func  ,
+      :max_quantity_value ,
+      :max_quantity_func  ,
       :current_value
       
+    def min_quantity
+      return self.min_quantity_value if self.min_quantity_func.nil? || self.min_quantity_func.strip.length == 0      
+      return eval(self.min_quantity_func)            
+    end
+    
+    def max_quantity      
+      return self.max_quantity_value if self.max_quantity_func.nil? || self.max_quantity_func.strip.length == 0      
+      return eval(self.max_quantity_func)            
+    end
+
     def quantity_message      
       if self.min_quantity == 0 && self.max_quantity == 0
         return "You are not allowed to purchase this item."
@@ -48,3 +60,4 @@ module Caboose
           
   end
 end
+

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.27'
+  VERSION = '0.9.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.28
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg