caboose-cms 0.5.15 → 0.5.16

data/app/models/caboose/product.rb

@@ -3,6 +3,7 @@ module Caboose
     self.table_name = 'store_products'
     self.primary_key = 'id'
     
+    belongs_to :stackable_group, :class_name => 'Caboose::StackableGroup'
     belongs_to :vendor, :class_name => 'Caboose::Vendor'
     has_many :customizations, :class_name => 'Caboose::Product', :through => :customization_memberships
     has_many :customization_memberships, :class_name => 'Caboose::CustomizationMembership'
@@ -66,7 +67,7 @@ module Caboose
         :vendor => self.vendor,
         :categories => self.categories,
         :variants => self.variants,
-        :images => self.product_images
+        :images => self.product_images        
       })
     end
     

data/app/models/caboose/schema.rb

@@ -242,12 +242,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::LineItem => [
         [ :order_id              , :integer  ],
+        [ :order_package_id      , :integer  ],
         [ :variant_id            , :integer  ],
         [ :parent_id             , :integer  ],
         [ :quantity              , :integer   , :default => 0 ],
         [ :status                , :string   ],
-        [ :tracking_number       , :string   ],
-        #[ :unit_price            , :numeric  ],
+        [ :tracking_number       , :string   ],        
         [ :price                 , :numeric   , :default => 0 ],
         [ :notes                 , :text     ],
         [ :custom1               , :string   ],
@@ -311,6 +311,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :order_id              , :integer ],
         [ :discount_id           , :integer ]
       ],
+      Caboose::OrderPackage => [
+        [ :order_id             , :integer ],
+        [ :shipping_package_id  , :integer ],
+        [ :status               , :string  ],
+        [ :tracking_number      , :string  ]      
+      ],      
       Caboose::Page => [
         [ :site_id               , :integer ],
         [ :parent_id             , :integer ],
@@ -396,7 +402,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :date_available        , :datetime  ],
         [ :custom_input          , :text      ],
         [ :sort_order            , :integer   ],
-        [ :featured              , :boolean   , :default => false ]
+        [ :featured              , :boolean   , :default => false ],
+        [ :stackable_group_id    , :integer   ]
       ],
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
@@ -449,6 +456,16 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name  , :string ],
         [ :value , :text   ]
       ],
+      Caboose::ShippingPackage => [
+        [ :carrier      , :string  ],
+        [ :service_code , :string  ],
+        [ :service_name , :string  ],
+        [ :length       , :decimal ],
+        [ :width        , :decimal ],
+        [ :height       , :decimal ],
+        [ :volume       , :decimal ],
+        [ :price        , :decimal ]        
+      ],
       Caboose::Site => [
         [ :name                     , :string ],
         [ :description              , :text   ],
@@ -469,6 +486,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :authentication       , :string ], # :plain, :login, :cram_md5.
         [ :enable_starttls_auto , :boolean , { :default => true }]
       ],
+      Caboose::StackableGroup => [       
+        [ :name           , :string  ],
+        [ :extra_length   , :decimal ],
+        [ :extra_width    , :decimal ],
+        [ :extra_height   , :decimal ],
+        [ :max_length     , :decimal ],
+        [ :max_width      , :decimal ],
+        [ :max_height     , :decimal ]
+      ],
       Caboose::User => [
         [ :first_name           , :string     ],
         [ :last_name            , :string     ],
@@ -502,6 +528,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :length                , :decimal  ],
         [ :width                 , :decimal  ],
         [ :height                , :decimal  ],
+        [ :volume                , :decimal  ],
         [ :cylinder              , :boolean  ],
         [ :option1               , :string   ],
         [ :option2               , :string   ],
@@ -687,6 +714,21 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :slug => 'products'
       })
     end
