caboose-cms 0.5.69 → 0.5.70

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTIzZWY3YjU1ZjI3NWUxNDU1ZjllNmY5OWYxOTllYzdjMGRhYWFlMw==
+    N2MzZDNkOTk2YzlkNGQ2ZTNiODlkYmZlM2M2YThkYjAyODgxMjNjNg==
   data.tar.gz: !binary |-
-    OTdiNzNmMzBmN2QzM2Q5ZmY5ZTcwYjU0NTg3ZmYzYTVkNTRiYTBjZQ==
+    MWRlZDQwNGIxNGEwODYxMzkzNjZmOTUwMzc5NjljOTRmYjM1OWRlYQ==
 SHA512:
   metadata.gz: !binary |-
-    OTllMjU1YzUwZTFmYzIyMWI2YTJlNjk5OTZmZGRhODBhZTI3MzZjMjYyNWE3
-    MDQ3NWIyMGZjOTJlYWI2MTcwYWY5NTNhMmQ1ZTJhMzAyY2JmNjM0ZDhhODRi
-    ZTE0ZGMwYThhMjFjMWM4MDI3MzZiOGQzY2FiNjViYmViNWVlMmY=
+    MTk1NTRiMzNkMjYxNDgxNTEzYzRjNDc2YTRkMmMzMDc3ZTQwZWMxNDQ1OTk0
+    Yzg4MWU0MGNmY2Y5NTczMTRiYTgyYzU4YTlmZTU2OWZlY2E4ZGMxYTk1ODc5
+    MzA4ZWIwOTNhZDMyMTVmZmRhNTQ3MWIwYjg5YWQzODcyNmM2MTE=
   data.tar.gz: !binary |-
-    NTE0Y2U1NzE2NmIwYmY0ZjZjNGU3MDgwY2U1Mjk4MzZmNzI2MjJhZGYyODA2
-    MTk4MzNmN2M1NjM4ODNlZDJiMzZiZjFmMjM3YjVjYTg2ZjBlOGM2MDU0M2Uz
-    NWZhOGMzNjI0ZGFhNDRiZjIxMmQxMmI5NDMzNmNhMGJmN2FlM2I=
+    MTA4YzQ4YTJmYzA5NzE2OGJhY2M3M2JmYTMxOThhOTYwNjczN2NhYWVlMTc5
+    YmM0OGFhYTcxYjc2YWIzNjUzYWJjZmE1NTYyMGU3MzQ3NGY5ZTkzNTgwN2M3
+    ZmI2MzBkZjNlOGJkYjg5MWVjMWFmMmU3YzZiNTFlMzJkZTY5M2U=

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

@@ -15,4 +15,5 @@
 //= require jquery-ui
 //= require colorbox-rails
 //= require caboose/jquery.placeholder
-//= require caboose/modal_integration
+//= require caboose/modal_integration
+//= require caboose/admin_main

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

@@ -1,17 +1,4 @@
 
