caboose-cms 0.5.15 → 0.5.16

data/app/assets/stylesheets/caboose/checkout.css.scss

@@ -2,13 +2,13 @@
 // Checkout
 //
 
-#checkout { padding-top: 75px }
+#checkout { }
 #checkout * { box-sizing: border-box }
 
 #checkout input[type=text],
 #checkout input[type=password],
 #checkout input[type=email] {
-  outline: none !important;
+  border-width: 1px;  
   height: 36px;
 }
 
@@ -199,7 +199,6 @@
 }
 
 #checkout #checkout-address {
-  margin: 42px 0;
   .wrapper { overflow: hidden }
   h1, h2, h3, h4, h5, h6 {
     text-align: left;

data/app/assets/stylesheets/caboose/message_boxes.scss

@@ -0,0 +1,49 @@
+
+/*******************************************************************************
+Message boxes
+*******************************************************************************/
+
+.loading {
+  background-image: url('/assets/caboose/loading_black_on_white.gif');
+  background-position: 0 center;
+  background-repeat: no-repeat;
+  color: #000;  
+  font-weight: normal;
+  font-size: 16pt;
+  padding: 10px 10px 10px 40px;
+}
+
+.note {
+  padding: 20px;
+  margin-bottom: 10px;
+  background: #fef49c;
+  color: #000000;
+  font-weight: bold;
+  font-size: 1.4em;
+  border-radius: 3px;
+
+  h2 { margin: 0 0 10px 0; padding: 0; }	
+}
+
+.note_small {
+  display: block;
+  padding: 4px 10px;
+  background: #fef49c;
+  color: #000000;
+  font-size: 1em;	
+  border-radius: 3px;
+}
+
+.error {
+  background: #9c171b;
+  color: #ffffff;
+  a { color: #fff; }
+  a:hover { color: #000; }
+}
+
+.success {
+  background: #009900;
+  color: #ffffff;
+  a { color: #ffffff;	}
+}
+ 

data/app/assets/templates/caboose/cart/add_to_cart.jst.ejs

@@ -1,4 +1,4 @@
-<form action="/cart/items" method="post">
+<form action="/cart" method="post">
   <input type="hidden" name="variant_id" />
   <label for="quantity">Qty:</label>
   <input type="text" name="quantity" value="1" />

data/app/controllers/caboose/block_types_controller.rb

@@ -23,13 +23,15 @@ module Caboose
         h['parent_id'] = ''
       else
         h['parent_id_null'] = true
+        params[:parent_id_null] = nil if params[:parent_id_null]
       end
       pager = Caboose::Pager.new(params, h, {      
         'model' => 'Caboose::BlockType',
         'sort'  => 'description',
         'desc'  => 'false',
         'base_url' => "/admin/block-types",
-        'items_per_page' => 10
+        'items_per_page' => 10,
+        'skip' => ['parent_id_null']
       })      
       render :json => {
         :pager => pager,

data/app/controllers/caboose/cart_controller.rb

@@ -1,13 +1,8 @@
 module Caboose
   class CartController < Caboose::ApplicationController
-    before_filter :get_line_item, :only => [:update, :remove]
-    
-    def get_line_item
-      @line_item = @order.line_items.find(params[:id])
-    end
     
     # GET /cart
-    def index      
+    def index
     end
     
     # GET /cart/items
@@ -20,31 +15,43 @@ module Caboose
       render :json => { :item_count => @order.line_items.count }
     end
     
-    # POST /cart/add
+    # POST /cart
     def add
-      if @order.line_items.exists?(:variant_id => params[:variant_id])
-        @line_item = @order.line_items.find_by_variant_id(params[:variant_id])
-        @line_item.quantity += params[:quantity] ? params[:quantity].to_i : 1
-      else
-        @line_item = LineItem.new
-        @line_item.variant_id = params[:variant_id]
-        @line_item.order_id = @order.id
-        @line_item.status = 'pending'
-        @line_item.quantity = params[:quantity] ? params[:quantity].to_i : 1
-      end
+      variant_id = params[:variant_id]
+      qty = params[:quantity] ? params[:quantity].to_i : 1
       
-      render :json => { :success => @line_item.save, :errors => @line_item.errors.full_messages, :item_count => @order.line_items.count }
+      if @order.line_items.exists?(:variant_id => variant_id)
+        li = @order.line_items.find_by_variant_id(variant_id)
+        li.quantity += qty
+      else
+        li = LineItem.new(
+          :order_id   => @order.id,
+          :variant_id => variant_id,
+          :quantity   => qty,
+          :status     => 'pending'
+        )
+      end            
+      render :json => { 
+        :success => li.save, 
+        :errors => li.errors.full_messages,
+        :item_count => @order.line_items.count 
+      }
     end
     
-    # PUT cart/update
+    # PUT /cart/:line_item_id
     def update
-      @line_item.quantity = params[:quantity].to_i
-      render :json => { :success => @line_item.save, :errors => @line_item.errors.full_messages, :line_item => @line_item, :order_subtotal => @order.calculate_subtotal }
+      li = LineItem.find(params[:line_item_id])
+      li.quantity = params[:quantity].to_i
+      li.save
+      li.destroy if li.quantity == 0
+      @order.calculate_subtotal
+      render :json => { :success => true }
     end
     
-    # DELETE cart/delete
+    # DELETE /cart/:line_item_id
     def remove
-      render :json => { :success => !!@order.line_items.delete(@line_item), :item_count => @order.line_items.count }
+      li = LineItem.find(params[:line_item_id]).destroy
+      render :json => { :success => true, :item_count => @order.line_items.count }
     end
   end
 end

data/app/controllers/caboose/checkout_controller.rb

@@ -36,8 +36,18 @@ module Caboose
     def step_three
       redirect_to '/checkout/step-one' and return if !logged_in?
       redirect_to '/checkout/step-two' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+            
+      # Remove any order packages      
+      LineItem.where(:order_id => @order.id).update_all(:order_package_id => nil)
+      OrderPackage.where(:order_id => @order.id).destroy_all      
+      
+      # Calculate what shipping packages we'll need      
+      OrderPackage.create_for_order(@order)
+      
+      # Now get the rates for those packages
+      Caboose.log("Getting rates...")      
       @rates = ShippingCalculator.rates(@order)
-      @selected_rate = ShippingCalculator.rate(@order)
+      Caboose.log(@rates.inspect)      
     end
     
     # GET /checkout/step-four

data/app/controllers/caboose/products_controller.rb

@@ -577,20 +577,21 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name
-          when 'alternate_id'     then product.alternate_id    = value          
-          when 'title'            then product.title           = value
-          when 'caption'          then product.caption         = value
-          when 'featured'         then product.featured        = value
-          when 'description'      then product.description     = value          
-          when 'vendor_id'        then product.vendor_id       = value
-          when 'handle'           then product.handle          = value
-          when 'seo_title'        then product.seo_title       = value
-          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 'option1'          then product.option1         = value
-          when 'option2'          then product.option2         = value
-          when 'option3'          then product.option3         = value
+          when 'alternate_id'       then product.alternate_id       = value          
+          when 'title'              then product.title              = value
+          when 'caption'            then product.caption            = value
+          when 'featured'           then product.featured           = value
+          when 'description'        then product.description        = value          
+          when 'vendor_id'          then product.vendor_id          = value
+          when 'handle'             then product.handle             = value
+          when 'seo_title'          then product.seo_title          = value
+          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 'option1'            then product.option1            = value
+          when 'option2'            then product.option2            = value
+          when 'option3'            then product.option3            = value
           when 'default1'
             product.default1 = value
             Variant.where(:product_id => product.id, :option1 => nil).each do |p|
@@ -677,6 +678,19 @@ module Caboose
       render :json => options
     end
     
+    # GET /products/stackable-group-options
+    def admin_stackable_group_options
+      arr = ['Active', 'Inactive', 'Deleted']
+      options = []
+      arr.each do |status|
+        options << {
+          :value => status,
+          :text => status
+        }
+      end
+      render :json => options
+    end
+    
     # GET /admin/products/combine
     def admin_combine_select_products
     end

data/app/controllers/caboose/stackable_groups_controller.rb

@@ -0,0 +1,107 @@
+module Caboose
+  class StackableGroupsController < Caboose::ApplicationController  
+
+    # GET /admin/stackable-groups
+    def admin_index
+      return if !user_is_allowed('products', 'view')      
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/stackable-groups/json
+    def admin_json
+      return if !user_is_allowed('products', 'view')
+      
+      pager = Caboose::PageBarGenerator.new(params, {
+        'name'  => ''        
+      }, {
+        'model'          => 'Caboose::StackableGroup',
+        'sort'           => 'name',
+        'desc'           => false,
+        'base_url'       => '/admin/stackable-groups',
+        'items_per_page' => 25,
+        'use_url_params' => false        
+      })
+      render :json => {
+        :pager => pager,
+        :models => pager.items
+      }      
+    end        
+    
+    # GET /admin/stackable-groups/:id/json
+    def admin_json_single
+      sg = StackableGroup.find(params[:id])
+      render :json => sg      
+    end    
+      
+    # PUT /admin/stackable-groups/:id
+    def admin_update
+      return if !user_is_allowed('products', 'edit')
+      
+      resp = Caboose::StdClass.new
+      sg = StackableGroup.find(params[:id])    
+      
+      save = true    
+      params.each do |name,value|
+        case name
+          when 'name'           then sg.name          = value
+          when 'extra_length'   then sg.extra_length  = value.to_f
+          when 'extra_width'    then sg.extra_width   = value.to_f
+          when 'extra_height'   then sg.extra_height  = value.to_f
+          when 'max_length'     then sg.max_length    = value.to_f
+          when 'max_width'      then sg.max_width     = value.to_f
+          when 'max_height'     then sg.max_height    = value.to_f                      
+        end
+      end
+      resp.success = save && sg.save
+      render :json => resp
+    end
+    
+    # POST /admin/stackable-groups
+    def admin_add
+      return if !user_is_allowed('products', 'add')
+      
+      resp = Caboose::StdClass.new      
+      name = params[:name]
+      
+      if name.length == 0
+        resp.error = "The title cannot be empty."
+      elsif StackableGroup.where(:name => name).exists?
+        resp.error = "A stackable group with that name already exists."
+      else
+        sg = StackableGroup.new(:name => name)
+        sg.save
+        resp.refresh = true
+      end
+      render :json => resp    
+    end
+    
+    # DELETE /admin/stackable-groups/:id
+    def admin_delete
+      return if !user_is_allowed('products', 'delete')
+      StackableGroup.find(params[:id]).destroy      
+      render :json => true      
+    end
+    
+    # DELETE /admin/stackable-groups/bulk
+    def admin_bulk_delete
+      return if !user_is_allowed('products', 'delete')
+      params[:model_ids].each do |sg_id|
+        sg = StackableGroup.where(:id => sg_id).first
+        sg.destroy if sg
+      end          
+      render :json => { :success => true }
+    end
+    
+    # GET /admin/stackable-groups/options
+    def admin_options      
+      options = StackableGroup.reorder(:name).all.collect do |sg|
+        {
+          :value => sg.id,
+          :text => sg.name
+        }
+      end
+      render :json => options
+    end
+        
+  end
+end

data/app/models/caboose/line_item.rb

@@ -3,18 +3,19 @@ module Caboose
     self.table_name = 'store_line_items'
     
     belongs_to :variant
-    belongs_to :order, :dependent => :destroy
+    belongs_to :order
+    belongs_to :order_package, :class_name => 'OrderPackage'
     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,
       :quantity,
       :price,
       :notes,
       :order_id,
-      :status,
-      :tracking_number,
+      :status,      
       :custom1,
       :custom2,
       :custom3
@@ -66,16 +67,29 @@ module Caboose
     end
     
     def as_json(options={})
-      self.attributes.merge({
+      self.attributes.merge({        
         :variant => self.variant,
-        :title => self.title,
-        :product => { :images => self.variant.product.product_images }
+        :title   => self.title
       })
     end
     
     def subtotal
       return self.quantity * self.price
     end
+    
+    def copy
+      LineItem.new(      
+        :variant_id      => self.variant_id      ,
+        :quantity        => self.quantity        ,
+        :price           => self.price           ,
+        :notes           => self.notes           ,
+        :order_id        => self.order_id        ,
+        :status          => self.status          ,        
+        :custom1         => self.custom1         ,
+        :custom2         => self.custom2         ,
+        :custom3         => self.custom3
+      )
+    end
   end
 end
 

data/app/models/caboose/order.rb

@@ -12,7 +12,8 @@ module Caboose
     belongs_to :billing_address, :class_name => 'Address'
     has_many :discounts, :through => :order_discounts
     has_many :order_discounts
-    has_many :line_items, :after_add => :line_item_added, :after_remove => :line_item_removed
+    has_many :line_items, :after_add => :line_item_added, :after_remove => :line_item_removed, :order => :id
+    has_many :packages, :class_name => 'Caboose::OrderPackage'
     
     attr_accessible :id,
       :order_number,

data/app/models/caboose/order_package.rb

@@ -0,0 +1,103 @@
+module Caboose
+  class OrderPackage < ActiveRecord::Base
+    self.table_name = 'store_order_packages'
+
+    belongs_to :order
+    belongs_to :shipping_package
+    has_many :line_items    
+    attr_accessible :id, 
+      :order_id,
+      :shipping_package_id,
+      :status,
+      :tracking_number
+      
+    STATUS_PENDING = 'Pending'
+    STATUS_SHIPPED = 'Shipped'
+    
+    # Calculates the shipping packages required for all the items in the order
+    def self.create_for_order(order)
+
+      # Make sure all the line items in the order have a quantity of 1
+      extra_line_items = []
+      order.line_items.each do |li|        
+        if li.quantity > 1          
+          (1..li.quantity).each{ |i|            
+            extra_line_items << li.copy 
+          }
+          li.quantity = 1
+          li.save
+        end        
+      end
+      extra_line_items.each do |li|         
+        li.quantity = 1                        
+        li.save 
+      end 
+      
+      # Make sure all the items in the order have attributes set
+      order.line_items.each do |li|              
+        v = li.variant
+        Caboose.log("Error: variant #{v.id} has a zero weight") and return false if v.weight.nil? || v.weight == 0
+        next if v.volume && v.volume > 0
+        Caboose.log("Error: variant #{v.id} has a zero length") and return false if v.length.nil? || v.length == 0
+        Caboose.log("Error: variant #{v.id} has a zero width" ) and return false if v.width.nil?  || v.width  == 0
+        Caboose.log("Error: variant #{v.id} has a zero height") and return false if v.height.nil? || v.height == 0        
+        v.volume = v.length * v.width * v.height
+        v.save
+      end
+            
+      # Reorder the items in the order by volume            
+      h = {}
+      order.line_items.each do |li|
+        (1..li.quantity).each do |i|        
+          v = li.variant          
+          h[v.volume] = li          
+        end
+      end      
+      line_items = h.sort_by{ |k,v| k }.collect{ |x| x[1] }      
+      all_packages = ShippingPackage.reorder(:price).all      
+      
+      # Now go through each variant and fit it in a new or existing package
+      line_items.each do |li|
+        
+        # See if the item will fit in any of the existing packages
+        it_fits = false
+        order.packages.each do |op|
+          it_fits = op.fits(li)
+          if it_fits
+            li.order_package_id = op.id
+            li.save            
+            break
+          end
+        end        
+        next if it_fits
+        
+        # Otherwise find the cheapest package the item will fit into
+        all_packages.each do |sp|          
+          if sp.fits(li.variant)
+            op = OrderPackage.create(:order_id => order.id, :shipping_package_id => sp.id)
+            li.order_package_id = op.id
+            li.save                          
+            break
+          end
+        end
+               
+      end                      
+    end
+    
+    def fits(line_item = nil)
+      variants = self.line_items.collect{ |li| li.variant }
+      variants << line_item.variant if line_item
+      return self.shipping_package.fits(variants)
+    end
+    
+    # Gets the activemerchant package based on the shipping package
+    def activemerchant_package      
+      weight = 0.0
+      self.line_items.each{ |li| weight = weight + li.variant.weight }
+      weight = weight * 0.035274 # Convert from grams to ounces
+      sp = self.shipping_package
+      return Package.new(weight, [sp.length, sp.width, sp.height], :units => :imperial)
+    end
+
+  end
+end