caboose-cms 0.5.104 → 0.5.105

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc4MzdjM2Q1ZDYwZmFmODU1ODNjZDkzMGQ0MGNhMTBjOTE4N2VkMQ==
+    MWE5ZDkzMzI3NTZkNGQ3ZGIwYjJmOGQzM2ZjYTE4Y2QxMTdhMTk2ZQ==
   data.tar.gz: !binary |-
-    OTE2MzIwNTY0ZGE4ODE2ZWJlOGFiMTg3OGU3MzBmMGE3MzJhMGU3Nw==
+    ODQ3Y2NmZDA1NWE1Y2UxOTg2Zjg5NjZmMWM5NDdmNTBhZWZiZTFhZA==
 SHA512:
   metadata.gz: !binary |-
-    YjMwYTFiNmJhMzY0YWJiNmYzMjJiNTI3ZDUwMGZiNTczNDE5YWUyMzE1Y2Qy
-    MmMwN2NmZjc3YzlkNWZkZGMxMDI1NjAyMzIwNzk4NDZmY2ZlNzU0ZWFmOTU3
-    NTFhMTY5N2MwYWNmMGI1NjU4NWFhMjhhNjFjN2ZlMTg2MzQ4N2E=
+    NTAxMTA5NzkyYjY5ZTZjZWUzNWY0MDhjYTU3ZGFlMzQzODg0ZDdjMWZlMDdk
+    N2VlY2FjOGUxODA4NjM1ZmMyMmExYTZlMTQwYTgyMTQzMDgwMTFjOGI3NzMy
+    ZjE1YWI5YzllZTUzZWMxYWQ2ZjgyNDhmNGU1ZjlhNjE5ZTk1Zjk=
   data.tar.gz: !binary |-
-    MzlhZjhmNjBiZmJkMGI2MzYwYzUzNDY5NDYzOThkODM3ZjMwZTk2NTM4Njdk
-    NzNlMTFmNTdjNWFkNzljZTg1NzhkODVkNmM3ZTkzODJkNmJiN2JiMTdlNTJj
-    MjI4MGViOWQ1OTVmNWJjYjFhY2E2MjhiZDI4ZmM3MmE5ZGFjNDk=
+    M2Y5YjhkMzg5MzEwOGFhN2I1ZTllN2VjMjNmM2QzZTMxZmVkMjI4NDc4YTkz
+    YTZlYjRjM2MwZTE1Zjg4ZTUzNzI3ZGFiZTM3M2JmNzdkNGIwY2Q1ZGE1NjZm
+    OWI0YTE4ODMxOWIzNDNhNTA2OTYxYzczMTMxNDkyNDM4OGRlMjI=

data/app/models/caboose/order.rb

@@ -7,209 +7,191 @@ 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
-    
-    #attr_accessible :id,
-    #  :site_id,
-    #  :alternate_id,      
-    #  :subtotal,
-    #  :tax,            
-    #  :shipping,
-    #  :handling,
-    #  :custom_discount,
-    #  :discount,      
-    #  :total,
-    #  :customer_id,      
-    #  :shipping_address_id,
-    #  :billing_address_id,
-    #  :status,      
-    #  :financial_status,
-    #  :referring_site,
-    #  :landing_page,
-    #  :landing_page_ref,                        
-    #  :auth_amount,
-    #  :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'    
-    #STATUS_CANCELED  = 'canceled'
-    #STATUS_SHIPPED   = 'shipped'
-    #STATUS_TESTING   = 'testing'
+    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,
+      :alternate_id,      
+      :subtotal,
+      :tax,            
+      :shipping,
+      :handling,
+      :custom_discount,
+      :discount,      
+      :total,
+      :customer_id,      
+      :shipping_address_id,
+      :billing_address_id,
+      :status,      
+      :financial_status,
+      :referring_site,
+      :landing_page,
+      :landing_page_ref,                        
+      :auth_amount,
+      :date_created,
+      :notes
+          
+    STATUS_CART      = 'cart'
+    STATUS_PENDING   = 'pending'    
+    STATUS_CANCELED  = 'canceled'
+    STATUS_SHIPPED   = 'shipped'
+    STATUS_TESTING   = 'testing'
     
     #
     # 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'"