-function curr(x)
-{
-  if (!x) return '0.00'
-  var t = typeof x;
-  if (t == 'boolean') return '0.00';
-  if (t == 'number')  return x.toFixed(2);
-  if (t == 'string')  return parseFloat(x).toFixed(2);
-  console.log("curr doesn't know what this is:");
-  console.log(x);
-  console.log(t);
-  return 'STAHP'
-}
-
 var OrderController = function(params) { this.init(params); }
 
 OrderController.prototype = {

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

@@ -0,0 +1,13 @@
+
+function curr(x)
+{
+  if (!x) return '0.00'
+  var t = typeof x;
+  if (t == 'boolean') return '0.00';
+  if (t == 'number')  return x.toFixed(2);
+  if (t == 'string')  return parseFloat(x).toFixed(2);
+  console.log("curr doesn't know what this is:");
+  console.log(x);
+  console.log(t);
+  return 'STAHP'
+}

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

@@ -1,176 +1,160 @@
-//
-// Cart
-//
 
-Caboose.Store.Modules.Cart = (function() {
-  var self = {
-    templates: {
-      line_items: JST['caboose/cart/line_items'],
-      add_to_cart: JST['caboose/cart/add_to_cart']
-    }
-  };
-  
-  //
-  // Initialize
-  //
+Cart = function(params) { this.init(params); };
+
+Cart.prototype = {
   
-  self.initialize = function() {
-    self.render_add_to_cart();
-    self.render_item_count();
-    self.$cart = $('#cart');
-    if (!self.$cart.length) return false;
-    self.$cart.on('click', '#remove-from-cart', self.remove_handler);
-    self.$cart.on('keyup', 'input', self.update_handler);
-    self.render();
-  };
+  order: false,  
+  allow_edit_line_items: true,
+  allow_edit_gift_cards: true,
+  show_total: true,
+  show_shipping: true,
+  show_tax: true,
+  show_discounts: true,
+    
+  init: function(params) 
+  {
+    for (var i in params)
+      this[i] = params[i];
+    this.refresh();    
+  },
   
-  //
-  // Set Variant
-  //
+  refresh: function()
+  {
+    var that = this;
+    $('#message').html("<p class='loading'>Getting cart...</p>");
+    $.ajax({
+      url: '/cart/items',
+      success: function(resp) {
+        that.order = resp;
+        $('#message').empty();
+        that.print();
+      }        
+    });    
+  },
   
-  self.set_variant = function(variant) {
-    if (self.$add_to_cart) {
-      self.$add_to_cart.find('input[name=variant_id]').val(variant ? variant.id : "");
-      self.$add_to_cart.trigger('change');
+  print: function()
+  {
+    var that = this;
+    if (!this.order || !this.order.line_items || this.order.line_items.length == 0)
+    {
+      $('#cart').html("<p class='note'>You don't have any items in your shopping cart.  <a href='/products'>Continue shopping.</a></p>");
+      return;
     }
-  };
-  
-  //
-  // Render
-  //
-  
-  self.render = function() {
-    $.get('/cart/items', function(response) {
-      self.$cart.empty().html(self.templates.line_items({ order: response.order }));
-      self.$cart.removeClass('loading');
+
+    var tbody = $('<tbody/>')
+      .append($('<tr/>')              
+        .append($('<th/>').attr('colspan', '2').html('Item'))        
+        .append($('<th/>').html('Unit Price'))
+        .append($('<th/>').html('Quantity'))        
+        .append($('<th/>').html('Subtotal'))
+      );
+                
+    $.each(this.order.line_items, function(i, li) {      
+      var v = li.variant;
+      var p = v.product;      
+      var img = v.product_images && v.product_images.length > 0 ? v.product_images[0] : (p.product_images && p.product_images.length > 0 ? p.product_images[0] : false);            
+      img = img ? $('<img/>').attr('src', img.urls.tiny) : '&nbsp;';
+         
+      var item = $('<td/>').attr('valign', 'top').append(p.title + '<br/>' + v.title);
+      if (that.allow_edit_line_items == true)
+        item.append('<br/>').append($('<a/>').attr('href','#').html('Remove').click(function(e) { e.preventDefault(); that.remove_item(li.id); }));
+      var qty = $('<td/>').css('text-align', 'right');
+      if (that.allow_edit_line_items == true)
+        qty.append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity'));
+      else
+        qty.append(li.quantity);
+              
+      tbody.append($('<tr/>').data('id', li.id)            
+        .append($('<td/>').attr('valign', 'top').append(img))
+        .append(item)                                                                        
+        .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(v.price).toFixed(2)))
+        .append(qty)
+        .append($('<td/>').css('text-align', 'right').html('$' + (v.price * li.quantity).toFixed(2)))
+      );      
     });
-  };
-  
-  self.render_add_to_cart = function() {
-    self.$add_to_cart = $('#add-to-cart');
-    if (!self.$add_to_cart.length) return false;
-    self.$add_to_cart.empty().html(self.templates.add_to_cart());
-    //$('input[name=quantity]', self.$add_to_cart).on('keyup', self.qty_keyup_handler);
-    //$('input[name=quantity,type=hidden,value=1]', self.$add_to_cart);
-    $('form', self.$add_to_cart).on('submit', self.add_handler);
-  };
-  
-  self.render_item_count = function(item_count) {
-    var $link = $('#cart-link, .cart-link');    
-    //if (!$link.length) return false;
-        
-    function set_count(count) {            
-      if ($('#cart_item_count').length > 0)
-        $('#cart_item_count').html(count);              
-      else if ($link.length > 0)
-      {
-        if ($link.children('i') && count < 1) { $link.children('i').remove(); }
-        else if ($link.children('i').length)  { $link.children('i').empty().text(count); } 
-        else                                  { $link.append($('<i/>').text(count)); }
-      }
-    };
-    
-    if (item_count) {
-      set_count(item_count);
-    } else {
-      $.get('/cart/item-count', function(response) {
-        set_count(response.item_count);
-      });
+    tbody.append($('<tr/>')        
+      .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Subtotal'))
+      .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.subtotal).toFixed(2)))
+    );
+    if (that.show_shipping)
+    {
+      tbody.append($('<tr/>')        
+        .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Shipping &amp; Handling'))
+        .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.shipping + that.order.handling).toFixed(2)))
+      );
     }
-  };
-  
-  //
-  // Event Handlers
-  //
-  
-  self.qty_keyup_handler = function(event) {
-    var $quantity = $(event.target);
-    $quantity.val($quantity.val().match(/\d*\.?\d+/));
-  };
-  
-  self.add_handler = function(event) {
-    event.preventDefault();
-    var $form = $(event.target);
-    
-    if ($form.find('input[name=variant_id]').val().trim() == "") {
-      alert('Must select all options');
-    } else {
-      $.ajax({
-        type: $form.attr('method'),
-        url: $form.attr('action'),
-        data: $form.serialize(),
-        success: function(response) {          
-          if (response.success) {
-            self.render_item_count(response.item_count);
-            if (self.$add_to_cart.length) self.$add_to_cart.trigger('added');
+    if (that.show_tax)
+    {
+      tbody.append($('<tr/>')        
+        .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Tax'))
+        .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.tax).toFixed(2)))
+      );
+    }
+    if (that.show_discounts && that.order.discounts.length > 0)
+    {
+      $.each(that.order.discounts, function(i, d) {
+          
+        var gctd = $('<td/>').css('text-align', 'right').attr('colspan', 4);
+        if (that.allow_edit_gift_cards)
+          gctd.append($('<a/>').data('discount_id', d.id).attr('href', '#').html('(remove)').click(function(e) { e.preventDefault(); that.remove_discount($(this).data('discount_id')); })).append(' ');
+        gctd.append('Gift Card (' + d.gift_card.code + ')');
             
-            if (!self.$add_to_cart.find('.message').length) {
-              self.$add_to_cart
-                .append($('<div/>').hide().addClass('message')
-                  .append($('<p/>').text('Successfully added to cart'))
-                  .append($('<p/>')
-                    .append($('<a/>').attr('href', '/cart').html('View cart')).append(' | ')
-                    .append($('<a/>').attr('href', '/checkout').html('Continue to checkout'))
-                  )
-                );                
-              self.$add_to_cart.find('.message').fadeIn();
-              Caboose.Store.Modules.Product.$product.trigger('added-to-cart');
-              
-              //setTimeout(function() {
-              //  self.$add_to_cart.find('.message').fadeOut(function() { $(this).remove() });
-              //}, 5000);
-            }
-          } else {
-            alert(response.errors[0]);
-          }
-        }
+        tbody.append($('<tr/>')        
+          .append(gctd)
+          .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(d.amount).toFixed(2)))
+        );          
       });
+      if (that.order.custom_discount && that.order.custom_discount > 0)
+      {
+        tbody.append($('<tr/>')        
+          .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Discount'))
+          .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.custom_discount).toFixed(2)))
+        );
+      }
     }
-  };
-  
-  self.update_handler = function(event) {
-    var $quantity = $(event.target)
-    var $line_item = $quantity.parents('li').first();
-    
-    $quantity.val($quantity.val().match(/\d*\.?\d+/));
-    if ($quantity.val() == "") return false;
-    
-    delay(function() {
-      $.ajax({
-        type: 'put',
-        url: '/cart/items/' + $line_item.data('id'),
-        data: { quantity: $quantity.val() },
-        success: function(response) {
-          if (response.success) {
-            $line_item.find('.price').empty().text('$' + response.line_item.price);
-            if (self.$cart.find('.subtotal').length) self.$cart.find('.subtotal').empty().text('$' + response.order_subtotal);
-          } else {
-            alert(response.errors[0]);
-          }
-        }
+    if (that.show_total)
+    {
+      tbody.append($('<tr/>')        
+        .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Total'))
+        .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.total).toFixed(2)))
+      );            
+    }            
+    $('#cart').empty().append($('<table/>').append(tbody));
+          
+    if (that.allow_edit_line_items)
+    {
+      $.each(this.order.line_items, function(i, li) {      
+        m = new ModelBinder({
+          name: 'LineItem',
+          id: li.id,
+          update_url: '/cart/' + li.id,
+          authenticity_token: that.form_authenticity_token,    
+          attributes: [
+            { name: 'quantity', nice_name: 'Qty', type: 'text', value: li.quantity, width: 50, fixed_placeholder: false, after_update: function() { that.refresh(); } }                
+          ]
+        }); 
       });
-    }, 1000);
-  };
+    }        
+  },
   
