caboose-cms 0.5.69 → 0.5.70

data/app/controllers/caboose/users_controller.rb

@@ -289,8 +289,8 @@ module Caboose
     # GET /admin/users/options
     def options
       return if !user_is_allowed('users', 'view')
-      @users = User.reorder('last_name, first_name').all
-      options = @users.collect { |u| { 'value' => u.id, 'text' => "#{u.first_name} #{u.last_name}"}}
+      @users = User.where('id <> 2').reorder('last_name, first_name').all
+      options = @users.collect { |u| { 'value' => u.id, 'text' => "#{u.first_name} #{u.last_name} (#{u.email})"}}
       render json: options
     end
     

data/app/helpers/caboose/checkout_helper.rb

@@ -5,11 +5,12 @@ module Caboose
       str = ""
       str << "<div id='checkout-nav'>"
       str << "  <ul>"
-      str << "    <li class='odd'  id='checkout_nav1'><a href='#{i <= 1 ? '#' : '/checkout/step-one'   }' class='#{i == 1 ? 'current' : (i < 1 ? 'not_done' : 'done')}'><span>User Account </span></a></li>"
-      str << "    <li class='even' id='checkout_nav2'><a href='#{i <= 2 ? '#' : '/checkout/step-two'   }' class='#{i == 2 ? 'current' : (i < 2 ? 'not_done' : 'done')}'><span>Addresses    </span></a></li>"
-      str << "    <li class='odd'  id='checkout_nav3'><a href='#{i <= 3 ? '#' : '/checkout/step-three' }' class='#{i == 3 ? 'current' : (i < 3 ? 'not_done' : 'done')}'><span>Shipping     </span></a></li>"
-      str << "    <li class='even' id='checkout_nav4'><a href='#{i <= 4 ? '#' : '/checkout/step-four'  }' class='#{i == 4 ? 'current' : (i < 4 ? 'not_done' : 'done')}'><span>Payment      </span></a></li>"
-      str << "    <li class='odd'  id='checkout_nav5'><a href='#{i <= 5 ? '#' : '/checkout/step-five'  }' class='#{i == 5 ? 'current' : (i < 5 ? 'not_done' : 'done')}'><span>Confirm      </span></a></li>"
+      str << "    <li class='odd'  id='checkout_nav1'><a href='#{i <= 1 ? '#' : '/checkout'             }' class='#{i == 1 ? 'current' : (i < 1 ? 'not_done' : 'done')}'><span>User Account </span></a></li>"
+      str << "    <li class='even' id='checkout_nav2'><a href='#{i <= 2 ? '#' : '/checkout/addresses'   }' class='#{i == 2 ? 'current' : (i < 2 ? 'not_done' : 'done')}'><span>Addresses    </span></a></li>"
+      str << "    <li class='odd'  id='checkout_nav3'><a href='#{i <= 3 ? '#' : '/checkout/shipping'    }' class='#{i == 3 ? 'current' : (i < 3 ? 'not_done' : 'done')}'><span>Shipping     </span></a></li>"
+      str << "    <li class='even' id='checkout_nav4'><a href='#{i <= 4 ? '#' : '/checkout/gift-cards'  }' class='#{i == 4 ? 'current' : (i < 4 ? 'not_done' : 'done')}'><span>Gift Cards   </span></a></li>"
+      str << "    <li class='even' id='checkout_nav5'><a href='#{i <= 4 ? '#' : '/checkout/payment'     }' class='#{i == 4 ? 'current' : (i < 4 ? 'not_done' : 'done')}'><span>Payment      </span></a></li>"
+      str << "    <li class='odd'  id='checkout_nav6'><a href='#{i <= 5 ? '#' : '/checkout/confirm'     }' class='#{i == 5 ? 'current' : (i < 5 ? 'not_done' : 'done')}'><span>Confirm      </span></a></li>"
       str << "  </ul>"
       str << "</div>"
       return str

data/app/models/caboose/core_plugin.rb

