caboose-cms 0.5.129 → 0.5.130

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWFmMTA2YWM3Yzc0Nzc2MDBkOTQzMzVkMGQ4MjcwOGY3Y2QzMzM5Nw==
+    YWEzYzcwNzIxOGRiMmZkZjJhYzg3Y2I2YjQ5NDkwOWE3N2RmNTA5OA==
   data.tar.gz: !binary |-
-    ODY1M2FjNWY0ZDhjOWQzODEyZThlNjk4NjE2OGNmOTM1Mjk3NTQzMw==
+    YWVmNzkyNGQ2OWZmZTY4ZGViYTFlMWFmOTcyMzE2NWEyZDE3OWQyMw==
 SHA512:
   metadata.gz: !binary |-
-    NDBjNDU3Y2VmN2M3YzJhZTU2NjlkMzZkMDQ2OWZkYjQ5ZGJhYzEzNGI0ZWUy
-    YmU2NDBlNTAxNzFkMDFlZGUzY2U4N2Q2NjFlZWNmOWI1ODNhOWJhM2IwZGM3
-    OWJhYjdjNjk2ZGZkOTU4NGY5M2E1ZjZlNzJmYzY2ZGU2NTQyZjU=
+    NDBmZWIxYWIyODY5OTExMDMzNjA1OWQ3OWNhNzU4MDQ2ZTI3MzRhMzA3NWU4
+    ZTA4OTY0ODIyMTA2ZWViYmY4OWFhOTc1NzE2ZTU0ZmE1NjU1YTA0OTAwYjBk
+    NjA2YzEyMzM2Mzg1MWU3Y2NiNDllNjZlOGY3MDc5YThiY2MzYTQ=
   data.tar.gz: !binary |-
-    MzgzYTFkNzBmYjI5NDE0NmFhZjBhNjBmMzM1NmViYWJlZTRkMzYyMmU3ZTY1
-    MWI3ODc5ZDlhMTU3ZDRlM2Y3MDZjZTk5MzJhYTA5NmQ4YTg5ODcwNzY5NGQw
-    NGEzNzgyNmZmMzRjMzM5MDBlYjg2OTAzN2EyMWZlOTQ5YzAzYTQ=
+    NTgxMzE2YWQ4NjA4MmM4OWJkYjlmMzM1NDE5NTBlYjkyYzBhNTE0NmJjNjdi
+    MDI3NDNjYWZiODBhZjQxYzgwYWU5ZmIzMzgzMmZmNDhiNjNhMzdjZDBiZTI5
+    YWMzMjdjMWYyZjUwOWMwMWNiMjY1MmVhMjg5OTc4YTFmYTU4MDM=

data/app/controllers/caboose/products_controller.rb

@@ -13,16 +13,33 @@ module Caboose
     def index
       
       # If id exists, is an integer and a product exists with the specified id then get the product
-      if params[:id] && params[:id].to_i > 0 && Product.exists?(params[:id])
-        @product = Product.find(params[:id])
-        render 'product/not_available' and return if @product.status == 'Inactive'
-        
-        @category       = @product.categories.first
-        @review         = Review.new
-        @reviews        = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
-        @logged_in_user = logged_in_user
-        
-        render 'caboose/products/details' and return        
+      if params[:id]        
+        if params[:id] == 'sales'
+          products = Caboose::Product.where(:site_id => @site.id, :status => Caboose::Product::STATUS_ACTIVE, :on_sale => true).all      
+          @sale_categories = {}        
+          products.each do |p|
+            cat = 'Uncategorized'
+            if p.categories.count > 0
+              cats = p.categories.last.ancestry.collect{ |a| a.name }
+              cats.shift
+              cat = cats.join(' > ')
+            end
+            @sale_categories[cat] = [] if @sale_categories[cat].nil?
+            @sale_categories[cat] << p
+          end
+          render 'caboose/products/sales' and return
+          
+        elsif params[:id].to_i > 0 && Product.exists?(params[:id])
+          @product = Product.find(params[:id])
+          render 'product/not_available' and return if @product.status == 'Inactive'
+          
+          @category       = @product.categories.first
+          @review         = Review.new
+          @reviews        = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
+          @logged_in_user = logged_in_user
+          
+          render 'caboose/products/details' and return
+        end
       end
       
       # Filter params from url