-  self.remove_handler = function(event) {
-    var $line_item = $(event.target).parents('li').first();
-    
+  remove_item: function(li_id)
+  {
+    var that = this;
     $.ajax({
-      type: 'delete',
-      url: '/cart/items/' + $line_item.data('id'),
-      success: function(response) {
-        if (response.success) {
-          self.render();
-          self.render_item_count(response.item_count);
-        }
-      }
-    });
-  };
+     url: '/cart/' + li_id,
+     type: 'delete',
+     success: function(resp) { that.refresh(); }
+    });    
+  },
   
-  self.redirect_handler = function(event) {
-    event.preventDefault();
-    window.location = $(event.target).attr('href');
-  };
+  remove_discount: function(discount_id)
+  {
+    var that = this;
+    $.ajax({
+     url: '/cart/discounts/' + discount_id,
+     type: 'delete',
+     success: function(resp) { that.refresh(); }
+    });    
+  }
   
-  return self;
-}).call(Caboose.Store);
+};

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

@@ -0,0 +1,176 @@
+//
+// Cart
+//
+
+Caboose.Store.Modules.Cart = (function() {
+  var self = {
+    templates: {
+      line_items: JST['caboose/cart/line_items'],
+      add_to_cart: JST['caboose/cart/add_to_cart']
+    }
+  };
+  
+  //
+  // Initialize
+  //
+  
+  self.initialize = function() {
+    self.render_add_to_cart();
+    self.render_item_count();
+    self.$cart = $('#cart');
+    if (!self.$cart.length) return false;
+    self.$cart.on('click', '#remove-from-cart', self.remove_handler);
+    self.$cart.on('keyup', 'input', self.update_handler);
+    self.render();
+  };
+  
+  //
+  // Set Variant
+  //
+  
+  self.set_variant = function(variant) {
+    if (self.$add_to_cart) {
+      self.$add_to_cart.find('input[name=variant_id]').val(variant ? variant.id : "");
+      self.$add_to_cart.trigger('change');
+    }
+  };
+  
+  //
+  // Render
+  //
+  
+  self.render = function() {
+    $.get('/cart/items', function(response) {
+      self.$cart.empty().html(self.templates.line_items({ order: response.order }));
+      self.$cart.removeClass('loading');
+    });
+  };
+  
+  self.render_add_to_cart = function() {
+    self.$add_to_cart = $('#add-to-cart');
+    if (!self.$add_to_cart.length) return false;
+    self.$add_to_cart.empty().html(self.templates.add_to_cart());
+    //$('input[name=quantity]', self.$add_to_cart).on('keyup', self.qty_keyup_handler);
+    //$('input[name=quantity,type=hidden,value=1]', self.$add_to_cart);
+    $('form', self.$add_to_cart).on('submit', self.add_handler);
+  };
+  
+  self.render_item_count = function(item_count) {
+    var $link = $('#cart-link, .cart-link');    
+    //if (!$link.length) return false;
+        
+    function set_count(count) {            
+      if ($('#cart_item_count').length > 0)
+        $('#cart_item_count').html(count);              
+      else if ($link.length > 0)
+      {
+        if ($link.children('i') && count < 1) { $link.children('i').remove(); }
+        else if ($link.children('i').length)  { $link.children('i').empty().text(count); } 
+        else                                  { $link.append($('<i/>').text(count)); }
+      }
+    };
+    
+    if (item_count) {
+      set_count(item_count);
+    } else {
+      $.get('/cart/item-count', function(response) {
+        set_count(response.item_count);
+      });
+    }
+  };
+  
+  //
+  // Event Handlers
+  //
+  
+  self.qty_keyup_handler = function(event) {
+    var $quantity = $(event.target);
+    $quantity.val($quantity.val().match(/\d*\.?\d+/));
+  };
+  
+  self.add_handler = function(event) {
+    event.preventDefault();
+    var $form = $(event.target);
+    
+    if ($form.find('input[name=variant_id]').val().trim() == "") {
+      alert('Must select all options');
+    } else {
+      $.ajax({
+        type: $form.attr('method'),
+        url: $form.attr('action'),
+        data: $form.serialize(),
+        success: function(response) {          
+          if (response.success) {
+            self.render_item_count(response.item_count);
+            if (self.$add_to_cart.length) self.$add_to_cart.trigger('added');
+            
+            if (!self.$add_to_cart.find('.message').length) {
+              self.$add_to_cart
+                .append($('<div/>').hide().addClass('message')
+                  .append($('<p/>').text('Successfully added to cart'))
+                  .append($('<p/>')
+                    .append($('<a/>').attr('href', '/cart').html('View cart')).append(' | ')
+                    .append($('<a/>').attr('href', '/checkout').html('Continue to checkout'))
+                  )
+                );                
+              self.$add_to_cart.find('.message').fadeIn();
+              Caboose.Store.Modules.Product.$product.trigger('added-to-cart');
+              
+              //setTimeout(function() {
+              //  self.$add_to_cart.find('.message').fadeOut(function() { $(this).remove() });
+              //}, 5000);
+            }
+          } else {
+            alert(response.errors[0]);
+          }
+        }
+      });
+    }
+  };
+  
+  self.update_handler = function(event) {
+    var $quantity = $(event.target)
+    var $line_item = $quantity.parents('li').first();
+    
+    $quantity.val($quantity.val().match(/\d*\.?\d+/));
+    if ($quantity.val() == "") return false;
+    
+    delay(function() {
+      $.ajax({
+        type: 'put',
+        url: '/cart/items/' + $line_item.data('id'),
+        data: { quantity: $quantity.val() },
+        success: function(response) {
+          if (response.success) {
+            $line_item.find('.price').empty().text('$' + response.line_item.price);
+            if (self.$cart.find('.subtotal').length) self.$cart.find('.subtotal').empty().text('$' + response.order_subtotal);
+          } else {
+            alert(response.errors[0]);
+          }
+        }
+      });
+    }, 1000);
+  };
+  
+  self.remove_handler = function(event) {
+    var $line_item = $(event.target).parents('li').first();
+    
+    $.ajax({
+      type: 'delete',
+      url: '/cart/items/' + $line_item.data('id'),
+      success: function(response) {
+        if (response.success) {
+          self.render();
+          self.render_item_count(response.item_count);
+        }
+      }
+    });
+  };
+  
+  self.redirect_handler = function(event) {
+    event.preventDefault();
+    window.location = $(event.target).attr('href');
+  };
+  
+  return self;
+}).call(Caboose.Store);