caboose-cms 0.5.122 → 0.5.123

data/app/models/caboose/address.rb

@@ -18,7 +18,15 @@ module Caboose
       :country,
       :country_code,
       :phone
-                
+
+    def name_and_address
+      str = "#{self.first_name} #{self.last_name}"
+      str << "<br />#{self.address1}"      
+      str << "<br />#{self.address2}" if self.address2 && self.address2.length > 0
+      str << "<br />#{self.city}, #{self.state} #{self.zip}"
+      return str
+    end
+    
   end
 end
 

data/app/models/caboose/line_item.rb

@@ -11,8 +11,9 @@ module Caboose
     attr_accessible :id,
       :order_package_id,
       :variant_id,
+      :unit_price,
       :quantity,
-      :price,
+      :subtotal,
       :notes,
       :order_id,
       :status,      
@@ -47,20 +48,23 @@ module Caboose
     # Callbacks
     #
     
-    before_save :update_price
+    before_save :update_subtotal
     after_save { self.order.calculate }    
     after_initialize :check_nil_fields
     
-    def check_nil_fields
-      self.price = 0.00 if self.price.nil?        
+    def check_nil_fields      
+      self.subtotal = 0.00 if self.subtotal.nil?        
     end
     
     #
     # Methods
     #
     
-    def update_price
-      self.price = self.variant.price * self.quantity
+    def update_subtotal
+      if self.unit_price.nil?
+        self.unit_price = self.variant.on_sale? ? self.variant.sale_price : self.variant.price        
+      end      
+      self.subtotal = self.unit_price * self.quantity
     end
     
     def title
@@ -78,15 +82,19 @@ module Caboose
       })
     end
     
