caboose-cms 0.5.146 → 0.5.147

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg5NjBiNWNmY2UzNTI3YWY0YzIwYmRkZWNmZjRiNmRjODQ3MjVmNg==
+    NzViNDdhOWJiZTg2YTBiZWYyYzAwOWU3NjBlM2ExMDdlYWU3Y2I4Mw==
   data.tar.gz: !binary |-
-    Y2I1YTJmMWRhYzE4NmNiZGVlMjllODM0MjZiNDEyZjg4MzNhOTE2Zg==
+    YzExNGM3NmM3ZDc1NTQyNDVjNzRkYWI0MDY1NjY3OWM5ZWQxMTU2OA==
 SHA512:
   metadata.gz: !binary |-
-    MzA4YTM2ZmVhNjQxMDk2M2UyMWFjNGNjNjA0YTY4YTY5ZWZmNTY4NThhODNh
-    MDQxNGU1MzRjN2VlZDhhNjE0MWI0N2QyNmNiNWI1NzFiMjA2YTI4N2ZmY2Yz
-    ZDg4ZjBiMzk0MmZhZDY1NzVmOWJjYzM1ZGMzNmFlNmRjMmMwNzk=
+    OWM4ZThiNmE1MTc5MGNiZWE3YzI3NGE0MDRiNjU4OTg3ZDFmMWE2OGViMzA4
+    NzljYmM3MmFmYzJjOWJkZTY3YTA3ZmQ3YTgwMzZkNTVmMGFhMzdmNmVmMjZh
+    MGJlNjk5NTRlMTlmM2I1YzU3ZWEzYmI4YTlkZGYxNzExYjUwZDI=
   data.tar.gz: !binary |-
-    MTYxZGU4ZDczZmUwYzEyOGQ0MmVhNWY0ZWZlZmYxZGVjMDE3MjJiYWJiNmEz
-    MWMzYjZlNWUxNGQ4MmYyMzM5MGEyYTUzMzlhYTE3M2RhYjJlZGNhNjJjMTVk
-    NDgyYjEwNTVkNDA1NWZjNGI4MzI0MjRiMzcyNDNkOWExOThjYjQ=
+    YTA3MzBjZmE5NTA4YWQzNDAyYzY2MjkzNWY4ODRlZDU2Y2RkN2E2Njc1YTYw
+    MDc0YmRhZDZkN2VkNzM2ZjJmM2I0MjI0OTkzZTVhZGQ4OTVjNTU0ZGI0YWVh
+    OGIzZGIwOWRjYTc5N2Q4MjhhZTU0YWNlN2ViMTYxZDBkODU4MDA=

data/app/controllers/caboose/orders_controller.rb

@@ -297,15 +297,17 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name
-          when 'tax'             then order.tax             = value          
-          when 'shipping'        then order.shipping        = value
+          when 'tax'             then order.tax             = value                                     
+          when 'shipping'        then order.shipping        = value              
           when 'handling'        then order.handling        = value
-          when 'custom_discount' then order.custom_discount = value        
+          when 'custom_discount' then 
+            order.custom_discount = value
+            order.discount = order.calculate_discount
           when 'status'          then order.status          = value
           when 'customer_id'     then order.customer_id     = value            
         end
       end
-      order.calculate
+      order.calculate_total
       resp.success = save && order.save
       render :json => resp
     end

data/app/controllers/caboose/products_controller.rb

@@ -63,38 +63,41 @@ module Caboose
       
       # Otherwise looking at a category or search parameters
       @pager = Caboose::Pager.new(params, {
-        'site_id'        => @site.id,
-        'on_sale'        => '',
-        'category_id'    => '',
-        'vendor_id'      => '',
-        'vendor_name'    => '',
-        'vendor_status'  => 'Active',
-        'status'         => 'Active',
-        'variant_status' => 'Active',
-        'price_gte'      => '',
-        'price_lte'      => '',
-        'alternate_id'   => '',
-        'search_like'    => ''
+        'site_id'         => @site.id,
+        'on_sale'         => '',
+        'category_id'     => '',
+        'vendor_id'       => '',
+        'vendor_name'     => '',
+        'vendor_status'   => 'Active',
+        'status'          => 'Active',
+        'variant_status'  => 'Active',
+        'price_gte'       => '',
+        'price_lte'       => '',
+        'alternate_id'    => '',
+        'search_like'     => ''
+        #'pcs_category_id' => cat.id
       }, {
-        'model'          => 'Caboose::Product',
-        'sort'           => if params[:sort] then params[:sort] else 'store_products.sort_order' end,
-        'base_url'       => url_without_params,
-        'items_per_page' => 15,
-        'use_url_params' => false,
+        'model'           => 'Caboose::Product',
+        'sort'            => if params[:sort] then params[:sort] else 'store_products.sort_order' end,
+        #'sort'            => if params[:sort] then params[:sort] else 'store_product_category_sorts.sort_order' end,
+        'base_url'        => url_without_params,
+        'items_per_page'  => 15,
+        'use_url_params'  => false,
         
-        'abbreviations' => {
-          'search_like' => 'title_concat_store_products.alternate_id_concat_vendor_name_concat_category_name_like',
+        'abbreviations'   => {
+          'search_like'   => 'title_concat_store_products.alternate_id_concat_vendor_name_concat_category_name_like',
         },
         
         'includes' => {
-          'category_id'    => [ 'categories' , 'id'     ],
-          'category_name'  => [ 'categories' , 'name'   ],
-          'vendor_id'      => [ 'vendor'     , 'id'     ],
-          'vendor_name'    => [ 'vendor'     , 'name'   ],
-          'vendor_status'  => [ 'vendor'     , 'status' ],
-          'price_gte'      => [ 'variants'   , 'price'  ],
-          'price_lte'      => [ 'variants'   , 'price'  ],
-          'variant_status' => [ 'variants'   , 'status' ]
+          #'pcs_category_id' => [ 'product_category_sorts', 'category_id' ],          
+          'category_id'     => [ 'categories' , 'id'     ],
+          'category_name'   => [ 'categories' , 'name'   ],
+          'vendor_id'       => [ 'vendor'     , 'id'     ],
+          'vendor_name'     => [ 'vendor'     , 'name'   ],
+          'vendor_status'   => [ 'vendor'     , 'status' ],
+          'price_gte'       => [ 'variants'   , 'price'  ],
+          'price_lte'       => [ 'variants'   , 'price'  ],
+          'variant_status'  => [ 'variants'   , 'status' ]
         }
       })
       

data/app/models/caboose/order.rb

@@ -180,10 +180,11 @@ module Caboose
       return x
     end
     
-    def calculate_discount      
-      return 0.0 if self.discounts.nil? || self.discounts.count == 0
+    def calculate_discount             
       x = 0.0
-      self.discounts.each{ |d| x = x + d.amount }
+      if self.discounts && self.discounts.count > 0
+        self.discounts.each{ |d| x = x + d.amount }
+      end
       x = x + self.custom_discount if self.custom_discount
       return x
     end

data/app/models/caboose/product.rb

@@ -12,8 +12,9 @@ module Caboose
     has_many :category_memberships, :class_name => 'Caboose::CategoryMembership'
     has_many :variants, :class_name => 'Caboose::Variant', :order => 'option1_sort_order, option2_sort_order, option3_sort_order'
     has_many :product_images, :class_name => 'Caboose::ProductImage'
-    has_many :proudct_inputs, :class_name => 'Caboose::ProductInput'
+    has_many :product_inputs, :class_name => 'Caboose::ProductInput'
     has_many :reviews, :class_name => 'Caboose::Review'
+    has_many :product_category_sorts, :class_name => 'Caboose::ProductCategorySort'
     
     #default_scope order('store_products.sort_order')
     

data/app/models/caboose/product_category_sort.rb

@@ -0,0 +1,14 @@
+module Caboose
+  class ProductCategorySort < ActiveRecord::Base
+    self.table_name = 'store_product_category_sorts'
+    self.primary_key = 'id'
+
+    belongs_to :product
+    belongs_to :category            
+    attr_accessible :id,
+      :product_id,
+      :category_id,
+      :sort_order
+    
+  end
+end

data/app/models/caboose/schema.rb

@@ -484,6 +484,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :allow_gift_wrap       , :boolean   , { :default => false }],
         [ :gift_wrap_price       , :decimal   , { :precision => 8, :scale => 2 }]
       ],
+      Caboose::ProductCategorySort => [
+        [ :product_id  , :integer ],
+        [ :category_id , :integer ],
+        [ :sort_order  , :integer ]
+      ],                              
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
         [ :alternate_id          , :string   ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.146'
+  VERSION = '0.5.147'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.146
+  version: 0.5.147
 platform: ruby
 authors:
 - William Barry
@@ -628,6 +628,7 @@ files:
 - app/models/caboose/post_category.rb
 - app/models/caboose/post_category_membership.rb
 - app/models/caboose/product.rb
+- app/models/caboose/product_category_sort.rb
 - app/models/caboose/product_image.rb
 - app/models/caboose/product_image_variant.rb
 - app/models/caboose/review.rb