caboose-cms 0.5.152 → 0.5.153

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZhNjlmYTMzZjhhNmZmM2RiMzM1YzI4Mzg5NGU5OTkxZWYxZDkwZg==
+    MWNjNjk3MjIzZDk4YTg4ZmExYjA5YjgwMWExYTFmOWQ4NzZiYzY2MA==
   data.tar.gz: !binary |-
-    NzBhZTUzN2Y5NTMzNTVjYzY0MDdkNThlOGU5NzIyNGE3MmUzNTJhNQ==
+    YzU5ODNlNTViNGYyMDRiNTg2NGI0MzU0YzE1NjI4N2MxMWNiYTQ0Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZGNhMmJlZjIzNmJjOTI4OTQ4MTU3MDdiZjNlMWEzNTFkZjU4NGUyMmM2MWU1
-    Njc0NmI1NWMxNmE5MmMzNjhkMTQyZjY1MmZlZjQwZTJlYjc4NjU0OTI2ODIy
-    MDI4YzVjMGM5NWQ2MTkwZjExZDdkNDZiNTk5YTJlYjA3Yjk4YTY=
+    MjcyYmU1ZGFhYTI5NjUyZWM4NWZiOTE3ODE4ZDU2ZWIwMzUzMDUzOGQ2ZWEy
+    MTYyZDg5ZmU3ZTEwYzhiOWI5ZGVjNzUyOWUyZGFjOWYzYzFmMTY0NGM0Yzhm
+    YzlkNjIxNDRiOTg0NTc1NTBlYTAwZDE3OTNiNDZjZjcyZjIzNGM=
   data.tar.gz: !binary |-
-    OWUyM2EyNWU1ZDc3Njg4YWM3ZmMxMTMzOTE3ZWI1YzIwYmUxNDhhOWQ3ZDg4
-    ZTVhNTQ3NjQwZDM5YTZhNzM1MGVlNjYxNTFiMDEyZDA1NzY5MWJkMTA0ZTE3
-    MDNlZTNkYjE5ODNhNTViNTEwNjgzYmRhNDBlYzBiN2U3Y2I0NzE=
+    NzZlYTQ3NjI4ZjFlZGMyZWIzMjFmMjY4ZDJkZWMzNDNkOWJmZmIzNWJiODM4
+    OTkzNzZhZThjZDU3OWM0Yjg0YmQzY2FiZGViZDkzYzcxMTA2NzlkM2Q3OWNj
+    MzE0YTU4OWJkZTIwMTEzYjRkMjg5ZDBmYTllYTZlMGUwM2VhOTI=

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

@@ -463,8 +463,12 @@ OrderController.prototype = {
               .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_tracking_number'))
               .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total'))
             );
-          }          
-          tr.append($('<td/>').append(that.line_item_link(li)).append($('<div/>').attr('id', 'line_item_' + li.id + '_message')));
+          }                       
+          tr.append($('<td/>')
+            .append(that.line_item_link(li))
+            .append(that.gift_options(li))
+            .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
+          );
           tr.append($('<td/>').append($('<div/>').attr('id', 'lineitem_' + li.id + '_status')))      
           tr.append($('<td/>').attr('align', 'right').html(curr(li.unit_price)));    
           tr.append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity')));
@@ -497,6 +501,25 @@ OrderController.prototype = {
     });
   },
   
+  gift_options: function(li)
+  {
+    var div = $('<div/>');
+    if (li.is_gift)
+    {
+      div.append($('<ul/>').addClass('gift_options')
+        .append($('<li/>').html("This item is a gift."))
+        .append($('<li/>').html("Gift wrap? " + (li.gift_wrap ? 'Yes' : 'No')))
+        .append($('<li/>').html("Hide prices? " + (li.hide_prices ? 'Yes' : 'No')))
+        .append($('<li/>').html("Gift message: " + (li.gift_message.length > 0 ? li.gift_message : '[Empty]')))
+      );            
+    }
+    else
+    {
+      div.append($('<p/>').html("This item is not a gift."));
+    } 
+    return div;
+  },
+  
   line_item_link: function(li)
   {
     var that = this;
@@ -588,7 +611,11 @@ OrderController.prototype = {
                                      
       var tr = $('<tr/>');
       tr.append($('<td/>').append(div));
-      tr.append($('<td/>').append(that.line_item_link(li)).append($('<div/>').attr('id', 'line_item_' + li.id + '_message')));            
+      tr.append($('<td/>')
+        .append(that.line_item_link(li))        
+        .append(that.gift_options(li))            
+        .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
+      );            
       tr.append($('<td/>').append($('<div/>').attr('id', 'lineitem_' + li.id + '_status')))      
       tr.append($('<td/>').attr('align', 'right').html(curr(li.unit_price)));    
       tr.append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity')));

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.152'
+  VERSION = '0.5.153'
 end

metadata

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