@@ -27,7 +27,8 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     
     if site.use_store      
       item = { 'id' => 'store', 'text' => 'Store', 'children' => [] }
-      item['children'] << { 'id' => 'categories'       , 'href' => '/admin/categories'        , 'text' => 'Categories'        , 'modal' => false } if user.is_allowed('categories'       , 'view')        
+      item['children'] << { 'id' => 'categories'       , 'href' => '/admin/categories'        , 'text' => 'Categories'        , 'modal' => false } if user.is_allowed('categories'       , 'view')
+      item['children'] << { 'id' => 'giftcards'        , 'href' => '/admin/gift-cards'        , 'text' => 'Gift Cards'        , 'modal' => false } if user.is_allowed('giftcards'        , 'view')
       item['children'] << { 'id' => 'orders'           , 'href' => '/admin/orders'            , 'text' => 'Orders'            , 'modal' => false } if user.is_allowed('orders'           , 'view')
       item['children'] << { 'id' => 'products'         , 'href' => '/admin/products'          , 'text' => 'Products'          , 'modal' => false } if user.is_allowed('products'         , 'view')
       item['children'] << { 'id' => 'shippingpackages' , 'href' => '/admin/shipping-packages' , 'text' => 'Shipping Packages' , 'modal' => false } if user.is_allowed('shippingpackages' , 'view')

data/app/models/caboose/discount.rb

@@ -1,19 +1,14 @@
 module Caboose
   class Discount < ActiveRecord::Base
-    self.table_name  = 'store_discounts'
+    self.table_name  = 'store_order_discounts'
     self.primary_key = 'id'
-    
-    belongs_to :site
-    
+            
+    belongs_to :gift_card
+    belongs_to :order
     attr_accessible :id,
-      :site_id,
-      :name,              # The name of this discount
-      :code,              # The code the customer has to input to apply for this discount
-      :amount_current,
-      :amount_total,
-      :amount_flat,       # Amount of the savings flat off the total
-      :amount_percentage, # Amount of savings as a percentage off the total
-      :no_shipping,       # Whether or not it's a free shipping discount
-      :no_tax             # Whether or not it's a free shipping discount
+      :gift_card_id,
+      :order_id,
+      :amount      
+      
   end
 end

data/app/models/caboose/gift_card.rb

@@ -0,0 +1,49 @@
+module Caboose
+  class GiftCard < ActiveRecord::Base
+    self.table_name  = 'store_gift_cards'
+    self.primary_key = 'id'
+        
+    belongs_to :site    
+    has_many :discounts
+    has_many :orders, :through => :discounts    
+    attr_accessible :id,
+      :site_id,      
+      :name,  # The name of this discount            
+      :code,  # The code the customer has to input to apply for this discount
+      :card_type,
+      :total,
+      :balance,
+      :min_order_total, # The minimum order total required to be able to use the card
+      :date_available,
+      :date_expires,
+      :status            
+            
+    STATUS_INACTIVE = 'Inactive'
+    STATUS_ACTIVE   = 'Active'
+    STATUS_EXPIRED  = 'Expired'
+    
+    CARD_TYPE_AMOUNT      = 'Amount'
+    CARD_TYPE_PERCENTAGE  = 'Percentage'
+    CARD_TYPE_NO_SHIPPING = 'No Shipping'
+    CARD_TYPE_NO_TAX      = 'No Tax'
+
+    def valid_for_order?(order)
+      return false if self.status != GiftCard::STATUS_ACTIVE
+      return false if self.date_available && DateTime.now.utc < self.date_available
+      return false if self.date_expires && DateTime.now.utc > self.date_expires
+      return false if self.card_type == GiftCard::CARD_TYPE_AMOUNT && self.balance <= 0      
+      return false if self.min_order_total && order.total < self.min_order_total
+      return true
+    end
+    
+  end
+end
+
+# Flat amount - $10 off
+# Flat amount off if you spend over a certain amount
+# Percentage off
+# Percentage amount off if you spend over a certain amount
+# Free shipping
+# Free shipping if you spend over a certain amount
+# No Tax
+# No tax if you spend over a certain amount