-    def subtotal
-      return self.quantity * self.price
+    def verify_unit_price      
+      if self.unit_price.nil?
+        self.unit_price = self.variant.on_sale? ? self.variant.sale_price : self.variant.price
+        self.save
+      end      
     end
     
     def copy
       LineItem.new(      
         :variant_id      => self.variant_id      ,
         :quantity        => self.quantity        ,
-        :price           => self.price           ,
+        :unit_price      => self.unit_price      ,
+        :subtotal        => self.subtotal        ,
         :notes           => self.notes           ,
         :order_id        => self.order_id        ,
         :status          => self.status          ,        

data/app/models/caboose/model_binder.rb

@@ -0,0 +1,63 @@
+
+module Caboose
+  class ModelBinder
+    
+    # Converts a 12-hour time string to a 24-hour time string.  
+    # Example: 3:37 pm -> 15:37 
+    def self.military_time(str)
+      return false if str.nil? || str.length == 0
+      arr = str.split(' ')
+      return str if arr.length == 1
+      hm = arr[0]
+      ampm = arr[1].downcase
+      return hm if ampm == 'am'
+      arr2 = hm.split(':')
+      arr2[0] = (arr2[0].to_i + 12).to_s
+      return arr2.join(':')
+    end
+    
+    # Given a local date and time string (iso8601 format) and the local timezone, 
+    # return a datetime object in the UTC zone.
+    def self.local_datetime_to_utc(str, zone)
+                      
+      return false if str.nil? || zone.nil?
+      
+      # Split into date and time
+      arr = str.split('T')      
+      arr = str.split(' ') if arr.count == 1      
+      return false if arr.count == 1
+      
+      # Split up the date into its components
+      date_string = arr.shift
+      d = date_string.split('-')
+      d = date_string.split('/') if d.count == 1      
+      return false if d.count != 3
+      d = [d[2], d[0], d[1]] if date_string.include?('/')
+      
+      # Split up the time into its components
+      time_string = arr.join(' ')
+      time_string = ModelBinder.military_time(time_string)
+      t = time_string.split(':')
+      return false if t.count != 2 && t.count != 3
+      
+      # Convert timezones
+      old_timezone = Time.zone
+      Time.zone = zone                    
+      local_d = Time.zone.local(d[0].to_i, d[1].to_i, d[2].to_i, t[0].to_i, t[1].to_i, (t.count > 2 ? t[2].to_i : 0)).to_datetime.utc
+      Time.zone = old_timezone
+      
+      return local_d
+    end
+    
+    def self.update_date(d, value, timezone)                      
+      t = d ? d.in_time_zone(timezone).strftime('%H:%M') : '10:00'            
+      return ModelBinder.local_datetime_to_utc("#{value} #{t}", timezone)
+    end
+    
+    def self.update_time(d, value, timezone)                        
+      d2 = d ? d.in_time_zone(timezone).strftime('%Y-%m-%d') : DateTime.now.strftime('%Y-%m-%d')
+      return ModelBinder.local_datetime_to_utc("#{d2} #{value}", timezone)
+    end
+        
+  end
+end

data/app/models/caboose/order.rb

@@ -38,21 +38,27 @@ module Caboose
       :date_created,
       :notes
           
-    STATUS_CART      = 'cart'
-    STATUS_PENDING   = 'pending'    
-    STATUS_CANCELED  = 'canceled'
-    STATUS_SHIPPED   = 'shipped'
-    STATUS_TESTING   = 'testing'
+    STATUS_CART          = 'cart'
+    STATUS_PENDING       = 'pending'    
+    STATUS_CANCELED      = 'canceled'
+    STATUS_READY_TO_SHIP = 'ready to ship'
+    STATUS_SHIPPED       = 'shipped'    
+    STATUS_TESTING       = 'testing'
+
+    FINANCIAL_STATUS_AUTHORIZED = 'authorized'
+    FINANCIAL_STATUS_CAPTURED   = 'captured'
+    FINANCIAL_STATUS_REFUNDED   = 'refunded'
+    FINANCIAL_STATUS_VOIDED     = 'voided'
     
     #
     # Scopes
-    #
-    
+    #    
+    scope :cart       , where('status = ?', 'cart')
+    scope :pending    , where('status = ?', 'pending')    
+    scope :canceled   , where('status = ?', 'canceled')
+    scope :shipped    , where('status = ?', 'shipped')
     scope :test       , where('status = ?', 'testing')
-    scope :cancelled  , where('status = ?', 'cancelled')
-    scope :pending    , where('status = ?', 'pending')
-    #TODO scope :fulfilled
-    #TODO scope :unfulfilled
+    
     scope :authorized , where('financial_status = ?', 'authorized')
     scope :captured   , where('financial_status = ?', 'captured')
     scope :refunded   , where('financial_status = ?', 'refunded')
@@ -63,7 +69,7 @@ module Caboose
     #
     
     validates :status, :inclusion => {
-      :in      => ['cart', 'pending', 'cancelled', 'shipped', 'testing'],
+      :in      => ['cart', 'pending', 'canceled', 'ready to ship', 'shipped', 'testing'],
       :message => "%{value} is not a valid status. Must be either 'pending' or 'shipped'"
     }
     
@@ -124,7 +130,7 @@ module Caboose
       PaymentProcessor.capture(self)
     end
     
-    def refuned
+    def refund
       PaymentProcessor.refund(self)
     end
     
@@ -143,8 +149,9 @@ module Caboose
     
     def calculate_subtotal
       return 0.0 if self.line_items.empty?
+      self.line_items.each{ |li| li.verify_unit_price } # Make sure the unit prices are populated        
       x = 0.0      
-      self.line_items.each{ |li| x = x + (li.variant.price * li.quantity) } # Fixed issue with quantity
+      self.line_items.each{ |li| x = x + (li.unit_price * li.quantity) } # Fixed issue with quantity 
       return x
     end
     

data/app/models/caboose/order_pdf.rb

@@ -92,9 +92,9 @@ module Caboose
         tbl << [        
           "#{li.variant.product.title}\n#{li.variant.sku}\n#{li.variant.title}",
           { :content => li.tracking_number },
-          { :content => sprintf("%.2f", li.variant.price) , :align => :right },
-          { :content => "#{li.quantity}"                  , :align => :right },          
-          { :content => sprintf("%.2f", li.subtotal)      , :align => :right }
+          { :content => sprintf("%.2f", li.unit_price) , :align => :right },
+          { :content => "#{li.quantity}"               , :align => :right },          
+          { :content => sprintf("%.2f", li.subtotal)   , :align => :right }
         ]
       end            
       tbl << [{ :content => "Subtotal"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.subtotal                        ) , :align => :right }]

data/app/models/caboose/pending_orders_pdf.rb

@@ -66,7 +66,7 @@ module Caboose
         tbl << [        
           "#{li.variant.product.title}\n#{li.variant.sku}\n#{li.variant.title}",
           { :content => li.tracking_number },
-          { :content => sprintf("%.2f", li.variant.price) , :align => :right },
+          { :content => sprintf("%.2f", li.unit_price) , :align => :right },
           { :content => "#{li.quantity}"                  , :align => :right },          
           { :content => sprintf("%.2f", li.subtotal)      , :align => :right }
         ]

data/app/models/caboose/product.rb

@@ -105,10 +105,11 @@ module Caboose
       min = 100000
       max = 0
       
