caboose-cms 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9634c46690b5c4bc5137344dfd466e183bc620
-  data.tar.gz: fddf702fa8d24cf49dbdadd308aef2e060944dc9
+  metadata.gz: 9c1a38c7958001c122e61895b2f7d359b74bf2f6
+  data.tar.gz: 31caf3a735aa7303f2a8231eea25125268701fe2
 SHA512:
-  metadata.gz: 64d087ac2a8fb52977dc2ed22c1aeab5393140f239e9792c74699eb5f8a740d853c3b43627bd50e0c1bd3ecf0f71966fb966b3e5ac7e8de2144f6fa2b757e65a
-  data.tar.gz: 5557ee652c97763cfbd1711519cf4dad40a1eeb0f98d7cc26d6c264c77cfe001e50e4548dd27da31ab861952ce4a0dda34139be7565f2e6ebac31f1c7708adbf
+  metadata.gz: 22d9e3eecde0cca94372615827879641ecf9c26b6e193ae3a6cfcc9bc02a14d17de4fe2ac2ca78d520246a41429b33d3d0b7ff2503465e5200628a32452dba79
+  data.tar.gz: cfcecd2436bd34a232099612a7d406b167d409c0807622b74dadc70552ec8eff4321c5b1cbe1bc9e9d6ef7ba64293b33555eca289a6e890ce965093e48efab7a

data/app/models/caboose/invoice.rb

@@ -160,11 +160,14 @@ module Caboose
       self.update_column(:gift_wrap , self.calculate_gift_wrap )
       
       # Calculate the total without the discounts first       
-      self.discounts.each{ |d| d.update_column(:amount, 0.0) } if self.discounts      
+      self.discounts.each{ |d| d.update_column(:amount, 0.0) } if self.discounts
+      self.update_column(:discount  , 0.00)
       self.update_column(:total     , self.calculate_total     )
-      
+            
+      # Now calculate the discounts and re-calculate the total
       self.update_column(:discount  , self.calculate_discount  )
       self.update_column(:total     , self.calculate_total     )      
+      
       self.update_column(:cost      , self.calculate_cost      )
       self.update_column(:profit    , self.calculate_profit    )              
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.10'
+  VERSION = '0.8.11'
 end

metadata

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