data/app/models/caboose/order.rb

@@ -11,51 +11,50 @@ module Caboose
     belongs_to :customer, :class_name => 'Caboose::User'
     belongs_to :shipping_address, :class_name => 'Address'
     belongs_to :billing_address, :class_name => 'Address'
-    has_many :discounts, :through => :order_discounts
-    has_many :order_discounts
+    has_many :discounts    
     has_many :line_items, :after_add => :line_item_added, :after_remove => :line_item_removed, :order => :id
     has_many :order_packages, :class_name => 'Caboose::OrderPackage'
     has_many :order_transactions
     
     attr_accessible :id,
       :site_id,
-      :order_number,
+      :alternate_id,      
       :subtotal,
-      :tax,      
-      :shipping_carrier,
-      :shipping_service_code,
+      :tax,            
       :shipping,
       :handling,
-      :discount,
-      :amount_discounted,
+      :custom_discount,
+      :discount,      
       :total,
-      :status,
-      :payment_status,
-      :notes,
-      :referring_site,
-      :landing_site,
-      :landing_site_ref,
-      :cancel_reason,
-      :date_created,
-      :date_authorized,
-      :date_captured,
-      :date_cancelled,
-      :email,
-      :customer_id,
-      :payment_id,
-      :gateway_id,
-      :financial_status,
+      :customer_id,      
       :shipping_address_id,
       :billing_address_id,
+      :status,      
+      :financial_status,
+      :referring_site,
       :landing_page,
-      :landing_page_ref,
-      :transaction_d,
-      :auth_code,
-      :alternate_id,
+      :landing_page_ref,                        
       :auth_amount,
-      :date_shipped,
-      :transaction_service,
-      :transaction_id
+      :date_created,
+      :notes
+      
+      # :payment_status,
+      # :cancel_reason,      
+      # :date_authorized,
+      # :date_captured,
+      # :date_cancelled,
+      # :email,      
+      # :payment_id,
+      # :gateway_id,      
+      # :transaction_d,
+      # :auth_code,      
+      # :amount_discounted,
+      # :shipping_carrier,
+      # :shipping_service_code,
+      # :order_number,            
+      # :date_shipped,
+      # :transaction_service,
+      # :transaction_id
     
     STATUS_CART      = 'cart'
     STATUS_PENDING   = 'pending'    
@@ -166,36 +165,48 @@ module Caboose
     end
     
     def calculate
-      self.update_column(:subtotal, (self.calculate_subtotal * 100).ceil / 100.00)
-      self.update_column(:tax, (self.calculate_tax * 100).ceil / 100.00)
-      #self.update_column(:shipping, (self.calculate_shipping * 100).ceil / 100.00)
-      self.update_column(:handling, (self.calculate_handling * 100).ceil / 100.00)
-      self.update_column(:total, (self.calculate_total * 100).ceil / 100.00)
+      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    )
     end
     
     def calculate_subtotal
-      return 0 if self.line_items.empty?
-      self.line_items.collect { |line_item| line_item.price }.inject { |sum, price| sum + price }
+      return 0.0 if self.line_items.empty?
+      x = 0.0      
+      self.line_items.each{ |li| x = x + li.variant.price }
+      return x
     end
     
     def calculate_tax
-      return 0 if !self.shipping_address
+      return 0.0 if !self.shipping_address
       self.subtotal * TaxCalculator.tax_rate(self.shipping_address)
     end
     
-    def calculate_shipping
-      return 0 if !self.shipping_address || !self.shipping_service_code      
-      return 0.0
-      #ShippingCalculator.rates(self)
+    def calculate_shipping      
+      return 0.0 if self.order_packages.nil? || self.order_packages.count == 0
+      x = 0.0
+      self.order_packages.each{ |op| x = x + op.total }
+      return x
     end
     
     def calculate_handling
