caboose-cms 0.8.24 → 0.8.25

data/app/controllers/caboose/variant_children_controller.rb

@@ -0,0 +1,84 @@
+module Caboose
+  class VariantChildrenController < Caboose::ApplicationController
+    
+    #=============================================================================
+    # Admin actions
+    #=============================================================================
+            
+    # @route GET /admin/products/:product_id/variants/:variant_id/children/json
+    def admin_json
+      return if !user_is_allowed('products', 'view')
+      
+      pager = Caboose::PageBarGenerator.new(params, {
+        'parent_id'      => params[:variant_id]        
+      }, {
+        'model'          => 'Caboose::VariantChild',
+        'sort'           => 'parent_id',
+        'desc'           => false,
+        'base_url'       => "/admin/products/#{params[:product_id]}/variants/#{params[:variant_id]}/children",
+        'items_per_page' => 100,
+        'use_url_params' => false        
+      })
+      render :json => {
+        :pager => pager,
+        :models => pager.items.as_json(:include => { :variant => { :methods => :full_title }})
+      }      
+    end
+    
+    # @route GET /admin/products/:product_id/variants/:variant_id/children/:id/json
+    def admin_json_single
+      return if !user_is_allowed('products', 'view')
+      
+      vc = VariantChild.find(params[:id])      
+      render :json => vc.as_json(:include => { :variant => { :methods => :full_title }})      
+    end
+    
+    # @route POST /admin/products/:product_id/variants/:parent_id/children
+    def admin_add      
+      resp = Caboose::StdClass.new
+
+      if params[:parent_id] == params[:variant_id]
+        resp.error = "Can't add the same variant as a child."
+      else
+        vc = VariantChild.create(
+          :parent_id  => params[:parent_id],
+          :variant_id => params[:variant_id],
+          :quantity   => params[:quantity] ? params[:quantity] : 1
+        )
+        resp.new_id = vc.id
+        resp.success = true
+      end
+      render :json => resp
+    end
+
+    # @route PUT /admin/products/:product_id/variants/:parent_variant_id/children/:id
+    def admin_update
+      return if !user_is_allowed('variants', 'edit')
+      
+      resp = Caboose::StdClass.new
+      vcs = params[:id] == 'bulk' ? params[:model_ids].collect{ |model_id| VariantChild.find(model_id) } : [VariantChild.find(params[:id])]    
+                
+      params.each do |name,value|
+        case name        
+          when 'parent_id'  then vcs.each{ |vc| vc.parent_id   = value }
+          when 'variant_id' then vcs.each{ |vc| vc.variant_id  = value }
+          when 'quantity'   then vcs.each{ |vc| vc.quantity    = value }          
+        end
+      end
+      vcs.each{ |vc| vc.save }
+      resp.success = true
+      render :json => resp
+    end
+      
+    # @route DELETE /admin/products/:product_id/variants/:variant_id/children/:id
+    def admin_delete
+      return if !user_is_allowed('variants', 'delete')      
+      vc_ids = params[:id] == 'bulk' ? params[:model_ids] : [params[:id]]
+      vc_ids.each do |vc_id|
+        VariantChild.where(:id => vc_id).destroy_all
+      end
+      render :json => { :success => true }      
+    end
+            
+  end
+end

data/app/controllers/caboose/variants_controller.rb

@@ -75,7 +75,7 @@ module Caboose
       v = Variant.find(params[:id])      
       render :json => v      
     end
-    
+            
     # @route GET /admin/products/:product_id/variants/:id/download-url
     def admin_download_url
       return if !user_is_allowed('variants', 'edit')
@@ -148,7 +148,7 @@ module Caboose
       @product = @variant.product
       render :layout => 'caboose/admin'            
     end
-  
+    
     # @route PUT /admin/products/:product_id/variants/:id/attach-to-image
     def admin_attach_to_image
       render :json => false if !user_is_allowed('variants', 'edit')         
@@ -353,6 +353,7 @@ module Caboose
           when 'option3'                       then v.option3                       = value
           when 'requires_shipping'             then v.requires_shipping             = value
           when 'taxable'                       then v.taxable                       = value
+          when 'is_bundle'                     then v.is_bundle                     = 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
@@ -376,6 +377,7 @@ module Caboose
             v.date_sale_ends = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
             v.product.delay(:run_at => v.date_sale_ends  , :queue => 'caboose_store').update_on_sale  
             v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale
+          
         end
       end
       resp.success = save && v.save
@@ -427,6 +429,9 @@ module Caboose
       resp = Caboose::StdClass.new
       p = Caboose::Product.find(params[:product_id])
       
+      pd = @site.product_default
+      vd = @site.variant_default
+      
       v = Caboose::Variant.where(:alternate_id => params[:alternate_id]).first
       v = Caboose::Variant.new(:product_id => p.id) if v.nil?
       
@@ -434,10 +439,26 @@ module Caboose
       v.alternate_id      = params[:alternate_id].strip
       v.quantity_in_stock = params[:quantity_in_stock].strip.to_i
       v.price             = '%.2f' % params[:price].strip.to_f
-      v.option1 = params[:option1] if p.option1
-      v.option2 = params[:option2] if p.option2
-      v.option3 = params[:option3] if p.option3
-      v.status = 'Active'      
+      v.option1           = params[:option1] if p.option1
+      v.option2           = params[:option2] if p.option2
+      v.option3           = params[:option3] if p.option3            
+            
+      v.cost              = vd.cost
+      v.available         = vd.available
+      v.ignore_quantity   = vd.ignore_quantity              
+      v.allow_backorder   = vd.allow_backorder              
+      v.weight            = vd.weight                       
+      v.length            = vd.length                       
+      v.width             = vd.width                        
+      v.height            = vd.height                       
+      v.volume            = vd.volume                       
+      v.cylinder          = vd.cylinder                     
+      v.requires_shipping = vd.requires_shipping            
+      v.taxable           = vd.taxable                                  
+      v.status            = vd.status                       
+      v.downloadable      = vd.downloadable                 
+      v.is_bundle         = vd.is_bundle                    
+      
       v.save
       
       resp.success = true      

data/app/models/caboose/product_default.rb

@@ -0,0 +1,25 @@
+#
+# ProductDefault
+#
+# :: Class Methods
+# :: Instance Methods
+
+module Caboose
+  class ProductDefault < ActiveRecord::Base
+    self.table_name = 'store_product_defaults'
+            
+    belongs_to :site
+    belongs_to :vendor
+    attr_accessible :id ,
+      :site_id          ,
+      :vendor_id        ,
+      :option1          ,
+      :option2          ,
+      :option3          ,
+      :status           ,
+      :on_sale          ,
+      :allow_gift_wrap  ,
+      :gift_wrap_price
+      
+  end     
+end

data/app/models/caboose/schema.rb

@@ -604,7 +604,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :allow_gift_wrap       , :boolean   , { :default => false }],
         [ :gift_wrap_price       , :decimal   , { :precision => 8, :scale => 2 }],
         [ :media_category_id     , :integer   ]
-      ],         
+      ],
+      Caboose::ProductDefault => [
+        [ :site_id               , :integer   ],
+        [ :vendor_id             , :integer   ],
+        [ :option1               , :string    ],
+        [ :option2               , :string    ],
+        [ :option3               , :string    ],
+        [ :status                , :string    ],                
+        [ :on_sale               , :boolean    , { :default => false }],
+        [ :allow_gift_wrap       , :boolean    , { :default => false }],
+        [ :gift_wrap_price       , :decimal    , { :precision => 8, :scale => 2 }]        
+      ],
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
         [ :alternate_id          , :string   ],
@@ -802,7 +813,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :weight_unit                       , :string   , { :default => 'oz'  }],
         [ :download_url_expires_in           , :string   , { :default => 5     }],
         [ :starting_invoice_number           , :integer  , { :default => 1000  }],
-        [ :default_payment_terms             , :string   , { :default => 'pia' }]
+        [ :default_payment_terms             , :string   , { :default => 'pia' }],
+        [ :default_vendor_id                 , :integer ],
+        [ :default_product_status            , :string  ],
+        [ :default_taxable                   , :boolean ]                      
       ],  
       Caboose::Subscription => [
         [ :site_id             , :integer ],
@@ -900,7 +914,39 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :option3_sort_order            , :integer   , { :default => 0 }],
         [ :sort_order                    , :integer   , { :default => 0 }],
         [ :downloadable                  , :boolean   , { :default => false }],
-        [ :download_path                 , :string   ]
+        [ :download_path                 , :string   ],
+        [ :is_bundle                     , :boolean   , { :default => false }]
+      ],
+      Caboose::VariantChild => [
+        [ :parent_id    , :integer ],
+        [ :variant_id   , :integer ],
+        [ :quantity     , :integer ]
+      ],
+      Caboose::VariantDefault => [
+        [ :site_id                       , :integer  ],        
+        [ :cost                          , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :price                         , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],        
+        [ :available                     , :boolean   , { :default => true  }],
+        [ :quantity_in_stock             , :integer   , { :default => 0     }],        
+        [ :ignore_quantity               , :boolean   , { :default => false }],
+        [ :allow_backorder               , :boolean   , { :default => false }],
+        [ :weight                        , :decimal  ],
+        [ :length                        , :decimal  ],
+        [ :width                         , :decimal  ],
+        [ :height                        , :decimal  ],
+        [ :volume                        , :decimal  ],
+        [ :cylinder                      , :boolean   , { :default => false }],        
+        [ :requires_shipping             , :boolean   , { :default => true  }],
+        [ :taxable                       , :boolean   , { :default => true  }],        
+        [ :shipping_unit_value           , :numeric  ],
+        [ :flat_rate_shipping            , :boolean   , { :default => false }],
+        [ :flat_rate_shipping_package_id , :integer  ],
+        [ :flat_rate_shipping_method_id  , :integer  ],
+        [ :flat_rate_shipping_single     , :decimal   , { :precision => 8, :scale => 2, :default => 0.0 }],
+        [ :flat_rate_shipping_combined   , :decimal   , { :precision => 8, :scale => 2, :default => 0.0 }],      
+        [ :status                        , :string   ],        
+        [ :downloadable                  , :boolean   , { :default => false }],        
+        [ :is_bundle                     , :boolean   , { :default => false }]
       ],
       Caboose::Vendor => [
         [ :site_id      , :integer    ],

data/app/models/caboose/site.rb

@@ -44,6 +44,18 @@ class Caboose::Site < ActiveRecord::Base
     return c      
   end
   
+  def product_default
+    pd = Caboose::ProductDefault.where(:site_id => self.id).first
+    pd = Caboose::ProductDefault.create(:site_id => self.id) if pd.nil?
+    return pd    
+  end
+  
+  def variant_default
+    vd = Caboose::VariantDefault.where(:site_id => self.id).first
+    vd = Caboose::VariantDefault.create(:site_id => self.id) if vd.nil?
+    return vd
+  end
+  
   def self.id_for_domain(domain)
     d = Caboose::Domain.where(:domain => domain).first
     return nil if d.nil?

data/app/models/caboose/utilities/schema.rb

@@ -75,9 +75,10 @@ class Caboose::Utilities::Schema
           end
           
         # Column exists, but not with the correct data type, try to change it
-        else                    
-          c.execute("alter table #{tbl} alter column #{col[0]} type #{col[1]} using cast(#{col[0]} as #{col[1]})")
-    
+        else
+          dct = col[1] == 'string' || col[1] == :string ? 'text' : col[1]
+          c.execute("alter table #{tbl} alter column #{col[0]} type #{dct} using cast(#{col[0]} as #{dct})")
+          
         end        
         if col[0].to_s == model.primary_key
           c.execute("alter table #{tbl} add primary key (\"#{col[0].to_s}\")")

data/app/models/caboose/variant.rb

@@ -16,10 +16,12 @@ module Caboose
     belongs_to :option1_media, :class_name => 'Caboose::Media'
     belongs_to :option2_media, :class_name => 'Caboose::Media'
     belongs_to :option3_media, :class_name => 'Caboose::Media'
+    has_many :variant_childen, :class_name => 'Caboose::Variant'
     
     attr_accessible :id,
       :alternate_id,
       :product_id,
+      :sku,
       :barcode,            # Returns the barcode value of the variant.
       :cost,               # Cost of goods (don't show to customer)
       :price,              # Variant’s price.
@@ -37,6 +39,7 @@ module Caboose
       :length,             # Length of variant in inches
       :width,              # Width of variant in inches
       :height,             # Height of variant in inches
+      :volume,
       :option1,            # Returns the value of option1 for given variant
       :option2,            # If a product has a second option defined, then returns the value of this variant's option2.
       :option3,            # If a product has a third option defined, then returns the value of this variant's option3.
@@ -45,10 +48,12 @@ module Caboose
       :option3_color,
       :option1_media_id,      
       :option2_media_id,      
-      :option3_media_id,            
+      :option3_media_id,
+      :option1_sort_order,
+      :option2_sort_order,
+      :option3_sort_order,
       :requires_shipping,  # Returns true if the variant is shippable or false if it is a service or a digital good.    
-      :taxable,            # Returns true if the variant is taxable or false if it is not.
-      :sku,
+      :taxable,            # Returns true if the variant is taxable or false if it is not.      
       :available,
       :cylinder,
       :shipping_unit_value,
@@ -56,7 +61,11 @@ module Caboose
       :flat_rate_shipping_single,
       :flat_rate_shipping_combined,
       :flat_rate_shipping_method_id,
-      :flat_rate_shipping_package_id
+      :flat_rate_shipping_package_id,
+      :sort_order,      
+      :downloadable,
+      :download_path,
+      :is_bundle
     
     after_initialize do |v|
       v.price       = 0.00 if v.price.nil?
@@ -114,6 +123,11 @@ module Caboose
       return self.options.join(' / ')
     end
     
+    def full_title
+      return self.product.title if self.options.count == 0
+      return "#{self.product.title} - #{self.title}"
+    end
+    
     def options
       arr = []
       arr << self.option1 if self.option1 && self.option1.strip.length > 0

data/app/models/caboose/variant_child.rb

@@ -0,0 +1,13 @@
+module Caboose
+  class VariantChild < ActiveRecord::Base
+    self.table_name = 'store_variant_children'
+    
+    belongs_to :parent, :class_name => 'Caboose::Variant'
+    belongs_to :variant, :class_name => 'Caboose::Variant'    
+    attr_accessible :id,
+      :parent_id,
+      :variant_id,
+      :quantity
+
+  end
+end

data/app/models/caboose/variant_default.rb

@@ -0,0 +1,39 @@
+#
+# VariantDefault
+#
+# :: Class Methods
+# :: Instance Methods
+
+module Caboose
+  class VariantDefault < ActiveRecord::Base
+    self.table_name = 'store_variant_defaults'
+
+    belongs_to :site
+    attr_accessible :id              ,    
+      :site_id                       ,
+      :cost                          ,
+      :price                         ,       
+      :available                     ,
+      :quantity_in_stock             ,
+      :ignore_quantity               ,
+      :allow_backorder               ,
+      :weight                        ,
+      :length                        ,
+      :width                         ,
+      :height                        ,
+      :volume                        ,
+      :cylinder                      ,
+      :requires_shipping             ,
+      :taxable                       ,
+      :shipping_unit_value           ,
+      :flat_rate_shipping            ,
+      :flat_rate_shipping_package_id ,
+      :flat_rate_shipping_method_id  ,
+      :flat_rate_shipping_single     ,
+      :flat_rate_shipping_combined   ,    
+      :status                        ,
+      :downloadable                  ,
+      :is_bundle                     
+     
+  end
+end

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

@@ -13,11 +13,12 @@
 <%= javascript_include_tag "caboose/admin_products" %>
 <% end %>
 
+<div id='crumbtrail'></div>
 <h1 id="product-title">Edit Product - <%= @product.title %></h1>
 <ul id='tabs'>
 <%
 tabs = {
-  "/admin/products/#{@product.id}/general"      => 'Product details',
+  "/admin/products/#{@product.id}"              => 'Product details',
   "/admin/products/#{@product.id}/description"  => 'Long Description',
   "/admin/products/#{@product.id}/categories"   => 'Categories'
 }
@@ -32,7 +33,8 @@ tabs["/admin/products/#{@product.id}/delete"              ] = 'Delete Product'
 
 %>
 <% tabs.each do |href,text| %>
-<li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
+<% selected = href == "/admin/products/#{@product.id}" ? request.fullpath == href : request.fullpath.starts_with?(href) %>
+<li<%= raw selected ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
 <% end %>
 <li class='back'><input type='button' class="caboose-btn" value='< Back' onclick="window.location='/admin/products';" /></li>
 </ul>

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

@@ -19,6 +19,12 @@ label span.prefix { display: inline-block; margin: 0 8px; }
 
 var mb = false;
 $(document).ready(function() {
+    
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);
+  add_to_crumbtrail('/admin/products/<%= p.id %>/categories', 'Categories');
+  
   mb = new ModelBinder({
     name: 'Product',
     id: <%= p.id %>,

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

@@ -12,6 +12,12 @@ p = @product
 <script type='text/javascript'>
 
 $(document).ready(function() {
+    
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);
+  add_to_crumbtrail('/admin/products/<%= p.id %>/description', 'Description');
+  
   m = new ModelBinder({
     name: 'Product',
     id: <%= p.id %>,