caboose-cms 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c0750a57c12214286a268e2b837657b70e0995
-  data.tar.gz: 05f95bfca9e99254b0ef9441b1db56adacb84051
+  metadata.gz: 8c9634c46690b5c4bc5137344dfd466e183bc620
+  data.tar.gz: fddf702fa8d24cf49dbdadd308aef2e060944dc9
 SHA512:
-  metadata.gz: dd29a6f11f1958c9775c51a0460930c146ae3a7cb56874b8bfbab2937ced64b8883c8777fdff9649a0bfe310c22cfffe71f80b3d75a4a93bc00212d54c5404fd
-  data.tar.gz: 68b0968b3bbce3626c27cf9403f655fdeb0afb6475d8865d28358e14339cc64d2562d0244c5369816c17872688b97bf6a801aa83c046876fd32d3e7f17dc66e4
+  metadata.gz: 64d087ac2a8fb52977dc2ed22c1aeab5393140f239e9792c74699eb5f8a740d853c3b43627bd50e0c1bd3ecf0f71966fb966b3e5ac7e8de2144f6fa2b757e65a
+  data.tar.gz: 5557ee652c97763cfbd1711519cf4dad40a1eeb0f98d7cc26d6c264c77cfe001e50e4548dd27da31ab861952ce4a0dda34139be7565f2e6ebac31f1c7708adbf

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

@@ -90,21 +90,37 @@ CartController.prototype = {
     });
     
     if (line_items.length > 0)
-    {      
-      tbody
-        .append($('<tr/>').addClass('invoice_package_header')
-          .append($('<td/>')            
-            .attr('colspan', '4')
-            .append('<h3>Package ' + (j+1) + '</h3>')
+    {
+      // See if all the items in the package are downloadable
+      var all_downloadable = true;
+      $.each(line_items, function(i, li) {
+        if (!li.variant.downloadable || li.variant.downloadable == false)
+          all_downloadable = false;
+      });
+      
+      if (all_downloadable)
+      {
+        tbody.append($('<tr/>').addClass('invoice_package_header')
+          .append($('<td/>').attr('colspan', '4')
+            .append('<h3>Downloadable Items</h3>')
+          )
+        );
+      }
+      else
+      {            
+        tbody.append($('<tr/>').addClass('invoice_package_header')
+          .append($('<td/>').attr('colspan', '4')
+            .append('<h3>Package ' + j+1 + '</h3>')
             .append($('<div/>').attr('id', 'invoice_package_' + op.id + '_shipping_method'))
           )
-        )
-        .append($('<tr/>')
-          .append($('<th/>').html('Item'))        
-          .append($('<th/>').html('Price'))
-          .append($('<th/>').html('Quantity'))        
-          .append($('<th/>').html('Subtotal'))
         );
+      }
+      tbody.append($('<tr/>')
+        .append($('<th/>').html('Item'))        
+        .append($('<th/>').html('Price'))
+        .append($('<th/>').html('Quantity'))        
+        .append($('<th/>').html('Subtotal'))
+      );      
     }
     
     $.each(line_items, function(i, li) {      

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

@@ -255,4 +255,15 @@ CheckoutController.prototype = {
     });
     return li;
   },
+  
+  all_downloadable: function()
+  {
+    var that = this;
+    var all = true;
+    $.each(that.invoice.line_items, function(i, li) {      
+      if (!li.variant.downloadable || li.variant.downloadable == false)
+        all = false;
+    });
+    return all;
+  }
 };

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

@@ -16,6 +16,13 @@ ShippingAddressController.prototype = {
   print: function()
   {
     var that = this;
+    
+    if (that.cc.all_downloadable())
+    {
+      $('#shipping_address_container').empty().append(div);
+      return;
+    }
+    
     that.being_edited = false;
     var sa = that.cc.invoice.shipping_address;    
     
@@ -44,6 +51,13 @@ ShippingAddressController.prototype = {
   edit: function()
   {
     var that = this;
+    
+    if (that.cc.all_downloadable())
+    {
+      $('#shipping_address_container').empty().append(div);
+      return;
+    }
+    
     var sa = that.cc.invoice.shipping_address;
     if (!sa.id) sa.id = 1;
     
@@ -80,6 +94,7 @@ ShippingAddressController.prototype = {
   ready: function()
   {
     var that = this;
+    if (that.cc.all_downloadable()) return true;        
     if (that.cc.is_empty_address(that.cc.invoice.shipping_address)) return false;
     return true;        
   }

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.9'
+  VERSION = '0.8.10'
 end

metadata

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