caboose-cms 0.5.98 → 0.5.99

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmFmYWY5ZTU4MmZiNzU5M2M2NTc2NmU2ZDZiZWEwZmRhNmFiMWMzNQ==
+    ZWZiNWY5N2FmMjRmZjJkZjRiYmEwNThhMDgyZjVhYzBiZGY0YjllOQ==
   data.tar.gz: !binary |-
-    Yzc3M2VmMmQyNGE5YmNhMWQ0YWM1M2UxYTgwODU0ZTAwNzRiYTAyMw==
+    NzRmNTI1NzMzNjY1OGRlZDRlZTQ1N2I5NzRjYTkyYWZmNTYyYTM5Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZWI0ZTdiY2EwZTZiMTgxYjAxODhiNjU2N2U5NTZkODM2OWZlNTYwNjUxMjJk
-    NTA4YzJjMzZiNjE4MTNlYzYxODQxZGNhNTk2NDA4YWZiN2U4ZjUwZDYxYWQ5
-    ODU1NDYyMjA3ODcyMjg5ZDcwNjkxZmUxYjVhZWYxN2RiYjNmYTY=
+    YmZkOTAzMDhhYzEzZGI3ZGRlMGI0MDc5Zjk4MWY3YWY4ZDg3OTJjMTc2NDIy
+    Mzk3MDI2ZDI2ODdkZTVkZjM0N2FjNzNmYjAxYzBmYTJjNmVmMGZmYjBkOWM2
+    NmQ4OWIxMDk1MjYxNzUwMDllNjY1MDJmZTE1OGFmZDQ3N2U3MTY=
   data.tar.gz: !binary |-
-    OGU0ZTVlMTJhZWZiZGQxZjBiYTNkOTQ4NzI0Zjk5ZDIyNWU4NzA2M2I4OTQ3
-    ODk1Y2Y5NmNkYTZiYmE1ZGYzZDU2NGZkNDZjOGFjYTE1NTBjMzcxY2ZjNGM3
-    MzYxYjY1NzllOTZmMDhlMjM2YTYyZmUwYjA1MTQ2M2EzOTc4ZDQ=
+    NzZmMTI4NWE4YTc5OGZiNzJmOGMxMTE1ODk3MjQzNTQ1OWRmMzc2MjZmYWNm
+    OGIwMmQ5OGM1NmZhODg0MGMxNWQwOGNmZDhlODk3MjcxODE2NDI2MzA2ZGFl
+    MDc2OTZiYjFiZTY1ZmFjNGJkYzcyYjY1MjRlODk2YzQ1MmE0ZjE=

data/app/controllers/caboose/application_controller.rb

@@ -63,9 +63,8 @@ module Caboose
         create_new_order = true                         
       end
 
-      if create_new_order # Create an order to associate with the session
-        Caboose.log(@order)
-        @order = Caboose::Order.new
+      if create_new_order # Create an order to associate with the session        
+        @order = Caboose::Order.new        
         @order.site_id          = @site ? @site.id : nil
         @order.status           = Caboose::Order::STATUS_CART
         @order.financial_status = Caboose::Order::STATUS_PENDING

data/app/models/caboose/order.rb

@@ -9,10 +9,10 @@ module Caboose
 
     belongs_to :site    
     belongs_to :customer, :class_name => 'Caboose::User'
-    belongs_to :shipping_address, :class_name => 'Address'
-    belongs_to :billing_address, :class_name => 'Address'
+    belongs_to :shipping_address, :class_name => 'Caboose::Address'
+    belongs_to :billing_address, :class_name => 'Caboose::Address'
     has_many :discounts    
-    has_many :line_items, :after_add => :line_item_added, :after_remove => :line_item_removed, :order => :id
+    has_many :line_items, :order => :id
     has_many :order_packages, :class_name => 'Caboose::OrderPackage'
     has_many :order_transactions
     
@@ -156,13 +156,13 @@ module Caboose
       PaymentProcessor.void(self)
     end
     
-    def line_item_added(line_item)
-      self.calculate
-    end
-    
-    def line_item_removed(line_item)
-      self.calculate
-    end
+    #def line_item_added(line_item)
+    #  self.calculate
+    #end
+    #
+    #def line_item_removed(line_item)
+    #  self.calculate
+    #end
     
     def calculate
       self.update_column(:subtotal , self.calculate_subtotal )

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.98'
+  VERSION = '0.5.99'
 end

metadata

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