+        
+    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "29").exists?
+      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "29", :service_name => "USPS Priority Mail 1-Day Padded Flat Rate Envelope", :price=>610  , :volume => 180)
+    end
+    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "28").exists?
+      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "28", :service_name => "USPS Priority Mail 1-Day Small Flat Rate Box"      , :price=>595  , :length => 8.625   , :width => 5.375  , :height => 1.625 , :volume => 75.334)
+    end
+    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "17").exists?
+      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "17", :service_name => "USPS Priority Mail 1-Day Medium Flat Rate Box"     , :price=>1265 , :length => 11      , :width => 8.5    , :height => 5.5   , :volume => 514.25)
+      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "17", :service_name => "USPS Priority Mail 1-Day Medium Flat Rate Box"     , :price=>1265 , :length => 13.625  , :width => 11.875 , :height => 3.375 , :volume => 546.06)
+    end
+    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "22").exists?
+      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "22", :service_name => "USPS Priority Mail 1-Day Large Flat Rate Box"      , :price=>1790 , :length => 12      , :width => 12     , :height => 5.5   , :volume => 792   )
+      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "22", :service_name => "USPS Priority Mail 1-Day Large Flat Rate Box"      , :price=>1790 , :length => 23.6875 , :width => 11.75  , :height => 3     , :volume => 834.98)
+    end
 
   end
 end

data/app/models/caboose/shipping_calculator.rb

@@ -3,72 +3,48 @@ include ActiveMerchant::Shipping
 
 module Caboose
   class ShippingCalculator
+    
     def self.rates(order)
-      return [] if Caboose::shipping.nil?
-      
-      total  = 0.0
-      weight = 0.0
-      
-      order.line_items.each do |li|
-        total  = total + (li.variant.shipping_unit_value.nil? ? 0 : li.variant.shipping_unit_value)
-        weight = weight + (li.variant.weight || 0)
-      end
-      
-      length = 0
-      width  = 0
-      height = 0
-      
-      if total <= 5
-        length = 15.5
-        width  = 9.5
-        height = 6
-      elsif total <= 10
-        length = 12
-        width  = 8
-        height = 5
-      else
-        length = 20
-        width  = 16
-        height = 14
-      end
+      return [] if Caboose::store_shipping.nil?
       
+      ss = Caboose::store_shipping
       origin = Location.new(
-        :country => Caboose::shipping[:origin][:country],
-        :state   => Caboose::shipping[:origin][:state],
-        :city    => Caboose::shipping[:origin][:city],
-        :zip     => Caboose::shipping[:origin][:zip]
-      )
-      
+        :country => ss[:origin][:country],
+        :state   => ss[:origin][:state],
+        :city    => ss[:origin][:city],
+        :zip     => ss[:origin][:zip]
+      )      
       destination = Location.new(
-        :country     => Caboose::shipping[:origin][:country],
+        :country     => ss[:origin][:country],
         :state       => order.shipping_address.state,
         :city        => order.shipping_address.city,
         :postal_code => order.shipping_address.zip
-      )
-      
-      packages = [Package.new(weight, [length, width, height], :units => :imperial)]
-      
-      ups = UPS.new(
-        :key            => Caboose::shipping[:ups][:key],
-        :login          => Caboose::shipping[:ups][:username],
-        :password       => Caboose::shipping[:ups][:password],
-        :origin_account => Caboose::shipping[:ups][:origin_account]
-      )
-      
-      ups_response = ups.find_rates(origin, destination, packages)
-      
-      rates = ups_response.rates.collect do |rate|
-        next if Caboose::allowed_shipping_method_codes && !Caboose::allowed_shipping_method_codes.index(rate.service_code)
-        
-        {
-          :service_code    => rate.service_code,
-          :service_name    => rate.service_name,
-          :total_price     => rate.total_price.to_d / 100,
-          :negotiated_rate => rate.negotiated_rate
-        }
-      end
-      
-      return rates.compact
+      )      
+      ups = ss[:ups] ? UPS.new(:key => ss[:ups][:key], :login => ss[:ups][:username], :password => ss[:ups][:password], :origin_account => ss[:ups][:origin_account]) : nil        
+      usps = ss[:usps] ? USPS.new(:login => ss[:usps][:username]) : nil                        
+                  
+      all_rates = []
+      order.packages.each do |op|              
+        sp = op.shipping_package
+        package = op.activemerchant_package
+        rates = []
+        if ups                  
+          resp = ups.find_rates(origin, destination, package)      
+          resp.rates.sort_by(&:price).each do |rate|
+            next if rate.service_code != sp.service_code            
+            rates << { :carrier => 'UPS', :service_code => rate.service_code, :service_name => rate.service_name, :price => rate.total_price.to_d / 100 }
+          end
+        end
+        if usps
+          resp = usps.find_rates(origin, destination, package)
+          resp.rates.sort_by(&:price).each do |rate|
+            next if rate.service_code != sp.service_code            
+            rates << { :carrier => 'USPS', :service_code => rate.service_code, :service_name => rate.service_name, :total_price  => rate.total_price.to_d / 100 }
+          end
+        end
+        all_rates << [op, rates]
+      end            
+      return all_rates
     end
     
     def self.rate(order)