-      self.variants.each do |variant|
-        next if variant.nil? or variant.price.nil? or variant.price <= 0
-        min = variant.price if variant.price < min
-        max = variant.price if variant.price > max
+      self.variants.each do |variant|        
+        next if variant.nil? || variant.price.nil? || variant.price <= 0
+        price = variant.on_sale? ? v.sale_price : v.price
+        min = price if price < min
+        max = price if price > max
       end
       
       return [min, max]
@@ -171,18 +172,16 @@ module Caboose
       end
     end
     
-    # TODO: Implement product sales
-    #def self.products_on_sale
-    #        
-    #  query[0] = "select distinct product_id from store_variants 
-    #    where sale_price is not null 
-    #    and date_sale_starts < now() 
-    #    and date_sale_ends > now()
-    #    order by title limit 20"          
-    #  rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
-    #  arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
-    #  
-    #end
+    def update_on_sale      
+      is_on_sale = false
+      self.variants.each do |v|
+        is_on_sale = true if v.on_sale?
+      end
+      if (is_on_sale && !self.on_sale) || (!is_on_sale && self.on_sale)
+        self.on_sale = is_on_sale
+        self.save
+      end
+    end            
     
   end
 end

data/app/models/caboose/schema.rb

@@ -57,13 +57,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Order => [
         :shipping_method       , 
         :shipping_method_code  ,
-        :email                 ,
-        :order_number          ,
+        :email                 ,        
         :payment_id            ,
         :gateway_id            ,
         :date_authorized       ,
         :date_captured         ,
-        :date_cancelled        ,                
+        :date_canceled         ,                
         :shipping_carrier      ,
         :shipping_service_code ,
         :shipping_service_name ,        
@@ -79,7 +78,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::ShippingPackage => [:price, :carrier, :service_code, :service_name, :shipping_method_id, :length, :width, :height],
       Caboose::Site => [:shipping_cost_function],
       Caboose::StoreConfig => [:use_usps, :allowed_shipping_codes, :default_shipping_code, :pp_relay_url, :pp_response_url],
-      Caboose::Variant => [:quantity],
+      Caboose::Variant => [:quantity, :on_sale],
       Caboose::Vendor => [:vendor, :vendor_id]
     }
   end
@@ -285,11 +284,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :order_id              , :integer  ],
         [ :order_package_id      , :integer  ],
         [ :variant_id            , :integer  ],
-        [ :parent_id             , :integer  ],
-        [ :quantity              , :integer   , :default => 0 ],
+        [ :parent_id             , :integer  ],                
         [ :status                , :string   ],
-        [ :tracking_number       , :string   ],        
-        [ :price                 , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :tracking_number       , :string   ],
+        [ :quantity              , :integer   , :default => 0 ],
+        [ :unit_price            , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :subtotal              , :decimal   , { :precision => 8, :scale => 2 }],
         [ :notes                 , :text     ],
         [ :custom1               , :string   ],
         [ :custom2               , :string   ],
@@ -336,6 +336,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::Order => [
         [ :site_id               , :integer  ],
+        [ :order_number          , :integer  ],
         [ :alternate_id          , :integer  ],        
         [ :subtotal              , :decimal  , { :precision => 8, :scale => 2 }],
         [ :tax                   , :decimal  , { :precision => 8, :scale => 2 }],
@@ -354,7 +355,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
         [ :landing_page_ref      , :string   ],
-        [ :auth_amount           , :decimal  , { :precision => 8, :scale => 2 }]
+        [ :auth_amount           , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :gift_message          , :text     ],
+        [ :include_receipt       , :boolean  , { :default => true }]
         
         #[ :email                 , :string   ],
         #[ :order_number          , :string   ],
@@ -467,7 +470,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :custom_input          , :text      ],
         [ :sort_order            , :integer   ],
         [ :featured              , :boolean   , :default => false ],
-        [ :stackable_group_id    , :integer   ]
+        [ :stackable_group_id    , :integer   ],
+        [ :on_sale               , :boolean   , { :default => false }]
       ],
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
@@ -550,7 +554,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name                    , :string ],
         [ :description             , :text   ],
         [ :under_construction_html , :text   ],
-        [ :use_store               , :boolean , { :default => false }]
+        [ :use_store               , :boolean , { :default => false }],
+        [ :logo                    , :attachment ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
@@ -618,7 +623,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :shipping_rates_function , :text    ],
         [ :length_unit             , :string  , { :default => 'in' }],
         [ :weight_unit             , :string  , { :default => 'oz' }],
-        [ :download_url_expires_in , :string  , { :default => 5 }]
+        [ :download_url_expires_in , :string  , { :default => 5 }],
+        [ :starting_order_number   , :integer , { :default => 1000 }]
       ],
       Caboose::User => [
         [ :site_id              , :integer    ],
@@ -652,7 +658,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :price                 , :decimal   , { :precision => 8, :scale => 2 }],
         [ :sale_price            , :decimal   , { :precision => 8, :scale => 2 }],
         [ :date_sale_starts      , :datetime ],
-        [ :date_sale_end         , :datetime ],
+        [ :date_sale_ends        , :datetime ],
+        [ :date_sale_end         , :datetime ],        
         [ :available             , :boolean  ],
         [ :quantity_in_stock     , :integer   , :default => 0 ],        
         [ :ignore_quantity       , :boolean  ],

data/app/models/caboose/site.rb

@@ -8,6 +8,15 @@ class Caboose::Site < ActiveRecord::Base
   has_many :domains, :class_name => 'Caboose::Domain', :dependent => :delete_all
   has_many :post_categories, :class_name => 'Caboose::PostCategory'
   has_one :store_config
+  has_attached_file :logo, 
+    :path => ':path_prefixsite_logos/:id_:style.:extension',    
+    :default_url => 'http://placehold.it/300x300',    
+    :styles => {
+      :tiny  => '150x200>',
+      :thumb => '300x400>',
+      :large => '600x800>'
+    }
+  do_not_validate_attachment_file_type :logo
   attr_accessible :id, :name, :description, :under_construction_html
   
   def smtp_config

data/app/models/caboose/store_config.rb

@@ -32,6 +32,12 @@ module Caboose
       :shipping_rates_function,
       :length_unit,
       :weight_unit
+      
+    def next_order_number
+      x = Order.where("order_number is not null").reorder("order_number desc").limit(1).first
+      return x.order_number + 1 if x
+      return self.starting_order_number      
+    end
         
   end
 end

data/app/models/caboose/variant.rb

@@ -102,6 +102,20 @@ module Caboose
       arr << self.option3 if self.option3 && self.option3.strip.length > 0
       return arr
     end
-     
+    
+    def product_image
+      return self.product_images.first if self.product_images
+      return self.product.product_images.first if self.product.product_images
+      return nil
+    end
+    
+    def on_sale?
+      return false if self.sale_price.nil?
+      d = DateTime.now.utc
+      return false if self.date_sale_starts && d < self.date_sale_starts
+      return false if self.date_sale_ends   && d > self.date_sale_ends
+      return true
+    end
+
   end
 end

data/app/views/caboose/checkout/_cart.html.erb

@@ -16,9 +16,9 @@
         <% end %>
       </td>
       <td valign='top'><%= li.title %></td>
-      <td valign='top' align='right' class='qty'      style='text-align: right;'><%= li.quantity %></td>
-      <td valign='top' align='right' class='price'    style='text-align: right;'><%= number_to_currency(li.price, :precision => 2) %></td>
-      <td valign='top' align='right' class='subtotal' style='text-align: right;'><%= number_to_currency(li.price, :precision => 2) %></td>
+      <td valign='top' align='right' class='qty'        style='text-align: right;'><%= li.quantity %></td>
+      <td valign='top' align='right' class='unit_price' style='text-align: right;'><%= number_to_currency(li.unit_price , :precision => 2) %></td>
+      <td valign='top' align='right' class='subtotal'   style='text-align: right;'><%= number_to_currency(li.subtotal   , :precision => 2) %></td>
     </tr>        
   <% end %>                  
   <tr><td colspan='4' align='right' style='text-align: right;'>Subtotal:            </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.subtotal                   , :precision => 2) %></td></tr>            

data/app/views/caboose/checkout/_confirm.html.erb

@@ -16,9 +16,9 @@
                 <% end %>                    
                 <p><%= li.title %></p>
               </td>
-              <td valign='top' align='right' class='qty'      style='text-align: right;'><%= li.quantity %></td>
-              <td valign='top' align='right' class='price'    style='text-align: right;'><%= number_to_currency(li.price, :precision => 2) %></td>
-              <td valign='top' align='right' class='subtotal' style='text-align: right;'><%= number_to_currency(li.price, :precision => 2) %></td>
+              <td valign='top' align='right' class='qty'        style='text-align: right;'><%= li.quantity %></td>
+              <td valign='top' align='right' class='unit_price' style='text-align: right;'><%= number_to_currency(li.unit_price , :precision => 2) %></td>
+              <td valign='top' align='right' class='subtotal'   style='text-align: right;'><%= number_to_currency(li.subtotal   , :precision => 2) %></td>
             </tr>        
           <% end %>                  
           <tr><td colspan='3' align='right' style='text-align: right;'>Subtotal:            </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.subtotal, :precision => 2)                   %></td></tr>