-      return 0 if !Caboose::store_handling_percentage
-      self.shipping * Caboose::store_handling_percentage.to_f
+      return 0.0 if self.site.nil? || self.site.store_config.nil?      
+      self.subtotal * self.site.store_config.handling_percentage.to_f
+    end
+    
+    def calculate_discount      
+      return 0.0 if self.discounts.nil? || self.discounts.count == 0
+      x = 0.0
+      self.discounts.each{ |d| x = x + d.amount }
+      x = x + self.custom_discount if self.custom_discount
+      return x
     end
     
     def calculate_total
-      [self.subtotal, self.tax, self.shipping, self.handling].compact.inject { |sum, price| sum + price }
+      return (self.subtotal + self.tax + self.shipping + self.handling) - self.discount
     end
     
     def shipping_and_handling
@@ -207,6 +218,15 @@ module Caboose
       self.line_items.each{ |li| count = count + li.quantity } if self.line_items
       return count
     end
+    
+    def take_gift_card_funds
+      return if self.discounts.nil? || self.discounts.count == 0
+      self.discounts.each do |d|        
+        gc = d.gift_card
+        gc.balance = gc.balance - d.amount
+        gc.save
+      end
+    end
   end
 end
 

data/app/models/caboose/order_package.rb

@@ -17,12 +17,19 @@ module Caboose
     STATUS_PENDING = 'Pending'
     STATUS_SHIPPED = 'Shipped'
     
+    def self.custom_order_packages(store_config, order)          
+      eval(store_config.order_packages_function)    
+    end
+    
     # Calculates the shipping packages required for all the items in the order
     def self.create_for_order(order)
-
-      store_config = order.site.store_config
-      return if !store_config.calculate_packages
       
+      store_config = order.site.store_config            
+      if !store_config.calculate_packages                        
+        self.custom_order_packages(store_config, order)
+        return
+      end
+                  
       # Make sure all the line items in the order have a quantity of 1
       extra_line_items = []
       order.line_items.each do |li|        
@@ -87,7 +94,7 @@ module Caboose
           end
         end
                
-      end                      
+      end            
     end
     
     def fits(line_item = nil)

data/app/models/caboose/order_package_calculator.rb

@@ -0,0 +1,102 @@
+require 'active_shipping'
+include ActiveMerchant::Shipping
+
+module Caboose
+  class OrderPackageCalculator
+    
+    def self.custom_order_packages(store_config, order)          
+      return eval(store_config.order_packages_function)    
+    end
+    
+    def self.order_packages(order)
+      return [] if Caboose::store_shipping.nil?
+            
+      sc = order.site.store_config
+      if sc.order_packages_function        
+        order_packages = self.custom_order_packages(sc, order)
+        return order_packages        
+      end
+      
+      # 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)
+              
+      return all_rates
+    end
+    
+    def self.rate(order)
+      return nil if !order.shipping_service_code
+      self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_service_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/product_image.rb

@@ -47,6 +47,16 @@ module Caboose
       self.image.url(size)
     end
     
+    def urls
+      {
+        :tiny   => self.url(:tiny),
+        :thumb  => self.url(:thumb),
+        :medium => self.url(:medium),
+        :large  => self.url(:large),
+        :huge   => self.url(:huge)
+      }      
+    end
+    
     def as_json(options={})
       self.attributes.merge({
         :urls => {

data/app/models/caboose/schema.rb

@@ -235,15 +235,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :updated_at  , :datetime , :null => true  ]
       ],
       Caboose::Discount => [
-        [ :site_id               , :integer  ],
-        [ :name                  , :string   ],
-        [ :code                  , :string   ],
-        [ :amount_current        , :numeric  ],
-        [ :amount_total          , :numeric  ],
-        [ :amount_flat           , :numeric  ],
-        [ :amount_percentage     , :numeric  ],
-        [ :no_shipping           , :boolean  ],
-        [ :no_tax                , :boolean  ]
+        [ :gift_card_id , :integer  ],
+        [ :order_id     , :integer  ],                
+        [ :amount       , :numeric  , { :default => 0.0 }]        
       ],
       Caboose::Domain => [
         [ :site_id            , :integer ],
@@ -251,6 +245,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :primary            , :boolean, { :default => false }],
         [ :under_construction , :boolean, { :default => false }]
       ],
