caboose-cms 0.5.130 → 0.5.131

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWEzYzcwNzIxOGRiMmZkZjJhYzg3Y2I2YjQ5NDkwOWE3N2RmNTA5OA==
+    ZjNiOTM0OWM1OWM3N2NjYTFhMTE2Zjc3NTM2ZGIwYzJlYmNlMDhmNg==
   data.tar.gz: !binary |-
-    YWVmNzkyNGQ2OWZmZTY4ZGViYTFlMWFmOTcyMzE2NWEyZDE3OWQyMw==
+    OTU1YjI5YTBkZGQ2NGNhZjhiOWQ2ZGM2MThmNjMzNjZmZTBlNjRiOQ==
 SHA512:
   metadata.gz: !binary |-
-    NDBmZWIxYWIyODY5OTExMDMzNjA1OWQ3OWNhNzU4MDQ2ZTI3MzRhMzA3NWU4
-    ZTA4OTY0ODIyMTA2ZWViYmY4OWFhOTc1NzE2ZTU0ZmE1NjU1YTA0OTAwYjBk
-    NjA2YzEyMzM2Mzg1MWU3Y2NiNDllNjZlOGY3MDc5YThiY2MzYTQ=
+    ZjM2N2YzZGU1Nzk5N2RkMGI4Mzc3MzNhNDY4NWYzN2I5NzlkMDViNWFjZGQ3
+    N2RhYTAzNTM5ZjM3NjZlNDg0MDVjODdkZTgzYWFjMzE5MjgyYThjMTFiNDRi
+    MjIzODBkZjM1YzVmZTY0YjNmMjBiNTJmYzBlNmJmZDQ5MjQwMjY=
   data.tar.gz: !binary |-
-    NTgxMzE2YWQ4NjA4MmM4OWJkYjlmMzM1NDE5NTBlYjkyYzBhNTE0NmJjNjdi
-    MDI3NDNjYWZiODBhZjQxYzgwYWU5ZmIzMzgzMmZmNDhiNjNhMzdjZDBiZTI5
-    YWMzMjdjMWYyZjUwOWMwMWNiMjY1MmVhMjg5OTc4YTFmYTU4MDM=
+    Yzg2NmMwOTI2MTFiYmZjMjdhNWRhZDcwMzNmYjk3YmMxYzhkYjJjYjI3MzY3
+    NTFkNmZhMmY5Mzk4MGY3NTIzMDcyOGJlZWQ1YzJmOGMyZTlkNTYyZjk3Yzlk
+    OTUwYjcxYmZhMmVkMjE1MjE3NDAwODdhNjU2YmY4NjBhZjljYzM=

data/app/assets/javascripts/caboose/cart.js

@@ -101,12 +101,12 @@ Cart.prototype = {
             
         tbody.append($('<tr/>')        
           .append(gctd)
-          .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(d.amount).toFixed(2)))
+          .append($('<td/>').css('text-align', 'right').html('-$' + parseFloat(d.amount).toFixed(2)))
         );          
       });
       if (that.order.custom_discount && that.order.custom_discount > 0)
       {
-        tbody.append($('<tr/>')        
+        tbody.append($('<tr/>')
           .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Discount'))
           .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.custom_discount).toFixed(2)))
         );

data/app/controllers/caboose/cart_controller.rb

@@ -86,7 +86,7 @@ module Caboose
       resp = StdClass.new
       code = params[:code].strip
       gc = GiftCard.where("lower(code) = ?", code.downcase).first
-      
+                  
       if gc.nil? then resp.error = "Invalid gift card code."                    
       elsif gc.status != GiftCard::STATUS_ACTIVE                                then resp.error = "That gift card is not active."
       elsif gc.date_available && DateTime.now.utc < self.date_available         then resp.error = "That gift card is not active yet."         
@@ -96,9 +96,9 @@ module Caboose
       elsif Discount.where(:order_id => @order.id, :gift_card_id => gc.id).exists? then resp.error = "That gift card has already been applied to this order."
       else
         # Determine how much the discount will be
-        d = Discount.new(:order_id => @order.id, :gift_card_id => gc.id, :amount => 0.0)
+        d = Discount.new(:order_id => @order.id, :gift_card_id => gc.id, :amount => 0.0)        
         case gc.card_type
-          when GiftCard::CARD_TYPE_AMOUNT      then d.amount = (@order.total > gc.balance ? gc.balance : @order.total)
+          when GiftCard::CARD_TYPE_AMOUNT      then d.amount = (@order.total >= gc.balance ? gc.balance : @order.total)
           when GiftCard::CARD_TYPE_PERCENTAGE  then d.amount = @order.subtotal * gc.total
           when GiftCard::CARD_TYPE_NO_SHIPPING then d.amount = @order.shipping
           when GiftCard::CARD_TYPE_NO_TAX      then d.amount = @order.tax

data/app/models/caboose/discount.rb

@@ -8,7 +8,11 @@ module Caboose
     attr_accessible :id,
       :gift_card_id,
       :order_id,
-      :amount      
+      :amount
+
+    after_find do |d|
+      d.amount = 0.00 if d.amount.nil?                        
+    end
       
   end
 end

data/app/models/caboose/order.rb

@@ -46,6 +46,7 @@ module Caboose
     STATUS_SHIPPED       = 'shipped'    
     STATUS_TESTING       = 'testing'
 
+    FINANCIAL_STATUS_PENDING    = 'pending'
     FINANCIAL_STATUS_AUTHORIZED = 'authorized'
     FINANCIAL_STATUS_CAPTURED   = 'captured'
     FINANCIAL_STATUS_REFUNDED   = 'refunded'

data/app/models/caboose/schema.rb

@@ -54,6 +54,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :repeat_start  , 
         :repeat_end        
       ],
+      #Caboose::Discount => [
+      #  :amount
+      #],
       Caboose::Order => [
         :shipping_method       , 
         :shipping_method_code  ,

data/app/models/caboose/variant.rb

@@ -39,11 +39,9 @@ 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?                  
+    after_initialize do |v|
+      v.price       = 0.00 if v.price.nil?
+      v.sale_price  = 0.00 if v.sale_price.nil?                  
     end
     
     #

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.130'
+  VERSION = '0.5.131'
 end

metadata

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