caboose-cms 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c1a38c7958001c122e61895b2f7d359b74bf2f6
-  data.tar.gz: 31caf3a735aa7303f2a8231eea25125268701fe2
+  metadata.gz: 90866b1d7d4c42dfffa6d9e29884127fb63b443f
+  data.tar.gz: 3b9cd1b1a63ffbf4850de31c88d8c88cf023f6a4
 SHA512:
-  metadata.gz: 22d9e3eecde0cca94372615827879641ecf9c26b6e193ae3a6cfcc9bc02a14d17de4fe2ac2ca78d520246a41429b33d3d0b7ff2503465e5200628a32452dba79
-  data.tar.gz: cfcecd2436bd34a232099612a7d406b167d409c0807622b74dadc70552ec8eff4321c5b1cbe1bc9e9d6ef7ba64293b33555eca289a6e890ce965093e48efab7a
+  metadata.gz: 29c983d4718e404ec587a048799863fdfc8463ed8a2e534d128d7dd29ca4c2133cb7138dcaee7dc2f28f365b9226b44065e7029eb83f6251f2bc5c8def98611b
+  data.tar.gz: 82e08132ea2f605dd2aace8b53bd45c2603c666caad8707b1c052cdfef17c07e8c34fcef845ca3bb34427f4c4554c37119ee7778ca14374c6c82c80267b94933

data/app/assets/javascripts/caboose/checkout/checkout_controller.js

@@ -62,10 +62,13 @@ CheckoutController.prototype = {
     that.refresh(function() { that.cart_controller.update_totals(); });
   },
   
-  refresh_cart: function()
+  refresh_cart: function(after)
   {
     var that = this;
-    that.refresh(function() { that.cart_controller.print(); });
+    that.refresh(function() { 
+      that.cart_controller.print();
+      if (after) after();
+    });
   },
       
   refresh: function(after)

data/app/assets/javascripts/caboose/checkout/gift_cards_controller.js

@@ -47,7 +47,9 @@ GiftCardsController.prototype = {
         if (resp.error) $('#gift_card_message').html("<p class='note error'>" + resp.error + "</p>");
         if (resp.success)
         {          
+          that.cc.invoice.total = parseFloat(resp.invoice_total);
           that.cc.refresh_cart();
+          that.cc.payment_method_controller.print();                      
           $('#gift_card_code').val('');
           $('#gift_card_message').empty();
         }

data/app/assets/javascripts/caboose/checkout/stripe_payment_method_controller.js

@@ -44,21 +44,36 @@ StripePaymentMethodController.prototype = {
       return;
     }    
     var msg = that.card_brand && that.card_last4 ? that.card_brand + ' ending in ' + that.card_last4 : 'You have no card on file.';    
-    var div = $('<div/>')
-      .append($('<h3/>').html('Payment Method'))
-      .append($('<p/>')
+    var div = $('<div/>').append($('<h3/>').html('Payment Method'));
+    
+    if (that.cc.invoice.total > 0.00)
+    {
+      var msg = that.card_brand && that.card_last4 ? that.card_brand + ' ending in ' + that.card_last4 : 'You have no card on file.';    
+      div.append($('<p/>')
         .append(msg).append(' ')
-        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
-          e.preventDefault();
-          that.edit();        
-        })
+        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) { e.preventDefault(); that.edit(); })
+      ));
+    }
+    else
+    {          
+      div.append($('<p/>')
+        .append("No payment is required at this time. ")
+        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) { e.preventDefault(); that.edit(); })
       ));      
+    }    
     $('#'+that.container).empty().append(div);    
   },
 
   edit: function()
   {
     var that = this;
+    
+    if (that.cc.invoice.total <= 0.00)
+    {
+      that.print();
+      return;
+    }
+    
     var form = $('<form/>')
       .attr('action', '')
       .attr('method', 'post')
@@ -147,7 +162,8 @@ StripePaymentMethodController.prototype = {
   
   ready: function()
   {
-    var that = this;    
+    var that = this;
+    if (that.cc.invoice.total <= 0.00) return true;
     if (!that.customer_id ) return false;
     if (!that.card_brand  ) return false;
     if (!that.card_last4  ) return false;

data/app/controllers/caboose/page_custom_field_values_controller.rb

@@ -1,7 +1,7 @@
 module Caboose
   class PageCustomFieldValuesController < ApplicationController
                 
-    # PUT /admin/page-custom-field-values/:id
+    # @route PUT /admin/page-custom-field-values/:id
     def admin_update      
       return if !user_is_allowed('pagecustomfieldvalues', 'edit')
       

data/app/controllers/caboose/pages_controller.rb

@@ -537,7 +537,8 @@ module Caboose
       render json: resp
     end
         
-    # @route GET /admin/pages/:field-options
+    # @route_priority 1
+    # @route GET /admin/pages/:field-options    
     # @route GET /admin/pages/:id/:field-options    
     def admin_options
       if !user_is_allowed('pages', 'edit')

data/app/controllers/caboose/products_controller.rb

@@ -250,6 +250,7 @@ module Caboose
     end
     
     # @route GET /admin/products/:id
+    # @route GET /admin/products/:id/general
     def admin_edit_general
       return if !user_is_allowed('products', 'edit')    
       @product = Product.find(params[:id])

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg