caboose-cms 0.8.73 → 0.8.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a61f8d71ba625b3d36a4bdf022a149f921962e
-  data.tar.gz: c899b746ee2345f80c5781d81519299bed310733
+  metadata.gz: 8caad026c5f16e2a5d4ae19a51801766150ad677
+  data.tar.gz: 778fcfa166dda07bd05e20b74426cb178ea16966
 SHA512:
-  metadata.gz: 076d6e1206329292eb380f9b1e9af9249ce3ae1060d248a5b608658f9c6fcc559b953f3fff9cac61f08823398dba36ed163785f4dbd19160489930df780c9ded
-  data.tar.gz: 8c6314b7fda3813ac348b7b1e0be008a6f85214510847156a4c8f4b1d8bd5a6df4cf8cd49b9bc27dd3be72422a3458c5804a791339fd5bb070b258ef0583464e
+  metadata.gz: 3dcb19f99ce9a7024cbad57b48a57393e32d6f2ce5b5661c493ff5c6ac4326a9e61c7c9d0e0d49442a924789e96ecba2787cfc86cd1152ea6754010e2257aa37
+  data.tar.gz: 8e88e1bb9465e46ed546f4cccfee3deba0e8d332d46f2d9819d3129084815c1f09dc189599c08c0c97dd9d01f677ae510e84af029b5008a90eb9c83c0559e9eb

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

@@ -25,6 +25,7 @@ CheckoutController.prototype = {
   cart_controller: false,
 
   // Cart options
+  allow_instore_pickup: false,
   allow_edit_line_items: true,
   allow_edit_gift_cards: true,
   show_total: true,
@@ -124,37 +125,40 @@ CheckoutController.prototype = {
   print: function(confirm)
   {
     var that = this;
-    var div = $('<div/>')            
-      .append($('<h2/>').html(confirm ? 'Confirm Order' : 'Checkout'))
-      .append($('<div/>').attr('id', 'invoice_1_instore_pickup' ))
-      .append($('<section/>').attr('id', 'shipping_address_container'))
+    var div = $('<div/>').append($('<h2/>').html(confirm ? 'Confirm Order' : 'Checkout'));
+    if (that.allow_instore_pickup) 
+      div.append($('<div/>').attr('id', 'invoice_1_instore_pickup' ));
+    div.append($('<section/>').attr('id', 'shipping_address_container'))
       .append($('<section/>').attr('id', 'cart'))
       .append($('<section/>').attr('id', 'gift_cards_container'))      
       .append($('<section/>').attr('id', 'payment_method_container'))      
       .append($('<div/>').attr('id', 'message'));      
     $('#'+that.container).empty().append(div);
     
-    that.model_binder = new ModelBinder({
-      name: 'Invoice',
-      id: 1,
-      update_url: '/checkout/invoice',
-      authenticity_token: that.authenticity_token,
-      attributes: [                                                                                                  
-        { name: 'instore_pickup', nice_name: 'In-store Pickup', type: 'checkbox' , value: that.invoice.instore_pickup, fixed_placeholder: true,
-          //before_update: function() { this.value_old = this.value_clean; }, 
-          after_update: function()  {
-            that.invoice.instore_pickup = this.value;
-            var arr = ['shipping_address_container'];
-            $.each(that.invoice.invoice_packages, function(i, ip) {
-              arr.push('invoice_package_' + ip.id + '_shipping_method');
-            });            
-            if (parseInt(this.value) == 0) $.each(arr, function(i, el) { $('#'+el).slideDown(); });
-            else                           $.each(arr, function(i, el) { $('#'+el).slideUp();   });
-            that.print_ready_message();                                            
-          }                  
-        }
-      ]            
-    });
+    if (that.allow_instore_pickup)
+    {
+      that.model_binder = new ModelBinder({
+        name: 'Invoice',
+        id: 1,
+        update_url: '/checkout/invoice',
+        authenticity_token: that.authenticity_token,
+        attributes: [                                                                                                  
+          { name: 'instore_pickup', nice_name: 'In-store Pickup', type: 'checkbox' , value: that.invoice.instore_pickup, fixed_placeholder: true,
+            //before_update: function() { this.value_old = this.value_clean; }, 
+            after_update: function()  {
+              that.invoice.instore_pickup = this.value;
+              var arr = ['shipping_address_container'];
+              $.each(that.invoice.invoice_packages, function(i, ip) {
+                arr.push('invoice_package_' + ip.id + '_shipping_method');
+              });            
+              if (parseInt(this.value) == 0) $.each(arr, function(i, el) { $('#'+el).slideDown(); });
+              else                           $.each(arr, function(i, el) { $('#'+el).slideUp();   });
+              that.print_ready_message();                                            
+            }                  
+          }
+        ]            
+      });
+    }
     
     if (confirm)
     {      

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

@@ -96,7 +96,7 @@ ShippingAddressController.prototype = {
   ready: function()
   {
     var that = this;    
-    if (that.cc.invoice.instore_pickup) return true;
+    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;
     

data/app/views/caboose/checkout/checkout.html.erb

@@ -21,7 +21,8 @@ store_config = @site.store_config
 $(document).ready(function() {      
   var checkout_controller = new CheckoutController({
     authenticity_token: '<%= raw form_authenticity_token %>',
-    pp_name: <%= raw Caboose.json(store_config.pp_name) %>
+    pp_name: <%= raw Caboose.json(store_config.pp_name) %>,
+    allow_instore_pickup: <%= store_config.allow_instore_pickup ? 'true' : 'false' %>
   });   
 });
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.73'
+  VERSION = '0.8.74'
 end

metadata

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