+    }
+    
+    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
-    #
-    #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 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 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
+    
+    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 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

@@ -257,7 +257,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Discount => [
         [ :gift_card_id , :integer  ],
         [ :order_id     , :integer  ],                
-        [ :amount       , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }]        
+        [ :amount       , :decimal   , { :precision => 8, :scale => 2 }]        
       ],
       Caboose::Domain => [
         [ :site_id            , :integer ],
@@ -270,9 +270,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name            , :string   ],
         [ :code            , :string   ],
         [ :card_type       , :string   ],
-        [ :total           , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :balance         , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :min_order_total , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],        
+        [ :total           , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :balance         , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :min_order_total , :decimal   , { :precision => 8, :scale => 2 }],        
         [ :date_available  , :datetime ],
         [ :date_expires    , :datetime ],
         [ :status          , :string   ]                                
@@ -285,7 +285,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :quantity              , :integer   , :default => 0 ],
         [ :status                , :string   ],
         [ :tracking_number       , :string   ],        
-        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :price                 , :decimal   , { :precision => 8, :scale => 2 }],
         [ :notes                 , :text     ],
         [ :custom1               , :string   ],
         [ :custom2               , :string   ],
@@ -312,7 +312,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :order_id              , :integer  ],
         [ :date_processed        , :datetime ],
         [ :transaction_type      , :string   ],
-        [ :amount                , :decimal   , { :precision => 8, :scale => 2, :default => 0 }],        
+        [ :amount                , :decimal   , { :precision => 8, :scale => 2 }],        
         [ :transaction_id        , :string   ],
         [ :auth_code             , :string   ],
         [ :response_code         , :string   ],
@@ -328,18 +328,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :shipping_package_id  , :integer ],
         [ :status               , :string  ],
         [ :tracking_number      , :string  ],
-        [ :total                , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }]
+        [ :total                , :decimal  , { :precision => 8, :scale => 2 }]
       ],
       Caboose::Order => [
         [ :site_id               , :integer  ],
         [ :alternate_id          , :integer  ],        
-        [ :subtotal              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :tax                   , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :shipping              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :handling              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :custom_discount       , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :discount              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :total                 , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :subtotal              , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :tax                   , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :shipping              , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :handling              , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :custom_discount       , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :discount              , :decimal  , { :precision => 8, :scale => 2 }],
+        [ :total                 , :decimal  , { :precision => 8, :scale => 2 }],
         [ :customer_id           , :integer  ],
         [ :financial_status      , :string   ],
         [ :shipping_address_id   , :integer  ],
@@ -644,8 +644,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :alternate_id          , :string   ],
         [ :sku                   , :string   ],
         [ :barcode               , :string   ],
-        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :sale_price            , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :price                 , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :sale_price            , :decimal   , { :precision => 8, :scale => 2 }],
         [ :date_sale_starts      , :datetime ],
         [ :date_sale_end         , :datetime ],
         [ :available             , :boolean  ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.104'
+  VERSION = '0.5.105'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.104
+  version: 0.5.105
 platform: ruby
 authors:
 - William Barry
@@ -650,9 +650,8 @@ files:
 - app/views/caboose/block_types/admin_edit_icon.html.erb
 - app/views/caboose/block_types/admin_index.html.erb
 - app/views/caboose/block_types/admin_new.html.erb
-- app/views/caboose/blocks/#Untitled-2#
-- app/views/caboose/blocks/#_checkbox.html.erb#
 - app/views/caboose/blocks/_block.html.erb
+- app/views/caboose/blocks/_checkbox.html.erb
 - app/views/caboose/blocks/_controller_view_content.html.erb
 - app/views/caboose/blocks/_file.html.erb
 - app/views/caboose/blocks/_heading.html.erb

data/app/views/caboose/blocks/#_checkbox.html.erb#

@@ -1,10 +0,0 @@
-<%
-checked = block.value
-checked = 0 if checked.nil?
-checked = checked == 1 || checked == '1' ? true : false
-%>
-<% if editing %>
-  <div id='block_<%= block.id %>'><%= raw block.block_type.description %> = <%= (checked ? "Yes" : "No") %></div>
-<% else %>
-  <%= raw block.block_type.description %>
-<% end %>