@@ -327,7 +344,9 @@ module Caboose
           when 'seo_description'    then product.seo_description    = value
           when 'status'             then product.status             = value
           when 'category_id'        then product.toggle_category(value[0], value[1])
-          when 'stackable_group_id' then product.stackable_group_id = value          
+          when 'stackable_group_id' then product.stackable_group_id = value
+          when 'allow_gift_wrap'    then product.allow_gift_wrap    = value
+          when 'gift_wrap_price'    then product.gift_wrap_price    = value
           when 'option1'            then product.option1            = value
           when 'option2'            then product.option2            = value
           when 'option3'            then product.option3            = value

data/app/models/caboose/line_item.rb

@@ -8,18 +8,23 @@ module Caboose
     belongs_to :parent, :class_name => 'LineItem', :foreign_key => 'parent_id'
     has_many :children, :class_name => 'LineItem', :foreign_key => 'parent_id'
     
-    attr_accessible :id,
-      :order_package_id,
-      :variant_id,
-      :unit_price,
-      :quantity,
-      :subtotal,
-      :notes,
-      :order_id,
-      :status,      
-      :custom1,
-      :custom2,
-      :custom3
+    attr_accessible :id      ,
+      :order_id              ,
+      :order_package_id      ,
+      :variant_id            ,
+      :unit_price            ,
+      :quantity              ,
+      :subtotal              ,
+      :notes                 ,            
+      :status                ,      
+      :custom1               ,
+      :custom2               ,
+      :custom3               ,
+      :is_gift               ,
+      :include_gift_message  ,
+      :gift_message          ,
+      :gift_wrap             ,
+      :hide_prices
     
     #
     # Scopes

data/app/models/caboose/order.rb

@@ -23,6 +23,7 @@ module Caboose
       :tax,            
       :shipping,
       :handling,
+      :gift_wrap,
       :custom_discount,
       :discount,      
       :total,
@@ -139,12 +140,13 @@ module Caboose
     end
     
     def calculate
-      self.update_column(:subtotal , self.calculate_subtotal )
-      self.update_column(:tax      , self.calculate_tax      )
-      self.update_column(:shipping , self.calculate_shipping )
-      self.update_column(:handling , self.calculate_handling )
-      self.update_column(:discount , self.calculate_discount )
-      self.update_column(:total    , self.calculate_total    )
+      self.update_column(:subtotal  , self.calculate_subtotal  )
+      self.update_column(:tax       , self.calculate_tax       )
+      self.update_column(:shipping  , self.calculate_shipping  )
+      self.update_column(:handling  , self.calculate_handling  )
+      self.update_column(:gift_wrap , self.calculate_gift_wrap )
+      self.update_column(:discount  , self.calculate_discount  )
+      self.update_column(:total     , self.calculate_total     )
     end
     
     def calculate_subtotal
@@ -172,6 +174,16 @@ module Caboose
       self.subtotal * self.site.store_config.handling_percentage.to_f
     end
     
+    def calculate_gift_wrap      
+      x = 0.0
+      self.line_items.each do |li|
+        next if !li.gift_wrap
+        next if !li.product.allow_gift_wrap
+        x = x + li.product.gift_wrap_price * li.quantity
+      end
+      return x
+    end
+    
     def calculate_discount      
       return 0.0 if self.discounts.nil? || self.discounts.count == 0
       x = 0.0
@@ -181,7 +193,7 @@ module Caboose
     end
     
     def calculate_total
-      return (self.subtotal + self.tax + self.shipping + self.handling) - self.discount
+      return (self.subtotal + self.tax + self.shipping + self.handling + self.gift_wrap) - self.discount
     end
     
     def shipping_and_handling

data/app/models/caboose/product.rb

@@ -17,26 +17,36 @@ module Caboose
     
     #default_scope order('store_products.sort_order')
     