+      Caboose::GiftCard => [
+        [ :site_id         , :integer  ],        
+        [ :name            , :string   ],
+        [ :code            , :string   ],
+        [ :card_type       , :string   ],
+        [ :total           , :numeric  , { :default => 0.0 }],
+        [ :balance         , :numeric  , { :default => 0.0 }],
+        [ :min_order_total , :numeric , { :default => 0.0 }],        
+        [ :date_available  , :datetime ],
+        [ :date_expires    , :datetime ],
+        [ :status          , :string   ]                                
+      ],      
       Caboose::LineItem => [
         [ :order_id              , :integer  ],
         [ :order_package_id      , :integer  ],
@@ -306,41 +312,43 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::Order => [
         [ :site_id               , :integer  ],
-        [ :email                 , :string   ],
-        [ :order_number          , :string   ],
+        [ :alternate_id          , :integer  ],        
         [ :subtotal              , :numeric   , :default => 0 ],
         [ :tax                   , :numeric   , :default => 0 ],
         [ :shipping              , :numeric   , :default => 0 ],
         [ :handling              , :numeric   , :default => 0 ],
+        [ :custom_discount       , :numeric   , :default => 0 ],
         [ :discount              , :numeric   , :default => 0 ],
         [ :total                 , :numeric   , :default => 0 ],
         [ :customer_id           , :integer  ],
-        [ :payment_id            , :integer  ],
-        [ :gateway_id            , :integer  ],
         [ :financial_status      , :string   ],
         [ :shipping_address_id   , :integer  ],
         [ :billing_address_id    , :integer  ],
         [ :notes                 , :text     ],
         [ :status                , :string   ],
         [ :date_created          , :datetime ],
-        [ :date_authorized       , :datetime ],
-        [ :date_captured         , :datetime ],
-        [ :date_cancelled        , :datetime ],
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
-        [ :landing_page_ref      , :string   ],        
-        [ :shipping_carrier      , :string   ],
-        [ :shipping_service_code , :string   ],
-        [ :shipping_service_name , :string   ],        
-        [ :transaction_id        , :string   ],
-        [ :auth_code             , :string   ],
-        [ :alternate_id          , :integer  ],
-        [ :auth_amount           , :numeric  ],
-        [ :date_shipped          , :datetime ],
-        [ :transaction_id        , :string   ],
-        [ :transaction_service   , :string   ],
-        [ :amount_discounted     , :numeric  ],
-        [ :decremented           , :boolean  ]
+        [ :landing_page_ref      , :string   ],
+        [ :auth_amount           , :numeric  ]
+        
+        #[ :email                 , :string   ],
+        #[ :order_number          , :string   ],
+        #[ :payment_id            , :integer  ],
+        #[ :gateway_id            , :integer  ],
+        #[ :date_authorized       , :datetime ],
+        #[ :date_captured         , :datetime ],
+        #[ :date_cancelled        , :datetime ],                
+        #[ :shipping_carrier      , :string   ],
+        #[ :shipping_service_code , :string   ],
+        #[ :shipping_service_name , :string   ],        
+        #[ :transaction_id        , :string   ],
+        #[ :transaction_id        , :string   ],
+        #[ :transaction_service   , :string   ],
+        #[ :amount_discounted     , :numeric  ],
+        #[ :auth_code             , :string   ],                
+        #[ :date_shipped          , :datetime ],                        
+        #[ :decremented           , :boolean  ]
       ],      
       Caboose::Page => [
         [ :site_id               , :integer ],
@@ -568,6 +576,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :shipping_email          , :string  ],
         [ :handling_percentage     , :string  ],
         [ :calculate_packages      , :boolean , { :default => true }],
+        [ :order_packages_function , :text    ],
         [ :shipping_rates_function , :text    ],
         [ :length_unit             , :string  , { :default => 'in' }],
         [ :weight_unit             , :string  , { :default => 'oz' }]