caboose-cms 0.7.46 → 0.7.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886ac376765988b984868dce363f22e9b9b052ab
-  data.tar.gz: 275663e37010387c36431a065692b4af6c4e63fc
+  metadata.gz: 97e5d06a76226c44c19e33d6d818e1dde1728f9e
+  data.tar.gz: e4bff286f011bef198631f52b910998c0c478fb0
 SHA512:
-  metadata.gz: 971bbf0b06002f79cc7014db7bd37791bb11cab68ae7386adc287b8067fc6f2f831068e5a9d6e03e0e3fa7b4e8e58bcb5a7e5ba9700f653d1ab0d96c414f5283
-  data.tar.gz: 6096afa69d336978603055de68544e5154a0fd87b9186d1bbff025084fbc50e339925a0283ca56c0f32c412cb0a289cf24b7cad12c7a5a52d636074298c5420e
+  metadata.gz: 516be68e61c0604aa4d83a8e6e78f0da7c9674c4d8ccc82dfe8e8b95f8559a02c31991a50814c928977eaf9b648bdba89fe24e766dd84e24c1c83d5ebf4a1809
+  data.tar.gz: 9af2ec3cf136043d6e1fe647eaa08143a482d80836786c9f004380318497574ee19b3db0ed83d7f2aac4c102a5fcbc9995dd31c7e5f2335edcecfc4bd8a065d5

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