-    attr_accessible :id,
-      :site_id,
-      :alternate_id,
-      :title,
-      :description,
-      :vendor_id,
-      :handle,
-      :date_available,
-      :seo_title,
-      :seo_description,
-      :option1,
-      :option2,
-      :option3,
-      :default1,
-      :default2,
-      :default3,
-      :status,
-      :custom_input,
-      :featured
-    
+    attr_accessible :id      ,
+      :site_id               ,
+      :alternate_id          ,
+      :title                 ,
+      :caption               ,
+      :description           ,
+      :handle                ,
+      :status                ,
+      :vendor_id             ,
+      :category_id           ,      
+      :option1               ,
+      :option2               ,
+      :option3               ,      
+      :default1              ,
+      :default2              ,
+      :default3              ,
+      :seo_title             ,
+      :seo_description       ,
+      :alternate_id          ,
+      :date_available        ,
+      :custom_input          ,
+      :sort_order            ,
+      :featured              ,
+      :stackable_group_id    ,
+      :on_sale               ,
+      :allow_gift_wrap       ,
+      :gift_wrap_price
+
+    STATUS_ACTIVE = 'Active'
+    STATUS_INACTIVE = 'Inactive'
     
     #
     # Scopes

data/app/models/caboose/schema.rb

@@ -285,15 +285,19 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :order_package_id      , :integer  ],
         [ :variant_id            , :integer  ],
         [ :parent_id             , :integer  ],                
-        [ :status                , :string   ],
-        [ :tracking_number       , :string   ],
+        [ :status                , :string   ],        
         [ :quantity              , :integer   , :default => 0 ],
         [ :unit_price            , :decimal   , { :precision => 8, :scale => 2 }],
         [ :subtotal              , :decimal   , { :precision => 8, :scale => 2 }],
         [ :notes                 , :text     ],
         [ :custom1               , :string   ],
         [ :custom2               , :string   ],
-        [ :custom3               , :string   ]
+        [ :custom3               , :string   ],
+        [ :is_gift               , :boolean   , { :default => false }],
+        [ :include_gift_message  , :boolean   , { :default => false }],
+        [ :gift_message          , :text     ],
+        [ :gift_wrap             , :boolean   , { :default => false }],
+        [ :hide_prices           , :boolean   , { :default => false }]
       ],
       Caboose::MediaCategory => [
         [ :parent_id         , :integer ],
@@ -342,6 +346,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :tax                   , :decimal  , { :precision => 8, :scale => 2 }],
         [ :shipping              , :decimal  , { :precision => 8, :scale => 2 }],
         [ :handling              , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :gift_wrap             , :decimal  , { :precision => 8, :scale => 2 }],
         [ :custom_discount       , :decimal  , { :precision => 8, :scale => 2 }],
         [ :discount              , :decimal  , { :precision => 8, :scale => 2 }],
         [ :total                 , :decimal  , { :precision => 8, :scale => 2 }],
@@ -471,7 +476,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :sort_order            , :integer   ],
         [ :featured              , :boolean   , :default => false ],
         [ :stackable_group_id    , :integer   ],
-        [ :on_sale               , :boolean   , { :default => false }]
+        [ :on_sale               , :boolean   , { :default => false }],
+        [ :allow_gift_wrap       , :boolean   , { :default => false }],
+        [ :gift_wrap_price       , :decimal   , { :precision => 8, :scale => 2 }]
       ],
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],

data/app/views/caboose/blocks/_product_sales.html.erb

@@ -0,0 +1,2 @@
+<p>These are the product sales.</p>
+

data/app/views/caboose/blocks/_products.html.erb

@@ -1,6 +1,12 @@
+<%
+# Note: This block is in the content area for the /products pages.
+# It's set up like this so that each site can have custom views.
+%>
 <div id='block_<%= block.id %>'>
 
-  <%= block.partial('product_crumbtrail', local_assigns) %>	
+  <%= block.partial('product_crumbtrail', local_assigns) %>
+  <% if @sale_categories %>	
+    <%= block.partial('product_sales', local_assigns) %>
   <% if @product %>    
     <%= block.partial('product_details', local_assigns) %>  
   <% else %>  

data/app/views/caboose/products/admin_edit_general.html.erb

@@ -3,16 +3,18 @@ p = @product
 %>
 <%= render :partial => 'caboose/products/admin_header' %>
 
