caboose-cms 0.9.196 → 0.9.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c76235f78f0eb25948d31b1cba4c9c3a906627
-  data.tar.gz: dd7bd594298e84c6cb7a3d4de620446925e83022
+  metadata.gz: 314c0ced4535fb77e98f6734f56b75ebc286d765
+  data.tar.gz: 2c32df7f98ee703485b10f3aed2aea67759abc1a
 SHA512:
-  metadata.gz: da9b374bdf3a3422a9b863bd7e4fb22fd88d0557a30a397d55250be60543d187b676aba43331f7a8c44914949a13f43502e056afc2c39874b4d612c9cfcc9152
-  data.tar.gz: 73586d3c38f42765bac250e70b601a71cf15f31e3146270cda769260450f0de3c1c2dc54f928577f3eb329c3487adb2936ac0aaeed12097fdb7e3affb4ec26fa
+  metadata.gz: 5492cb4605583c1e632afa5de6a16b598615a1e9097539209503a63c9a13018fa1b5b36fcd311dc7890058d0a1a937d0587f1859b69daf0c334d65e4fbc0737d
+  data.tar.gz: 69d7658317c0a60327690666903bb9d9572dfd3b883131225882be4f636687ac28d1a8bd303c5f2dfa3903da62de9757422c96f96a0e88fb97390631001031ae

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

@@ -0,0 +1,184 @@
+//
+// 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/stylesheets/caboose/login.scss

@@ -23,6 +23,7 @@
       margin-bottom: 20px;
       text-align: left;
       line-height: 20px;
+      color: #282828;
     }
     & > form {
       text-align: right;

data/app/models/caboose/form_submission.rb

@@ -12,6 +12,7 @@ class Caboose::FormSubmission < ActiveRecord::Base
   	:bcc_to,
   	:category,
   	:date_submitted,
+    :ip_address,
   	:is_spam,
   	:is_deleted,
   	:field1_name,

data/app/models/caboose/schema.rb

@@ -344,6 +344,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :form_name, :string ],
         [ :sent_to, :string ],
         [ :date_submitted, :datetime ],
+        [ :ip_address, :string ],
         [ :bcc_to, :string ],
         [ :category, :string ],
         [ :is_spam, :boolean   , { :default => false }],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.196'
+  VERSION = '0.9.197'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.196
+  version: 0.9.197
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -537,6 +537,7 @@ 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