caboose-cms 0.9.29 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 283e17b034bdd0cb3bc0a343d592141a4febd4aa
-  data.tar.gz: bfb91798884a5bfbab943eca89738fb9083979b3
+  metadata.gz: eb82d8896301aa81a5dd5c31515e674a8d94ca3e
+  data.tar.gz: a99eeebf6c56d93dc437fd3ec6126e57f8ea360d
 SHA512:
-  metadata.gz: 1f2a734ff80bbab2afc20c1c6982ccfc66b42491cab113ecbf1f211f951e802dc575bec807fce8c45ec8b9d544947ef60b12aa4d7e478b71bc47e660ca7f1a41
-  data.tar.gz: 4516a5ecdefbf9567ee9d3f1ac5f278d8e10f3fb4170e4586514d63abe3236f1911c64991b41ea7a231cf07b716dac003df151cf16cac4e8f37fce933e6827e1
+  metadata.gz: 91bfbab79102337d1f8faa9e7ddd389d27a88a4e0e0286c41a196976d8deea9bcb42d29c335a1c6897839cecc367c873de0d6de8a90264c5b7275f7614e63ac9
+  data.tar.gz: 409be109f1ab404760d03222a93b180e97c099d878604cd508d310e9419b1428eb04d90aa2317e2d9f89656d628882f78fffb96fb778c6306ca4bf28c1269a1e

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