@@ -76,6 +52,71 @@ module Caboose
       self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_method_code }
       return nil
     end
+                
+    # Calculates the packages required for all the items in the order
+    #def self.packages_for_order(order)
+    #
+    #  # 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] = v          
+    #    end
+    #  end      
+    #  variants = h.sort_by{ |k,v| k }.collect{ |x| x[1] }
+    #  
+    #  all_packages = ShippingPackage.reorder(:price).all
+    #  packages = []
+    #  
+    #  # Now go through each variant and fit it in a new or existing package
+    #  variants.each do |v|
+    #    
+    #    # See if the item will fit in any of the existing packages
+    #    it_fits = false
+    #    packages.each do |h|
+    #      it_fits = h.shipping_package.fits(h.variants, v)
+    #      if it_fits
+    #        h.variants << v
+    #        break
+    #      end
+    #    end        
+    #    next if it_fits
+    #    
+    #    # Otherwise find the cheapest package the item will fit into
+    #    all_packages.each do |p|          
+    #      if p.fits(v)
+    #        packages << StdClass.new('shipping_package' => p, 'variants' => [v])
+    #        break
+    #      end
+    #    end
+    #           
+    #  end
+    #  
+    #  return packages
+    #  
+    #  #arr = []
+    #  #packages.each do |h|
+    #  #  p = h.package
+    #  #  weight = 0.0
+    #  #  h.variants.each{ |v| weight = weight + v.weight }
+    #  #  weight = weight * 0.035274        
+    #  #  arr << Package.new(weight, [p.length, p.width, p.height], :units => :imperial)      
+    #  #end      
+    #  #return arr
+    #                  
+    #end
   end
 end
-

data/app/models/caboose/shipping_package.rb

