caboose-cms 0.5.101 → 0.5.102

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQ4MDQ1NGJjOTgwZTViMTFjZDVjZDAwZTc0N2JiOGQzZDViOWRlYQ==
+    NjMwOWVjNTVlNmZlYWIwMzBjZDdhZTk3MzE3YTA2MGRlZjVmMTAzNg==
   data.tar.gz: !binary |-
-    MzhhZmEzYTgzOWFhNWI3MGUwMDczZjczZWRjZjdiYzM2YzQwNjdhZQ==
+    NjIzYmNiNDhjNjc0ZDc1MjdmMDg0MzcyMzlkZmM3MWI2MDFhYWU2YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjY5NDhlOWFhOTIzYzcyZmEwNTYzZWMxN2QwY2E2NWE4NzNjOTA5MzU0MTRl
-    ZDE1N2I0Yzk4MjRmMGRhNjBiN2MyYzIyYzQ4NWEzY2RlODdkNzU4NmY1ZDQy
-    YzAzYTEyN2RjZWM1OGUzYjA0MWY1NjgzZDFlNDkxYjVhYzNmYjI=
+    OWFjYWVlODY5Y2YxNTdmNzU5ZmVmMTQ3YTk3MGUyMDg2YzU0NDYwOWJiYWRm
+    NDY5YzI0ODA0NzNkOTA0NzFhY2VhZjU4YTJjZWQ0YTFlYzQ0MmRkYTkyZjgy
+    NGNjMzE0NzBmMWI3ZTFlNDQxYWFmOTAwZTIyMTI4N2RjZjQ0ZWY=
   data.tar.gz: !binary |-
-    M2MxYzY5YzY1YjA2MGY4OWNhOTFkOTVlMWNhMzAwY2I3YWVmNDU2NzZiZDFk
-    OGViMjdjN2Q0MGFiNmNjODAxMGIzNjQ1MTI3YmM2NDM2MmVhNThmNTdmNmE1
-    ODgxMWNhODUzOWMzMmYyNWExNzFmNTk3ZjViMzE3MTgyODExNzE=
+    MjgxNzc3ODllY2E4NzY2NzE3ZGNmOTQ1NjAxYmVjOGM0MzU3NmJhYmM5MjZl
+    OGNhNWZjYjRiNDM2ZWY3MmIxYzIzYzQzZDQzZjllNjA1NzQyYzYyZWI0NTM0
+    YTAyYmMyZDE0NTA5MTg4OWMzYzk3M2EzZmE5ZjM0NDM3ZjVmODY=

data/app/models/caboose/order.rb

@@ -7,14 +7,14 @@ module Caboose
     self.table_name  = 'store_orders'
     self.primary_key = 'id'
 
-    belongs_to :site    
-    belongs_to :customer, :class_name => 'Caboose::User'
-    belongs_to :shipping_address, :class_name => 'Caboose::Address'
-    belongs_to :billing_address, :class_name => 'Caboose::Address'
-    has_many :discounts    
-    has_many :line_items, :order => :id
-    has_many :order_packages, :class_name => 'Caboose::OrderPackage'
-    has_many :order_transactions
+    #belongs_to :site    
+    #belongs_to :customer, :class_name => 'Caboose::User'
+    #belongs_to :shipping_address, :class_name => 'Caboose::Address'
+    #belongs_to :billing_address, :class_name => 'Caboose::Address'
+    #has_many :discounts    
+    #has_many :line_items, :order => :id
+    #has_many :order_packages, :class_name => 'Caboose::OrderPackage'
+    #has_many :order_transactions
     
     attr_accessible :id,
       :site_id,
@@ -66,176 +66,151 @@ module Caboose
     # Scopes
     #
     
-    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')
-    scope :voided     , where('financial_status = ?', 'voided')        
+    #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')
+    #scope :voided     , where('financial_status = ?', 'voided')        
     
     #
     # Validations
     #
     
-    validates :status, :inclusion => {
-      :in      => ['cart', 'pending', 'cancelled', 'shipped', 'testing'],
-      :message => "%{value} is not a valid status. Must be either 'pending' or 'shipped'"
-    }
-    
-    validates :financial_status, :inclusion => {
-      :in      => ['pending', 'authorized', 'captured', 'refunded', 'voided'],
-      :message => "%{value} is not a valid financial status. Must be 'authorized', 'captured', 'refunded' or 'voided'"
-    }
-    
+    #validates :status, :inclusion => {
+    #  :in      => ['cart', 'pending', 'cancelled', 'shipped', 'testing'],
+    #  :message => "%{value} is not a valid status. Must be either 'pending' or 'shipped'"
+    #}
     #
-    # Callbacks
+    #validates :financial_status, :inclusion => {
+    #  :in      => ['pending', 'authorized', 'captured', 'refunded', 'voided'],
+    #  :message => "%{value} is not a valid financial status. Must be 'authorized', 'captured', 'refunded' or 'voided'"
+    #}
+        
+    #def packages
+    #  self.order_packages
+    #end
+    #       
+    #def decrement_quantities
+    #  return false if self.decremented
+    #  
+    #  self.line_items.each do |line_item|
+    #    line_item.variant.update_attribute(:quantity, line_item.variant.quantity_in_stock - line_item.quantity)
+    #  end
+    #  
+    #  self.update_attribute(:decremented, true)
+    #end
     #
-    
-    #after_update :calculate
-    
+    #def increment_quantities
+    #  return false if !self.decremented
+    #  
+    #  self.line_items.each do |line_item|
+    #    line_item.variant.update_attribute(:quantity, line_item.variant.quantity_in_stock - line_item.quantity)
+    #  end
+    #  
+    #  self.update_attribute(:decremented, false)
+    #end
     #
-    # Methods
+    #def resend_confirmation
+    #  OrdersMailer.configure_for_site(self.site_id).customer_new_order(self).deliver
+    #end
     #
-    
-    def packages
-      self.order_packages
-    end
-    
-    #def as_json(options={})
-    #  self.attributes.merge({
-    #    :line_items => self.line_items,
-    #    :shipping_address => self.shipping_address,
-    #    :billing_address => self.billing_address
-    #  })
+    #def test?
+    #  self.status == 'testing'
     #end
-    
-    def decrement_quantities
-      return false if self.decremented
-      
-      self.line_items.each do |line_item|
-        line_item.variant.update_attribute(:quantity, line_item.variant.quantity_in_stock - line_item.quantity)
-      end
-      
-      self.update_attribute(:decremented, true)
-    end
-    
-    def increment_quantities
-      return false if !self.decremented
-      
-      self.line_items.each do |line_item|
-        line_item.variant.update_attribute(:quantity, line_item.variant.quantity_in_stock - line_item.quantity)
-      end
-      
-      self.update_attribute(:decremented, false)
-    end
-    
-    def resend_confirmation
-      OrdersMailer.configure_for_site(self.site_id).customer_new_order(self).deliver
-    end
-    
-    def test?
-      self.status == 'testing'
-    end
-    
-    def authorized?
-      self.financial_status == 'authorized'
-    end
-    
-    def capture
-      PaymentProcessor.capture(self)
-    end
-    
-    def refuned
-      PaymentProcessor.refund(self)
-    end
-    
-    def void
-      PaymentProcessor.void(self)
-    end
-    
-    #def line_item_added(line_item)
-    #  self.calculate
+    #
+    #def authorized?
+    #  self.financial_status == 'authorized'
     #end
     #
-    #def line_item_removed(line_item)
-    #  self.calculate
+    #def capture
+    #  PaymentProcessor.capture(self)
+    #end
+    #
+    #def refuned
+    #  PaymentProcessor.refund(self)
+    #end
+    #
+    #def void
+    #  PaymentProcessor.void(self)
+    #end
+    #
+    #def calculate
+    #  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.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.0 if !self.shipping_address
+    #  self.subtotal * TaxCalculator.tax_rate(self.shipping_address)
+    #end
+    #
+    #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.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
+    #  return (self.subtotal + self.tax + self.shipping + self.handling) - self.discount
+    #end
+    #
+    #def shipping_and_handling
+    #  (self.shipping ? self.shipping : 0.0) + (self.handling ? self.handling : 0.0)      
+    #end
+    #
+    #def item_count
+    #  count = 0
+    #  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
+    #
+    #def has_empty_shipping_methods?
+    #  return true if self.order_packages.nil?
+    #  return true if self.order_packages.count == 0
+    #  self.order_packages.each do |op|
+    #    return true if op.shipping_method_id.nil?
+    #  end
+    #  return false
     #end
     
-    def calculate
-      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.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.0 if !self.shipping_address
-      self.subtotal * TaxCalculator.tax_rate(self.shipping_address)
-    end
-    
-    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.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
-      return (self.subtotal + self.tax + self.shipping + self.handling) - self.discount
-    end
-    
-    def shipping_and_handling
-      (self.shipping ? self.shipping : 0.0) + (self.handling ? self.handling : 0.0)      
-    end
-    
-    def item_count
-      count = 0
-      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
-    
-    def has_empty_shipping_methods?
-      return true if self.order_packages.nil?
-      return true if self.order_packages.count == 0
-      self.order_packages.each do |op|
-        return true if op.shipping_method_id.nil?
-      end
-      return false
-    end
   end
 end
 

data/app/models/caboose/schema.rb

@@ -313,13 +313,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Order => [
         [ :site_id               , :integer  ],
         [ :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 ],
+        [ :subtotal              , :numeric   , :default => 0.00 ],
+        [ :tax                   , :numeric   , :default => 0.00 ],
+        [ :shipping              , :numeric   , :default => 0.00 ],
+        [ :handling              , :numeric   , :default => 0.00 ],
+        [ :custom_discount       , :numeric   , :default => 0.00 ],
+        [ :discount              , :numeric   , :default => 0.00 ],
+        [ :total                 , :numeric   , :default => 0.00 ],
         [ :customer_id           , :integer  ],
         [ :financial_status      , :string   ],
         [ :shipping_address_id   , :integer  ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.101'
+  VERSION = '0.5.102'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.101
+  version: 0.5.102
 platform: ruby
 authors:
 - William Barry