@@ -18,7 +18,7 @@ Caboose.Store.Modules.Product = (function() {
     self.$product = $('#product');
     self.$price = self.$product.find('#product-price');
     $("<span id='percent-off'></span").insertAfter(self.$price);
-    $("<span id='sale-price'></span").insertBefore(self.$price);
+    $("<span id='sale-price'></span").insertBefore(self.$price);    
     if (!self.$product.length) return false;
 
     $.get('/products/' + self.$product.data('id') + '/info', function(response) {
@@ -72,7 +72,7 @@ Caboose.Store.Modules.Product = (function() {
   self.render_options = function(callback) {
     self.$options = $('#product-options', self.$options);
     if (!self.$options.length) return false;
-    self.$options.empty().html(self.templates.options({ options: self.get_options_with_all_values() }));
+    self.$options.empty().html(self.templates.options({ product: self.product, options: self.get_options_with_all_values() }));
     if (callback) callback();
   };
   
@@ -91,7 +91,7 @@ Caboose.Store.Modules.Product = (function() {
   self.bind_events = function() {
     self.$images.find('ul > li > figure').on('click', self.thumb_click_handler);
     self.$images.children('figure').on('click', self.image_click_handler);
-    self.$options.find('ul').on('click', 'li', self.option_click_handler);
+    self.$options.find('ul').on('click', 'li', self.option_click_handler);    
   };
   
   self.thumb_click_handler = function(event) {
@@ -103,10 +103,13 @@ Caboose.Store.Modules.Product = (function() {
     window.location = $(event.target).css('background-image').match(/^url\("(.*)"\)$/)[1];
   };
   
-  self.option_click_handler = function(event) {
+  self.option_click_handler = function(event) {    
     var $target_option = $(event.delegateTarget)
     var $target_value  = $(event.target);
-    
+        
+    if ($target_value[0].nodeName == 'IMG')
+      $target_value = $target_value.parent();
+        
     if ($target_value.hasClass('selected')) {
       $target_value.removeClass('selected');
       $target_value = $();
@@ -270,8 +273,14 @@ Caboose.Store.Modules.Product = (function() {
     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)) {
+    if (variant && self.$price.length) self.$price.empty().text('$' + parseFloat((variant.price * 100) / 100).toFixed(2));    
+    if (variant && variant.clearance == true) {
+      self.$price.addClass("on-clearance");
+      var percent = 100 - ((variant.clearance_price / variant.price) * 100).toFixed(0);
+      $("#percent-off").text("CLEARANCE! Save " + percent + "%");
+      $("#sale-price").text('$' + parseFloat((variant.clearance_price * 100) / 100).toFixed(2));
+    }    
+    else 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 + "%");
@@ -279,6 +288,7 @@ Caboose.Store.Modules.Product = (function() {
     }
     else {
       self.$price.removeClass("on-sale");
+      self.$price.removeClass("on-clearance");
       $("#percent-off").text('');
       $("#sale-price").text('');
     }

data/app/assets/templates/caboose/product/options.jst.ejs

@@ -1,9 +1,13 @@
-<% _.each(options, function(option, index) { %>
+<% _.each(options, function(option, index) { %>  
   <h3><%= option.name %></h3>
   <ul id="<%= 'option' + (index + 1) %>" data-name="<%= option.name %>">
-    <% _.each(_.sortBy(option.values, function(option) { return parseFloat(option) }), function(value) { %>
-      <li data-value="<%= value %>"><%= value %></li>
-    <% }); %>
+    <%
+    for (var k in option.values) {
+      var url = option.values[k]            
+      if (url) { %><li data-value="<%= k %>" class='swatch'><div></div><img src='<%= url %>' /><div></div></li><% }
+      else     { %><li data-value="<%= k %>"><%= k %></li><% }
+    }
+    %>
   </ul>
 <% }); %>
 

data/app/controllers/caboose/cart_controller.rb

@@ -47,7 +47,7 @@ module Caboose
         li.quantity += qty
         li.subtotal = li.unit_price * li.quantity
       else
-        unit_price = v.on_sale? ? v.sale_price : v.price
+        unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)
         li = LineItem.new(
           :order_id   => @order.id,
           :variant_id => v.id,

data/app/controllers/caboose/products_controller.rb

@@ -130,9 +130,9 @@ module Caboose
       p = Product.find(params[:id])
       render :json => { 
         :product => p,
-        :option1_values => p.option1_values,
-        :option2_values => p.option2_values,
-        :option3_values => p.option3_values
+        :option1_values => p.option1_values_with_media(true),
+        :option2_values => p.option2_values_with_media(true),
+        :option3_values => p.option3_values_with_media(true)
       }
     end
     

data/app/models/caboose/line_item.rb

@@ -89,7 +89,7 @@ module Caboose
     
     def verify_unit_price      
       if self.unit_price.nil?
-        self.unit_price = self.variant.on_sale? ? self.variant.sale_price : self.variant.price
+        self.unit_price = self.variant.clearance && self.variant.clearance_price ? self.variant.clearance_price : (self.variant.on_sale? ? self.variant.sale_price : self.variant.price)
         self.save
       end      
     end

data/app/models/caboose/product.rb

@@ -162,9 +162,9 @@ module Caboose
       self.variants.where(:status => 'Active').reorder(:option1_sort_order).pluck(:option1).uniq.reject { |x| x.nil? || x.empty? }
     end
     
-    def option1_values_with_media
+    def option1_values_with_media(url_only = false)
       h = {}
-      self.variants.where("status = ? and option1 is not null", 'Active').reorder(:option1_sort_order).each{ |v| h[v.option1] = v.option1_media }      
+      self.variants.where("status = ? and option1 is not null", 'Active').reorder(:option1_sort_order).each{ |v| h[v.option1] = url_only ? (v.option1_media && v.option1_media.image ? v.option1_media.image.url(:thumb) : false) : v.option1_media }      
       return h      
     end
     
@@ -172,9 +172,9 @@ module Caboose
       self.variants.where(:status => 'Active').reorder(:option2_sort_order).pluck(:option2).uniq.reject { |x| x.nil? || x.empty? }
     end
     
-    def option2_values_with_media                                                               
+    def option2_values_with_media(url_only = false)
       h = {}
-      self.variants.where("status = ? and option2 is not null", 'Active').reorder(:option2_sort_order).each{ |v| h[v.option2] = v.option2_media }      
+      self.variants.where("status = ? and option2 is not null", 'Active').reorder(:option2_sort_order).each{ |v| h[v.option2] = url_only ? (v.option2_media && v.option2_media.image ? v.option2_media.image.url(:thumb) : false) : v.option2_media }      
       return h      
     end
     
@@ -182,9 +182,9 @@ module Caboose
       self.variants.where(:status => 'Active').reorder(:option3_sort_order).pluck(:option3).uniq.reject { |x| x.nil? || x.empty? }
     end
     
-    def option3_values_with_media
+    def option3_values_with_media(url_only = false)
       h = {}
-      self.variants.where("status = ? and option3 is not null", 'Active').reorder(:option3_sort_order).each{ |v| h[v.option3] = v.option3_media }      
+      self.variants.where("status = ? and option3 is not null", 'Active').reorder(:option3_sort_order).each{ |v| h[v.option3] = url_only ? (v.option3_media && v.option3_media.image ? v.option3_media.image.url(:thumb) : false) : v.option3_media }      
       return h      
     end
     

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.46'
+  VERSION = '0.7.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.46
+  version: 0.7.47
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg