caboose-cms 0.9.193 → 0.9.194

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.193'
+  VERSION = '0.9.194'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.193
+  version: 0.9.194
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -537,7 +537,6 @@ files:
 - app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js
 - app/assets/javascripts/caboose/card.js
 - app/assets/javascripts/caboose/cart.js
-- app/assets/javascripts/caboose/cart_old.js
 - app/assets/javascripts/caboose/checkout.js
 - app/assets/javascripts/caboose/checkout/authnet_payment_method_controller.js
 - app/assets/javascripts/caboose/checkout/billing_address_controller.js
@@ -552,7 +551,6 @@ files:
 - app/assets/javascripts/caboose/checkout_gift_cards.js
 - app/assets/javascripts/caboose/checkout_login_register.js
 - app/assets/javascripts/caboose/checkout_module.js
-- app/assets/javascripts/caboose/checkout_old.js
 - app/assets/javascripts/caboose/checkout_payment_authnet.js
 - app/assets/javascripts/caboose/checkout_payment_stripe.js
 - app/assets/javascripts/caboose/checkout_shipping.js
@@ -608,13 +606,10 @@ files:
 - app/assets/javascripts/caboose/my_account_edit_invoice.js
 - app/assets/javascripts/caboose/my_account_payment_method_controller.js
 - app/assets/javascripts/caboose/product.js
-- app/assets/javascripts/caboose/product_new.js
-- app/assets/javascripts/caboose/product_old.js
 - app/assets/javascripts/caboose/s3upload.js
 - app/assets/javascripts/caboose/shortcut.js
 - app/assets/javascripts/caboose/spectrum.js
 - app/assets/javascripts/caboose/station.js
-- app/assets/javascripts/caboose/testing.js
 - app/assets/javascripts/caboose/tinymce_init.js
 - app/assets/javascripts/caboose/united_states.js
 - app/assets/javascripts/caboose/variant_children_controller.js
@@ -644,7 +639,7 @@ files:
 - app/assets/stylesheets/caboose/icons.txt
 - app/assets/stylesheets/caboose/jquery.datetimepicker.css
 - app/assets/stylesheets/caboose/jquery.timepicker.css
-- app/assets/stylesheets/caboose/login.css
+- app/assets/stylesheets/caboose/login.scss
 - app/assets/stylesheets/caboose/message_boxes.css.scss
 - app/assets/stylesheets/caboose/modal.css
 - app/assets/stylesheets/caboose/modal_inline.css
@@ -900,6 +895,9 @@ files:
 - app/views/caboose/application/under_construction.html.erb
 - app/views/caboose/assets/admin_ace.html.erb
 - app/views/caboose/assets/admin_index.html.erb
+- app/views/caboose/block_type_categories/admin_edit.html.erb
+- app/views/caboose/block_type_categories/admin_index.html.erb
+- app/views/caboose/block_type_categories/admin_new.html.erb
 - app/views/caboose/block_type_sources/admin_edit.html.erb
 - app/views/caboose/block_type_sources/admin_index.html.erb
 - app/views/caboose/block_type_sources/admin_new.html.erb

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

@@ -1,184 +0,0 @@
-//
-// 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({ invoice: response.invoice }));
-      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(response.quantity_message ? response.quantity_message : '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 {                        
-            if (!self.$add_to_cart.find('.message').length) {                            
-              self.$add_to_cart
-                .append($('<div/>').hide().addClass('message')
-                  .append($('<p/>').addClass('note error').html(response.error ? response.error : (response.errors ? response.errors[0] : "Error adding to cart")))
-             //     .append($('<p/>').append($('<a/>').attr('href', '/cart').html('View cart')))                                      
-                );                
-              self.$add_to_cart.find('.message').fadeIn();              
-            }            
-            //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.invoice_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);

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

@@ -1,151 +0,0 @@
-//
-// Checkout
-//
-// :: Initialize
-// :: Index
-// :: Shipping
-// :: Payment
-
-var CabooseCheckout = function() {
-  var self = this;
-  
-  //
-  // Initialize
-  //
-  
-  self.initialize = function() {
-    
-    // Ensure that a user is logged in
-    //if (!Caboose.loggedIn && window.location.pathname.substring(0, 9) == '/checkout') Caboose.login();
-    console.log('foo');
-    
-    // Route to correct method
-    switch (window.location.pathname) {
-      case '/checkout':          self.index();    break;
-      case '/checkout/shipping': self.shipping(); break;
-      case '/checkout/billing':  self.billing();  break;
-    }
-  };
-  
-  //
-  // Index
-  //
-  
-  self.index = function() {
-    
-    // Ensure use as billing is automatically checked
-    $('#use-as-billing').prop('checked', true);
-    
-    // Show/hide the billing form
-    $('#use-as-billing').on('change', function(event) {
-      if ($('#use-as-billing')[0].checked) {
-        $('#billing').hide()
-      } else {
-        $('#billing').show()
-      }
-    });
-    
-    // Update address info
-    $('form#address').on('submit', function(event) {
-      event.preventDefault();
-      
-      $.ajax({
-        url: '/checkout/addresses',
-        type: 'put',
-        data: $(event.delegateTarget).serialize(),
-        success: function(response) {
-          if (response.error)    $('#message').html("<p class='note error'>" + response.error + "</p>");
-          if (response.redirect) window.location = response.redirect;
-        }
-      });
-    });
-  };
-  
-  //
-  // Shipping
-  //
-  
-  self.shipping = function() {
-    $('form#shipping-rates').one('submit', function(event) {
-      event.preventDefault();
-      
-      var $form = $(event.delegateTarget)
-        , code  = $('input[name=shipping_method_code]:checked', $form).val()
-        , name  = $('input#shipping-method-' + code + '-name', $form).val()
-        , price = $('input#shipping-method-' + code + '-price', $form).val();
-        
-      $.ajax({
-        url: '/checkout/shipping-method',
-        type: 'put',
-        data: {
-          shipping_method: {
-            code: code,
-            name: name,
-            price: price
-          }
-        },
-        success: function(response) {
-          if (response.error)    $('#message').html("<p class='note error'>" + response.error + "</p>");
-          if (response.redirect) window.location = response.redirect;
-        }
-      });
-    });
-  };
-  
-  //
-  // Billing
-  //
-  
-  self.billing = function() {
-    window.relay = function(authorized) {
-      if (authorized) {
-        window.location.replace('/checkout/thanks');
-      } else {
-        window.location.replace('/checkout/error');
-      }
-    };
-    
-    $('#billing-expiration-month, #billing-expiration-year').on('change', function(event) {
-      $('input[name=billing-cc-exp]').val($('#billing-expiration-month').val() + $('#billing-expiration-year').val());
-    });
-    
-    $('#billing-form').one('submit', function(e) {
-      e.preventDefault();
-      
-      // TODO this is a temporary fix.. for some reason the one submit event is getting registered multiple times
-      if ($('#billing-confirmation').length) return false;
-      
-      $('input[name=billing-cc-exp]').val($('#billing-expiration-month').val() + $('#billing-expiration-year').val());
-      
-      var $form    = $(e.delegateTarget)
-        , cc_num   = $form.find('input[name=billing-cc-number]').val()
-        , cc_exp   = $form.find('input[name=billing-cc-exp]').val()
-        , total    = $('input#billing-amount').val()
-        , $confirm = $(document.createElement('div'));
-      
-      $confirm.attr('id', 'billing-confirmation');
-      $confirm.append( $('</p>').attr('style', 'margin-bottom: 0').html('<strong>Credit Card Number</strong>: xxxx-xxxx-xxxx-' + cc_num.replace(/\-\ /g, '').substr(-4)) );
-      $confirm.append( $('</p>').attr('style', 'margin-bottom: 0').html('<strong>Expiration Date</strong>: ' + cc_exp.substr(0, 2) + '/' + cc_exp.substr(2, 2)) );
-      $confirm.append( $('</p>').html('<strong>Total</strong>: $' + total) );
-      $confirm.append( $('</p>').attr('style', 'margin: 24px 0').html('<a href="/checkout/billing">Edit billing info</a>') );
-      $confirm.append( $('</p>').html('<input id="submit-billing" type="button" value="Continue >" />') );
-      
-      $form.after($confirm);
-      $form.hide();
-      
-      $confirm.find('#submit-billing').on('click', function(e) {
-        e.preventDefault();
-        $form.submit();
-        $confirm.after( $('</p>').addClass('loading').text('Authorizing transaction..') );
-        $confirm.hide();
-      });
-    });
-  };
-  
-  // Init and return
-  $(document).ready(self.initialize);
-  return self;
-};
-
-Caboose.Checkout = new CabooseCheckout();
-

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

@@ -1,306 +0,0 @@
-//
-//var ProductController = function(params) { this.init(params); };
-//
-//ProductController.prototype = {
-//  
-//  product: false,
-//  option_values: [[], [], []],
-//      
-//  init: function() {    
-//    self.$price = self.$product.find('#product-price');
-//    $("<span id='percent-off'></span").insertAfter(self.$price);
-//    $("<span id='sale-price'></span").insertBefore(self.$price);
-//    if (!self.$product.length) return false;
-//  },
-//  
-//  refresh: function(after)
-//  {    
-//    var that = this;
-//    $.ajax({
-//      url: '/products/' + that.product.id + '/info',
-//      type: 'get',
-//      success: function(resp) {
-//        that.product = resp.product;
-//        that.option_values = [that.option1_values, that.option2_values, that.option3_values];    
-//        that.render();        
-//        that.set_variant(self.get_initial_variant());
-//        that.set_options_from_variant(self.variant);
-//      }
-//    );    
-//  },
-//  
-//  render: function() 
-//  {   
-//    var that = this;
-//    that.render_images();
-//    that.render_options();
-//    $('#message').empty();    
-//  },
-//
-//  initalize_zoom: function(image_url) 
-//  {
-//    var big_image = $("#product-images").children("figure").first();
-//    big_image.data("zoom-image",image_url);
-//    big_image.elevateZoom();
-//  },
-//  
-//  render_images: function() 
-//  {
-//    var that = this;
-//    var div = $('<div/>').append($('<figure/>').attr('id', 'main_image').click(function(e) {
-//      window.location = $(e.target).css('background-image').match(/^url\("(.*)"\)$/)[1];    
-//    }));
-//    
-//    if (that.product.images.length > 0)
-//    {
-//      var ul = $('<ul/>');
-//      $.each(product.images, function(i, image) {                
-//        ul.append(
-//          $('<li/>').data('id', image.id).append(
-//            $('<figure/>')
-//              .data('url-large', image.urls.large)
-//              .data('url-huge' , image.urls.huge)
-//              .css('background-image', "url(" + image.urls.thumb + ")")
-//              .click(function(e) {                                 
-//                $('#main_image').css('background-image', 'url(' + $(this).data('url-large') + ')');
-//                that.initalize_zoom($(this).data('url-huge'));                
-//              })
-//          )
-//        );
-//      });
-//      div.append(ul);      
-//    }
-//    else
-//    {
-//      div.append($('<p/>').html("This product doesn't have any images yet."));
-//    }
-//    $('#product-images').empty().append(div);
-//  },
-//  
-//  render_options: function() 
-//  {
-//    var that = this;
-//    var div = $('<div/>');            
-//        
-//    if (that.product.options.length > 0)
-//    {
-//      $.each(that.product.options, function(i, option) {              
-//        div.append($('<h3>').html(option));
-//        var ul = $('<ul/>').attr('id', 'option' + (i + 1)).data('name', option);      
-//        $.each(that.option_values[i], function(j, option_value) { 
-//          ul.append($('<li/>')
-//            .attr('id', 'option_' + i + '_' + j)
-//            .data('i', i).data('j', j).data('value', option_value)
-//            .html(option_value)
-//            .click(function(e) { 
-//              that.select_option($(this).data('i'), $(this).data('value')); 
-//            })
-//          );                                          
-//        });                
-//        div.append(ul);
-//      });      
-//    }
-//    else
-//    {
-//      div.append($('<p/>').html("This product doesn't have any options."));      
-//    }
-//    $('#product-options').empty().append(div);            
-//  },
-//      
-//  selected_options: false,
-//    
-//  select_option: function(option_index, value) 
-//  {
-//    var that = this;    
-//    that.selected_options[option_index] = (that.selected_options[option_index] == value ? false : value);    
-//    $('#product-options li').removeClass('available').removeClass('unavailable').removeClass('selected');
-//                
-//    if (that.product.options.length > 0)
-//    {
-//      $.each(that.product.options, function(i, option) {
-//        $.each(that.option_values[i], function(j, option_value) {
-//          var el = $('#option_' + i + '_' + j);
-//          if (that.variant_is_available(i, option_value))
-//          {
-//            el.addClass('available');
-//            if (that.selected_options[i] == option_value)
-//              el.addClass('selected');
-//          }
-//          else
-//          {
-//            el.addClass('unavailable');
-//          }
-//        });
-//      });
-//    }
-//    //self.set_variant(self.get_variant_from_options(self.get_current_options()));
-//  },
-//    
-//  variant_is_available: function(option_index, option_value)
-//  {
-//    var that = this;
-//    var exists = true;    
-//    
-//    var options_array = [];
-//    $.each(that.product.options, function(i, option) {
-//      if (that.selected_option[i] == false) // Any option will work
-//      {
-//        options_array[i] = that.option_values[i];
-//      }
-//      else if (i == option_index) // Only the given option_value will work
-//      {
-//        options_array[i] = [option_value];        
-//      }
-//      else // Only the previously selected option will work
-//      {
-//        options_array[i] = [that.selected_option[i]];        
-//      }
-//    });
-//    
-//    var found_it = false;
-//    $.each(that.product.variants, function(i, v) {
-//      var matches = true;
-//      $.each(options_array, function(j, option_values) {
-//        if (option_values.index_of(v['option'+j]) != -1)
-//        {
-//          matches = false;
-//          return false;
-//        }
-//      });
-//      if (matches)
-//      {
-//        found_it = true;
-//        return false;
-//      }
-//    });    
-//    return found_it;
-//  },
-//  
-//  variant_for_options: function()
-//  {
-//    var that = this;
-//    var exists = true;    
-//    
-//    var options_array = [];
-//    $.each(that.product.options, function(i, option) {      
-//      options_array[i] = that.selected_option[i];
-//    });
-//    
-//    var matching_variant = false;
-//    $.each(that.product.variants, function(i, v) {
-//      var matches = true;
-//      $.each(options_array, function(j, option_value) {
-//        if (option_value != v['option'+j]) { matches = false; return false; }
-//      });
-//      if (matches) { matching_variant = v; return false; }
-//    });    
-//    return matching_variant;
-//  },
-//  
-//  //
-//  // Variant Methods
-//  //
-//  
-//  initial_variant: function () 
-//  {
-//    var that = this;        
-//    var available_variants = $.grep(that.product.variants, function(v) { return v.quantity_in_stock > 0; });
-//    
-//    if (!available_variants)           
-//      $('#add-to-cart').after($('<p/>').addClass('message error').text('Out of Stock')).remove();
-//    
-//    variant = available_variants ? available_variants[0] : that.product.variants[0];
-//    return variant;
-//  },
-//  
-//  self.set_variant = function(variant) {
-//    self.variant = variant;
-//    Caboose.Store.Modules.Cart.set_variant(variant);
-//    if (variant) self.set_image_from_variant(variant);
-//    if (variant && self.$price.length) self.$price.empty().text('$' + parseFloat((variant.price * 100) / 100).toFixed(2));
-//    if (variant && self.variant_on_sale(variant)) {
-//      self.$price.addClass("on-sale");
-//      var percent = 100 - ((variant.sale_price / variant.price) * 100).toFixed(0);
-//      $("#percent-off").text("SALE! Save " + percent + "%");
-//      $("#sale-price").text('$' + parseFloat((variant.sale_price * 100) / 100).toFixed(2));
-//    }
-//    else {
-//      self.$price.removeClass("on-sale");
-//      $("#percent-off").text('');
-//      $("#sale-price").text('');
-//    }
-//  },
-//
-//  variant_on_sale: function(variant) 
-//  {    
-//    if (variant.sale_price != "" && variant.sale_price != 0) 
-//    {
-//      var d = new Date();
-//      if (variant.date_sale_starts && d < variant.date_sale_starts) return false;
-//      if (variant.date_sale_ends && d > variant.date_sale_ends)     return false;
-//      return true;
-//    }
-//    return false;
-//  },
-//  
-//  get_variant: function(variant_id) 
-//  {    
-//    for (var v in this.product.variants)      
-//      if (v.id == variant_id)
-//        return v;
-//    return false;        
-//  },
-//  
-//  //
-//  // Option Methods
-//  //
-//  
-//  self.get_option_attribute = function(option) 
-//  {
-//    optionName = _.isObject(option) ? option.name : option;    
-//    if      (self.product.option1 == optionName) { return 'option1'; }
-//    else if (self.product.option2 == optionName) { return 'option2'; }
-//    else if (self.product.option3 == optionName) { return 'option3'; }
-//  },
-//  
-//  self.get_current_options = function() 
-//  {
-//    var options = [];
-//    
-//    self.$options.children('ul').each(function(index, element) {
-//      var $option = $(element);
-//      
-//      options.push({
-//        name: $option.data('name'),
-//        value: $option.children('.selected').first().data('value')
-//      });
-//    });
-//    
-//    return options;
-//  },
-//  
-//  //
-//  // Image Methods
-//  //
-//  
-//  set_image_from_variant: function(variant) 
-//  {    
-//    if (!variant || !variant.images || variant.images.length == 0 || !variant.images[0]) return;
-//    
-//    $('#main_image').css('background-image', 'url(' + $(this).data('url-large') + ')');
-//    that.initalize_zoom($(this).data('url-huge'));
-//                
-//    var $figure = self.$images.children('figure');   
-//    if (variant.images && variant.images.length > 0 && variant.images[0]) {
-//      $figure.css('background-image', 'url(' + variant.images[0].urls.large + ')');
-//      self.initalize_zoom(variant.images[0].urls.huge);
-//    } else if ($figure.css('background-image').toLowerCase() == 'none') {
-//      $figure.css('background-image', 'url(' + _.first(self.product.images).urls.large + ')');
-//      self.initalize_zoom(_.first(self.product.images).urls.huge);
-//    }
-//    
-//  };
-//  
-//  return self;
-//}).call(Caboose.Store);
-//