@@ -81,7 +81,7 @@ CheckoutController.prototype = {
       success: function(resp) {
         that.invoice = resp;        
         $.each(that.invoice.invoice_packages, function(i, op) {
-          that.invoice.invoice_packages[i].shipping_method_controller = new ShippingMethodController({ cc: that, invoice_package_id: op.id });
+          that.invoice.invoice_packages[i].shipping_method_controller = new ShippingMethodController({ cc: that, invoice_package_id: op.id, package_number: i });
         });                
         if (!that.invoice.shipping_address) that.invoice.shipping_address = that.empty_address();
         //if (!that.invoice.billing_address)  that.invoice.billing_address  = that.empty_address();
@@ -188,31 +188,35 @@ CheckoutController.prototype = {
   
   print_ready_message: function()
   {
-    var that = this;
-    var ready = true;
-    if (!that.shipping_address_controller.ready()) ready = false;            
-    if (that.invoice.payment_terms == 'pia' && !that.payment_method_controller.ready()) ready = false;
+    var that = this;    
+    var msg = that.shipping_address_controller.ready_error();
+    if (!msg && that.invoice.payment_terms == 'pia') msg = that.payment_method_controller.ready_error()        
+    $.each(that.invoice.invoice_packages, function(i, op) {
+      if (!msg) msg = that.invoice.invoice_packages[i].shipping_method_controller.ready_error();        
+    });
 
-    if (ready)
+    if (msg)
     {
-      $('#message').empty().append($('<p/>').append($('<input/>').attr('type', 'button').val('Continue to Confirmation').click(function(e) {
-        that.print(true);          
-      })));
+      $('#message').empty().append($('<p/>').addClass('note warning').append(msg));
     }
     else
     {
-      $('#message').empty().append($('<p/>').addClass('note warning').append("Please complete all the fields."));
+      $('#message').empty().append($('<p/>').append($('<input/>').attr('type', 'button').val('Continue to Confirmation').click(function(e) {
+        that.print(true);          
+      })));
     }
   },
   
   print_confirm_message: function()
   {
     var that = this;
-    var ready = true;
-    if (!that.shipping_address_controller.ready()) ready = false;            
-    if (that.invoice.payment_terms == 'pia' && !that.payment_method_controller.ready()) ready = false;
-
-    if (!ready)
+    var msg = that.shipping_address_controller.ready_error();
+    if (!msg && that.invoice.payment_terms == 'pia') msg = that.payment_method_controller.ready_error();
+    $.each(that.invoice.invoice_packages, function(i, op) {
+      if (!msg) msg = that.invoice.invoice_packages[i].shipping_method_controller.ready_error();        
+    });
+    
+    if (msg)
     {
       that.refresh_and_print();      
       return;

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

@@ -83,33 +83,34 @@ ShippingAddressController.prototype = {
       update_url: '/checkout/shipping-address',
       authenticity_token: that.cc.authenticity_token,
       attributes: [                                                                                                  
-        { name: 'first_name'  , wrapper_class: 'first_name' , nice_name: 'First Name'  , type: 'text'     , value: sa.first_name , width:  '50%' , fixed_placeholder: false }, 
-        { name: 'last_name'   , wrapper_class: 'last_name'  , nice_name: 'Last Name'   , type: 'text'     , value: sa.last_name  , width:  '50%' , fixed_placeholder: false }, 
-        { name: 'company'     , wrapper_class: 'company'    , nice_name: 'Company'     , type: 'text'     , value: sa.company    , width: '100%' , fixed_placeholder: false }, 
-        { name: 'address1'    , wrapper_class: 'address1'   , nice_name: 'Address 1'   , type: 'text'     , value: sa.address1   , width: '100%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function()  { if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }}, 
-        { name: 'address2'    , wrapper_class: 'address2'   , nice_name: 'Address 2'   , type: 'text'     , value: sa.address2   , width: '100%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function()  { if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }}, 
-        { name: 'city'        , wrapper_class: 'city'       , nice_name: 'City'        , type: 'text'     , value: sa.city       , width:  '25%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function()  { if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }},
-        { name: 'zip'         , wrapper_class: 'zip'        , nice_name: 'Zip'         , type: 'text'     , value: sa.zip        , width:  '25%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function()  { if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }},
-        { name: 'state'       , wrapper_class: 'state'      , nice_name: 'State'       , type: 'select'   , value: sa.state      , width:  '25%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function()  { if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }, options_url: '/checkout/state-options', show_empty_option: true, empty_text: '-- State --' }                  
+        { name: 'first_name'  , wrapper_class: 'first_name' , nice_name: 'First Name'  , type: 'text'     , value: sa.first_name , width:  '50%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.first_name = this.value; that.cc.print_ready_message(); }}, 
+        { name: 'last_name'   , wrapper_class: 'last_name'  , nice_name: 'Last Name'   , type: 'text'     , value: sa.last_name  , width:  '50%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.last_name  = this.value; that.cc.print_ready_message(); }}, 
+        { name: 'company'     , wrapper_class: 'company'    , nice_name: 'Company'     , type: 'text'     , value: sa.company    , width: '100%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.company    = this.value; that.cc.print_ready_message(); }}, 
+        { name: 'address1'    , wrapper_class: 'address1'   , nice_name: 'Address 1'   , type: 'text'     , value: sa.address1   , width: '100%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.address1   = this.value; if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }}, 
+        { name: 'address2'    , wrapper_class: 'address2'   , nice_name: 'Address 2'   , type: 'text'     , value: sa.address2   , width: '100%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.address2   = this.value; if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }}, 
+        { name: 'city'        , wrapper_class: 'city'       , nice_name: 'City'        , type: 'text'     , value: sa.city       , width:  '25%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.city       = this.value; if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }},
+        { name: 'zip'         , wrapper_class: 'zip'        , nice_name: 'Zip'         , type: 'text'     , value: sa.zip        , width:  '25%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.zip        = this.value; if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }},
+        { name: 'state'       , wrapper_class: 'state'      , nice_name: 'State'       , type: 'select'   , value: sa.state      , width:  '25%' , fixed_placeholder: false , before_update: function() { this.value_old = this.value_clean; }, after_update: function() { that.cc.invoice.shipping_address.state      = this.value; if (this.value != this.value_old) that.cc.refresh_cart(function() { that.cc.print_ready_message(); }); }, options_url: '/checkout/state-options', show_empty_option: true, empty_text: '-- State --' }                  
       ]            
     });            
   },
   
-  ready: function()
+  ready_error: function()
   {
     var that = this;    
-    if (that.cc.allow_instore_pickup && that.cc.invoice.instore_pickup) return true;
-    if (that.cc.all_downloadable()) return true;    
-    if (that.cc.is_empty_address(that.cc.invoice.shipping_address)) return false;
+    if (that.cc.allow_instore_pickup && that.cc.invoice.instore_pickup) return null;
+    if (that.cc.all_downloadable()) return null;
+    if (that.cc.is_empty_address(that.cc.invoice.shipping_address))    
+      return "Please enter your shipping address";
     
     var sa = that.cc.invoice.shipping_address;    
-    if (!sa.first_name || sa.first_name.length == 0) return false;
-    if (!sa.last_name  || sa.last_name.length  == 0) return false;
-    if (!sa.address1   || sa.address1.length   == 0) return false;
-    if (!sa.city       || sa.city.length       == 0) return false;
-    if (!sa.state      || sa.state.length      == 0) return false;
-    if (!sa.zip        || sa.zip.length        == 0) return false;
+    if (!sa.first_name || sa.first_name.length == 0) return "Please enter your shipping address first name";
+    if (!sa.last_name  || sa.last_name.length  == 0) return "Please enter your shipping address last name";
+    if (!sa.address1   || sa.address1.length   == 0) return "Please enter your shipping address";
+    if (!sa.city       || sa.city.length       == 0) return "Please enter your shipping address city";
+    if (!sa.state      || sa.state.length      == 0) return "Please enter your shipping address state";
+    if (!sa.zip        || sa.zip.length        == 0) return "Please enter your shipping address zip";
 
-    return true;        
+    return null;
   }
 };

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

@@ -5,12 +5,15 @@ ShippingMethodController.prototype = {
 
   cc: false, // CheckoutController
   invoice_package_id: false,
+  invoice_package: false,
+  package_number: false,
     
   init: function(params)
   {
     var that = this;
     for (var i in params)
       that[i] = params[i];
+    that.invoice_package = that.cc.invoice_package_for_id(that.invoice_package_id);
   },
     
   print: function()
@@ -19,7 +22,7 @@ ShippingMethodController.prototype = {
     var div = $('<div/>');
     
     var sa = that.cc.invoice.shipping_address;
-    var op = that.cc.invoice_package_for_id(that.invoice_package_id);    
+    var op = that.invoice_package;    
     var sm = op && op.shipping_method ? op.shipping_method : false;     
     
     if (!op)
@@ -53,7 +56,7 @@ ShippingMethodController.prototype = {
   {
     var that = this;
     var div = $('<div/>').append($('<p/>').addClass('loading').html("Getting rates..."));
-    var op = that.cc.invoice_package_for_id(that.invoice_package_id);
+    var op = that.invoice_package;
     
     $('#invoice_package_' + that.invoice_package_id + '_shipping_method').empty().append(div);
       
@@ -91,7 +94,7 @@ ShippingMethodController.prototype = {
       });
       select.change(function(e) {
         var opt = $(this).find('option').filter(':selected');      
-        that.update(opt.val(), opt.data('total')); 
+        that.update(opt.val(), opt.data('total'));       
       });
     }
     div = $('<div/>')
@@ -103,9 +106,7 @@ ShippingMethodController.prototype = {
   },
   
   update: function(shipping_method_id, total)
-  {
-    //console.log('shipping_method_id = ' + shipping_method_id);
-    //console.log('total = ' + total);
+  {    
     var that = this;
     $.ajax({
       url: '/checkout/shipping',
@@ -115,10 +116,29 @@ ShippingMethodController.prototype = {
         shipping_method_id: shipping_method_id,
         total: total
       },
-      success: function(resp) {
+      success: function(resp) {        
         if (resp.error) $('#invoice_package_' + that.invoice_package_id + '_message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) that.cc.refresh_totals();        
+        if (resp.success)
+        {          
+          that.invoice_package.shipping_method_id = shipping_method_id;
+          that.invoice_package.total = total;
+          that.cc.refresh_totals();
+        }
+        that.cc.print_ready_message();
       }
     });        
-  }  
+  },  
+  
+  ready_error: function()
+  {
+    var that = this;    
+    if (that.cc.allow_instore_pickup && that.cc.invoice.instore_pickup) return null;
+    if (that.cc.all_downloadable()) return null;
+        
+    var op = that.invoice_package;    
+    if (!op)                    return "Please select a shipping method for package " + (that.package_number + 1);
+    if (!op.shipping_method_id) return "Please select a shipping method for package " + (that.package_number + 1);
+    
+    return null;    
+  }
 };

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

@@ -212,13 +212,13 @@ StripePaymentMethodController.prototype = {
     });    
   },
   
-  ready: function()
+  ready_error: function()
   {
     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;
-    return true;
+    if (that.cc.invoice.total <= 0.00) return null;
+    if (!that.customer_id ) return "Please enter your credit card information.";
+    if (!that.card_brand  ) return "Please enter your credit card information.";
+    if (!that.card_last4  ) return "Please enter your credit card information.";
+    return null;
   }
 };

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.29'
+  VERSION = '0.9.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.29
+  version: 0.9.30
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg