caboose-cms 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f13467e0292ffa5dc2b33fb4146f332c90d5d2d7
-  data.tar.gz: df91b598feb3cbc02ef15b850d34341d6f916f88
+  metadata.gz: 6dabc8440a00b08aee9e2ceb2ffb8e6819b158dc
+  data.tar.gz: 5e6b0d5322f4df017c088b0b6d506c4a1b40a61a
 SHA512:
-  metadata.gz: a36c2cbb7516bfb4a3a691a798f98628bbb66462eae11872433dd19238608e8766fff6112875f9508bedeabf319b45b28da76c7c5e028562f4432658bc4557e0
-  data.tar.gz: 3e90010701da42e89a7952b54e42cbe9b44a5bf5356d049cfeedee9c117c18fec989391362906871e9ff18999033207c2f13d400fb5eace2859cca108cbe5165
+  metadata.gz: 1d03c1a05647cbe03f8984007c0ac8825dd2f6b40d4c9ff8819d0207ac6db200450f360ba9ceb0930796a6f62bd8a3b27827b588a1f00e9faadc2e7d97ec78e2
+  data.tar.gz: ef60e51198a90e17a537cdc3381ddb51b3463ec1495faafbd9683a5c7fb48929cc5205d80e29e33879dc70e8a0c1ed80086b86f323ee1922f0eb4b4dc45cc688

data/app/models/caboose/discount.rb

@@ -17,10 +17,10 @@ module Caboose
     def calculate_amount                                
       gc = self.gift_card      
       self.amount = case self.gift_card.card_type
-        when GiftCard::CARD_TYPE_AMOUNT      then (self.order.total >= gc.balance ? gc.balance : self.order.total)
-        when GiftCard::CARD_TYPE_PERCENTAGE  then self.order.subtotal * gc.total
-        when GiftCard::CARD_TYPE_NO_SHIPPING then self.order.shipping
-        when GiftCard::CARD_TYPE_NO_TAX      then self.order.tax
+        when GiftCard::CARD_TYPE_AMOUNT      then (self.invoice.total >= gc.balance ? gc.balance : self.invoice.total)
+        when GiftCard::CARD_TYPE_PERCENTAGE  then self.invoice.subtotal * gc.total
+        when GiftCard::CARD_TYPE_NO_SHIPPING then self.invoice.shipping
+        when GiftCard::CARD_TYPE_NO_TAX      then self.invoice.tax
       end
       self.save
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/tasks/caboose.rake

@@ -15,7 +15,7 @@ namespace :caboose do
       sc.custom_packages_function = order_to_invoices_in_string(sc.custom_packages_function ) if sc.custom_packages_function && sc.custom_packages_function.strip.length > 0       
       sc.custom_shipping_function = order_to_invoices_in_string(sc.custom_shipping_function ) if sc.custom_shipping_function && sc.custom_shipping_function.strip.length > 0
       sc.custom_tax_function      = order_to_invoices_in_string(sc.custom_tax_function      ) if sc.custom_tax_function      && sc.custom_tax_function.strip.length      > 0
-      sc.starting_invoice_number  = sc.starting_order_number if sc.starting_order_number
+      #sc.starting_invoice_number  = sc.starting_order_number if sc.starting_order_number
       sc.save
     end    
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - William Barry
@@ -1277,7 +1277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.