caboose-cms 0.8.14 → 0.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57cbf7b704ca810d459481fddd217b78e117e43
-  data.tar.gz: 51b4bad81ece4cf9b6f932f315cdbf40eda65275
+  metadata.gz: aa3fb1432258306db56b298525446cec698aef03
+  data.tar.gz: af42acc488025424bde48a48764fb0f26f429289
 SHA512:
-  metadata.gz: c148c323f4e21c42e243fe165361553db483b57b5b27a37c24dd57aa9d05189b5bd29513ac1635291149513093675204aa5cd18b7a441d5ba09d8ab8bca07fe4
-  data.tar.gz: c735ecab394697f62a3d4a022056db7d15efe77e20180a6ec71e22852d366413cc2d2421b7b9718bc53b36193f118042cc26154e3f6d735cc78ccc27cd7c0f2d
+  metadata.gz: 7de9d53efb3a7144a5cca592a972d866f0b67c1654f650b98a37021b80108c3cf8bd6ee92736f25e42dd450d74b17162b6d82850ee51b7a88dc81308107a8f14
+  data.tar.gz: d54163fb97e4ad21788e95524576e7ae6882fada323db3090740b9105b59a0c9d98fa694efe1c3e77b3eb05e99e15cbf510432d22d5d5558ead87bc5bc51f654

data/app/controllers/caboose/categories_controller.rb

@@ -65,7 +65,7 @@ module Caboose
       query = ["select P.id, P.title from store_category_memberships CM
         left join store_products P on P.id = CM.product_id
         where CM.category_id = ? AND P.status = 'Active'
-        order by CM.sort_order, P.title", params[:id]]             
+        order by CM.sort_order, P.title", params[:category_id]]             
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
       arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
       render :json => arr

data/app/controllers/caboose/variants_controller.rb

@@ -148,65 +148,6 @@ module Caboose
       @product = @variant.product
       render :layout => 'caboose/admin'            
     end
-    
-    # @route PUT /admin/products/:product_id/variants/:id
-    def admin_update
-      return if !user_is_allowed('variants', 'edit')
-      
-      resp = Caboose::StdClass.new({'attributes' => {}})
-      v = Variant.find(params[:id])    
-      
-      save = true    
-      params.each do |name,value|
-        case name        
-          when 'alternate_id'                  then v.alternate_id                  = value
-          when 'sku'                           then v.sku                           = value
-          when 'barcode'                       then v.barcode                       = value
-          when 'cost'                          then v.cost                          = value
-          when 'price'                         then v.price                         = value                      
-          when 'quantity_in_stock'             then v.quantity_in_stock             = value
-          when 'ignore_quantity'               then v.ignore_quantity               = value
-          when 'allow_backorder'               then v.allow_backorder               = value
-          when 'clearance'                     then v.clearance                     = value
-          when 'clearance_price'               then v.clearance_price               = value
-          when 'status'                        then v.status                        = value
-          when 'weight'                        then v.weight                        = value
-          when 'length'                        then v.length                        = value
-          when 'width'                         then v.width                         = value
-          when 'height'                        then v.height                        = value
-          when 'option1'                       then v.option1                       = value
-          when 'option2'                       then v.option2                       = value
-          when 'option3'                       then v.option3                       = value
-          when 'requires_shipping'             then v.requires_shipping             = value
-          when 'taxable'                       then v.taxable                       = value
-          when 'flat_rate_shipping'            then v.flat_rate_shipping            = value
-          when 'flat_rate_shipping_single'     then v.flat_rate_shipping_single     = value
-          when 'flat_rate_shipping_combined'   then v.flat_rate_shipping_combined   = value
-          when 'flat_rate_shipping_package_id' then v.flat_rate_shipping_package_id = value
-          when 'flat_rate_shipping_method_id'  then v.flat_rate_shipping_method_id  = value
-          when 'flat_rate_shipping_package_method_id' then
-            arr = value.split('_')
-            v.flat_rate_shipping_package_id = arr[0].to_i
-            v.flat_rate_shipping_method_id  = arr[1].to_i
-          when 'downloadable'                then v.downloadable                = value
-          when 'download_path'               then v.download_path               = value
-            
-          when 'sale_price'
-            v.sale_price = value            
-            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 => 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 => 3.seconds.from_now).update_on_sale
-        end
-      end
-      resp.success = save && v.save
-      render :json => resp
-    end
   
     # @route PUT /admin/products/:product_id/variants/:id/attach-to-image
     def admin_attach_to_image
@@ -300,6 +241,65 @@ module Caboose
       end            
       render :json => { :success => true }
     end
+    
+    # @route PUT /admin/products/:product_id/variants/:id
+    def admin_update
+      return if !user_is_allowed('variants', 'edit')
+      
+      resp = Caboose::StdClass.new({'attributes' => {}})
+      v = Variant.find(params[:id])    
+      
+      save = true    
+      params.each do |name,value|
+        case name        
+          when 'alternate_id'                  then v.alternate_id                  = value
+          when 'sku'                           then v.sku                           = value
+          when 'barcode'                       then v.barcode                       = value
+          when 'cost'                          then v.cost                          = value
+          when 'price'                         then v.price                         = value                      
+          when 'quantity_in_stock'             then v.quantity_in_stock             = value
+          when 'ignore_quantity'               then v.ignore_quantity               = value
+          when 'allow_backorder'               then v.allow_backorder               = value
+          when 'clearance'                     then v.clearance                     = value
+          when 'clearance_price'               then v.clearance_price               = value
+          when 'status'                        then v.status                        = value
+          when 'weight'                        then v.weight                        = value
+          when 'length'                        then v.length                        = value
+          when 'width'                         then v.width                         = value
+          when 'height'                        then v.height                        = value
+          when 'option1'                       then v.option1                       = value
+          when 'option2'                       then v.option2                       = value
+          when 'option3'                       then v.option3                       = value
+          when 'requires_shipping'             then v.requires_shipping             = value
+          when 'taxable'                       then v.taxable                       = value
+          when 'flat_rate_shipping'            then v.flat_rate_shipping            = value
+          when 'flat_rate_shipping_single'     then v.flat_rate_shipping_single     = value
+          when 'flat_rate_shipping_combined'   then v.flat_rate_shipping_combined   = value
+          when 'flat_rate_shipping_package_id' then v.flat_rate_shipping_package_id = value
+          when 'flat_rate_shipping_method_id'  then v.flat_rate_shipping_method_id  = value
+          when 'flat_rate_shipping_package_method_id' then
+            arr = value.split('_')
+            v.flat_rate_shipping_package_id = arr[0].to_i
+            v.flat_rate_shipping_method_id  = arr[1].to_i
+          when 'downloadable'                then v.downloadable                = value
+          when 'download_path'               then v.download_path               = value
+            
+          when 'sale_price'
+            v.sale_price = value            
+            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 => 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 => 3.seconds.from_now).update_on_sale
+        end
+      end
+      resp.success = save && v.save
+      render :json => resp
+    end
   
     # @route GET /admin/variants/group
     def admin_group

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.14'
+  VERSION = '0.8.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg