caboose-cms 0.5.106 → 0.5.107

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTlkMjdmZmNhMzA4OTE4MDUwMjBkNTRiMTVlYmM0YWM4MjM1ODBjZg==
+    ODk1ZmViNmZkOGQzMDQ2ODFlMGY4MzQ0NTQ1ZTM2NmMzZWI2ZDA2ZQ==
   data.tar.gz: !binary |-
-    Mzk4N2ViMTVkYTA1ZjBiZmE5OTU1NDY0ODg4NGYyYWZhMGZjOGU0Nw==
+    ZjViYmUwMTUxMjExY2ZjMTM2MTUyZDM5YjIwMTc3NGJjZWZjMzBhOA==
 SHA512:
   metadata.gz: !binary |-
-    OTFkZDM3ZDFmNGNjZTA3MTM1NGJjYzg0YzI2YzNiYTgyZjBhMzIxZTI4MTEz
-    YTM1NWRlYTFmMWRiZDUwMGM0MWU4NTk1NzhkMGM3N2ZhZDZiOGFjMzBkMGNl
-    MzU3MTg5NDc5NjViMzk4YzYzOWMyZmU2NDNlNjdmYTAwY2M2Zjk=
+    ZjRlYjQ2OTVmOTkwM2MxMzgzMzU5YmVhNGJhYTM3ZDMxYWUxMzc3MmJlNjk0
+    MTlmMzUxM2QzNTgxMTA3ZDI5MWEzMzA4MTQyMjU0MzM4ZmQyMGQ3YTcwMDFh
+    MWQ5ZTBjNWU2MDMyNmE5N2IyODFjNmNhMGZiZGQ2NDQ0MjQzMTA=
   data.tar.gz: !binary |-
-    NzI2OWU3MDFiY2ExMzU1ZDVkMjg4YzYyMGMyMTRmZmNjNzYyNmJkOGExODVm
-    OGExMTFlNzJhODVhMWQ1OWYzYmY3OGJhNGE2ZTAyNjNjN2UyMDQ3MTQ1NGZh
-    YjJiMTcyNWQ0MTI1YTA4N2QwNWU5ZDQzODNkMDI3OWQ1YzlkNjA=
+    ODQ3MTc4YWZjMDU1MmViYTc0YmIwNTBkYzM5MTQ5ODcyOWU2OGJlODI4ZGVk
+    M2NkNmJhNzZiYjE5Nzc3MmJhOGNlNDBiODY0MDllOWFiZWM2MWE4N2ZiMDdm
+    YWIwMmUzZGE5MmI2YmM3MDcxZjFmZDA5MDMwODBkYmViZmRiZWI=

data/app/models/caboose/gift_card.rb

@@ -26,6 +26,14 @@ module Caboose
     CARD_TYPE_PERCENTAGE  = 'Percentage'
     CARD_TYPE_NO_SHIPPING = 'No Shipping'
     CARD_TYPE_NO_TAX      = 'No Tax'
+    
+    after_initialize :check_nil_fields
+    
+    def check_nil_fields
+      self.total           = 0.00 if self.total.nil?
+      self.balance         = 0.00 if self.balance.nil?          
+      self.min_order_total = 0.00 if self.min_order_total.nil?  
+    end
 
     def valid_for_order?(order)
       return false if self.status != GiftCard::STATUS_ACTIVE

data/app/models/caboose/line_item.rb

@@ -48,7 +48,12 @@ module Caboose
     #
     
     before_save :update_price
-    after_save { self.order.calculate }
+    after_save { self.order.calculate }    
+    after_initialize :check_nil_fields
+    
+    def check_nil_fields
+      self.price = 0.00 if self.price.nil?        
+    end
     
     #
     # Methods

data/app/models/caboose/order_package.rb

@@ -17,6 +17,12 @@ module Caboose
     STATUS_PENDING = 'Pending'
     STATUS_SHIPPED = 'Shipped'
     
+    after_initialize :check_nil_fields
+    
+    def check_nil_fields      
+      self.total = 0.00 if self.total.nil?
+    end
+    
     def self.custom_order_packages(store_config, order)          
       eval(store_config.order_packages_function)    
     end

data/app/models/caboose/order_transaction.rb

@@ -19,6 +19,12 @@ module Caboose
     TYPE_VOID      = 'void'
     TYPE_REFUND    = 'refund'
     
+    after_initialize :check_nil_fields
+    
+    def check_nil_fields
+      self.amount = 0.00 if self.amount.nil?        
+    end
+    
   end
 end
    

data/app/models/caboose/variant.rb

@@ -39,6 +39,13 @@ module Caboose
       :cylinder,
       :shipping_unit_value
     
+    after_initialize :check_nil_fields
+    
+    def check_nil_fields
+      self.price       = 0.00 if self.price.nil?
+      self.sale_price  = 0.00 if self.sale_price.nil?                  
+    end
+    
     #
     # Class Methods
     #

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.106'
+  VERSION = '0.5.107'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.106
+  version: 0.5.107
 platform: ruby
 authors:
 - William Barry
@@ -544,7 +544,6 @@ files:
 - app/helpers/caboose/products_helper.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
-- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb

data/app/models/caboose/#Untitled-1#

@@ -1,32 +0,0 @@
-
-      Caboose::Discount => [
-        [ :amount       , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }]        
-      ],
-      Caboose::GiftCard => [
-        [ :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 }],        
-      ],      
-      Caboose::LineItem => [        
-        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-      ],
-      Caboose::OrderTransaction => [
-        [ :amount                , :decimal   , { :precision => 8, :scale => 2, :default => 0 }],        
-      ],
-      Caboose::OrderPackage => [
-        [ :total                , :decimal , { :default => 0.0 }]
-      ],
-      Caboose::Order => [
-        [ :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 }],
-        [ :auth_amount           , :decimal  , { :precision => 8, :scale => 2 }]
-      ],      
-      Caboose::Variant => [
-        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :sale_price            , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-      ],