@@ -0,0 +1,80 @@
+require 'box_packer'
+
+module Caboose
+  class ShippingPackage < ActiveRecord::Base
+    self.table_name = 'store_shipping_packages'
+    attr_accessible :id, :carrier, :service_code, :service_name, :length, :width, :height, :volume, :price
+          
+    def fits(variants)  
+      
+      arr = variants.is_a?(Array) ? variants : [variants]            
+      rigid = []
+      floppy = []
+      arr.each do |v|
+        if v.length && v.length > 0 && v.width && v.width > 0 && v.height && v.height > 0
+          rigid << v
+        else
+          floppy << v
+        end
+      end
+      rigid_volume = 0.0
+      floppy_volume = 0.0
+      rigid.each { |v| rigid_volume  = rigid_volume  + v.volume }      
+      floppy.each{ |v| floppy_volume = floppy_volume + v.volume }
+      return false if (rigid_volume + floppy_volume) > self.volume
+      rigid_boxes = self.boxes(rigid)
+      
+      it_fits = false       
+      BoxPacker.container [self.length, self.width, self.height] do        
+        rigid_boxes.each{ |arr| add_item arr }    
+        count = pack!
+        it_fits = true if count == rigid_boxes.count                                      
+      end
+      return it_fits         
+
+    end
+    
+    # Gets the 3d dimensions of the variants after they're stacked
+    def boxes(rigid_variants)
+      stackable = {}
+      nonstackable = []      
+      rigid_variants.each do |v|
+        sgid = v.product.stackable_group_id        
+        if sgid          
+          stackable[sgid] = [] if stackable[sgid].nil?
+          stackable[sgid] << v
+        else
+          nonstackable << [v.length, v.width, v.height]
+        end
+      end
+            
+      stackable.each do |sgid, arr|                
+        sg = arr[0].product.stackable_group        
+        l = 0.0
+        w = 0.0
+        h = 0.0        
+        arr.each do |v|
+          if l+sg.extra_length >= sg.max_length || w+sg.extra_width >= sg.max_width || h+sg.extra_height >= sg.max_height
+            nonstackable << [l, w, h]
+            l = 0.0
+            w = 0.0
+            h = 0.0
+          end
+          if l == 0.0
+            l = v.length
+            w = v.width
+            h = v.height            
+          else
+            l = l + sg.extra_length
+            w = w + sg.extra_width
+            h = h + sg.extra_height            
+          end
+        end        
+        nonstackable << [l, w, h] if l > 0
+      end
+      
+      return nonstackable
+    end
+        
+  end
+end

data/app/models/caboose/site.rb

@@ -1,7 +1,9 @@
 
 class Caboose::Site < ActiveRecord::Base
   self.table_name = "sites"
-       
+
+  has_many :block_type_site_memberships, :class_name => 'Caboose::BlockTypeSiteMembership', :dependent => :delete_all
+  has_many :block_types, :through => :block_type_site_memberships
   has_many :site_memberships, :class_name => 'Caboose::SiteMembership', :dependent => :delete_all
   has_many :domains, :class_name => 'Caboose::Domain', :dependent => :delete_all
   has_many :post_categories, :class_name => 'Caboose::PostCategory'

data/app/models/caboose/stackable_group.rb

@@ -0,0 +1,17 @@
+module Caboose
+  class StackableGroup < ActiveRecord::Base
+    self.table_name = 'store_stackable_groups'
+    
+    has_many :products
+    attr_accessible :id, 
+      :name, 
+      :extra_length,
+      :extra_width,
+      :extra_height,
+      :max_length,
+      :max_width, 
+      :max_height
+        
+  end
+end
+                  

data/app/models/caboose/tax_calculator.rb

@@ -1,7 +1,6 @@
 module Caboose
   class TaxCalculator
-    def self.tax_rate(address)
-      ap '--HOOK calculate tax'
+    def self.tax_rate(address)      
       return 0 if address.state.downcase != 'al'
       city = address.city.downcase
       rate = 0.00

data/app/models/caboose/variant.rb

@@ -76,11 +76,8 @@ module Caboose
     
     def as_json(options={})
       self.attributes.merge({
-        :images => if self.product_images.any?
-          self.product_images
-        else
-          [self.product.product_images.first]
-        end
+        :images => self.product_images.any? ? self.product_images : [self.product.product_images.first],
+        :title => "#{self.product.title} (#{self.options.join(', ')})"
       })
     end
     

data/app/views/caboose/cart/index.html.erb

@@ -1,8 +1,21 @@
-<div class="wrapper">
-  <div id="cart"></div>
-</div>
+<div class="constrain">
+  <div id='cart'></div>
+</div> 
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/message_boxes' %>
+<%= stylesheet_link_tag 'caboose/model_binder' %>
+<%= stylesheet_link_tag 'caboose/cart' %>
+<% end %>
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag 'caboose/cart' %>
-<%= javascript_include_tag 'caboose/product' %>
-<% end %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/cart2' %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  var controller = new Cart();  
+});
+
+</script>
+<% end %>