-<p><div id='product_<%= p.id %>_vendor_id'></div></p>
-<p><div id='product_<%= p.id %>_title'></div></p>
-<p><div id='product_<%= p.id %>_caption'></div></p>
-<p><div id='product_<%= p.id %>_handle'></div></p>
-<p><div id='product_<%= p.id %>_featured'></div></p>
-<p><div id='product_<%= p.id %>_seo_title'></div></p>
-<p><div id='product_<%= p.id %>_seo_description'></div></p>
-<p><div id='product_<%= p.id %>_status'></div></p>
-<p><div id='product_<%= p.id %>_alternate_id'></div></p>
-<p><div id='product_<%= p.id %>_date_available'></div></p>
+<p><div id='product_<%= p.id %>_vendor_id'       ></div></p>
+<p><div id='product_<%= p.id %>_title'           ></div></p>
+<p><div id='product_<%= p.id %>_caption'         ></div></p>
+<p><div id='product_<%= p.id %>_handle'          ></div></p>
+<p><div id='product_<%= p.id %>_featured'        ></div></p>
+<p><div id='product_<%= p.id %>_seo_title'       ></div></p>
+<p><div id='product_<%= p.id %>_seo_description' ></div></p>
+<p><div id='product_<%= p.id %>_status'          ></div></p>
+<p><div id='product_<%= p.id %>_alternate_id'    ></div></p>
+<p><div id='product_<%= p.id %>_date_available'  ></div></p>
+<p><div id='product_<%= p.id %>_allow_gift_wrap' ></div></p>
+<p><div id='product_<%= p.id %>_gift_wrap_price' ></div></p>
 
 <div id='message'><%= raw flash[:message] ? flash[:message] : "" %></div>
 
@@ -40,7 +42,9 @@ $(document).ready(function() {
       { name: 'seo_description' , nice_name: 'SEO Meta Description' , type: 'textarea'  , value: <%= raw Caboose.json(p.seo_description ) %>, width: 500, height: 150 },
       { name: 'alternate_id'    , nice_name: 'Alternate ID'         , type: 'text'      , value: <%= raw Caboose.json(p.alternate_id    ) %>, width: 500 },
       { name: 'date_available'  , nice_name: 'Date Available'       , type: 'text'      , value: <%= raw Caboose.json(date_available    ) %>, width: 500 },
-      { name: 'featured'        , nice_name: 'Featured'             , type: 'checkbox'  , value: <%= raw Caboose.json(p.featured        ) %>, width: 500 }
+      { name: 'featured'        , nice_name: 'Featured'             , type: 'checkbox'  , value: <%= raw Caboose.json(p.featured        ) %>, width: 500 },
+      { name: 'allow_gift_wrap' , nice_name: 'Allow Gift Wrap'      , type: 'checkbox'  , value: <%= raw Caboose.json(p.allow_gift_wrap ? 1 : 0) %>, width: 500 },
+      { name: 'gift_wrap_price' , nice_name: 'Gift Wrap Price'      , type: 'text'      , value: <%= raw Caboose.json(p.gift_wrap_price ? number_with_delimiter(p.gift_wrap_price, :precision => 2) : '') %>, width: 500 }
     ]
   });
 });

data/config/routes.rb

@@ -401,7 +401,7 @@ Caboose::Engine.routes.draw do
   #=============================================================================
   # Products  
   #=============================================================================
-  
+    
   get     '/products/:id/info' => 'products#info'
   get     '/products/:id'      => 'products#index', :constraints => { :id => /.*/ }
   get     '/products'          => 'products#index'

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.129'
+  VERSION = '0.5.130'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.129
+  version: 0.5.130
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -680,6 +680,7 @@ files:
 - app/views/caboose/blocks/_product_category.html.erb
 - app/views/caboose/blocks/_product_crumbtrail.html.erb
 - app/views/caboose/blocks/_product_details.html.erb
+- app/views/caboose/blocks/_product_sales.html.erb
 - app/views/caboose/blocks/_products.html.erb
 - app/views/caboose/blocks/_render_function.html.erb
 - app/views/caboose/blocks/_richtext.html.erb
@@ -822,6 +823,7 @@ files:
 - app/views/caboose/products/details.html.erb
 - app/views/caboose/products/index.html.erb
 - app/views/caboose/products/not_available.html.erb
+- app/views/caboose/products/sales.html.erb
 - app/views/caboose/redirects/admin_edit.html.erb
 - app/views/caboose/redirects/admin_index.html.erb
 - app/views/caboose/redirects/admin_new.html.erb