caboose-cms 0.5.189 → 0.5.190

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzgwNzYwNDY1NWVlMTZmNmEwNzQxMTM5NDk4NTljYzAwNTJkODcxYQ==
+    Zjk2ZjJkNGZlOWM0YmViYmY0ZTlmYmQzYmRjZmRiZjY4ZjU2MTI4NA==
   data.tar.gz: !binary |-
-    NTk3ZTZhY2RhOGEzMWQ0Nzk5Y2Q2NzE0NTMwYjc2ZWJiODQ3Y2ZkMg==
+    ZTVjOWQxNGY4NDlmNmE4ZjY1ZDk3ZDk3ZTUyMWM0ZjkzYjkzY2M3OQ==
 SHA512:
   metadata.gz: !binary |-
-    NzdlN2JjYTZiOGQ5Yzk2MWFlYTdmYTljM2EzMTNiMWQ3NWE0NjVmNmNmMzFm
-    YmNjZTM4ZmY2NDdhNzRiM2M2OTE5NTA2Yzk0ZTJkZGEwM2E5YTY3YjZhMzdm
-    NGM2YTQ5MmY5MDMxNzRkZjFlMzQwNTcwYzhkM2Q0ZjkyZjMzZDA=
+    ZmU3YjRhNDc4NzNhMWYyYTU5M2FmYWE3ZDVmMjg3NGM0ZDhlMTY4NWY2NTcz
+    N2ExNmY1NTk1YWEwMzZhZWQ0OWM5MGI4MTYwYjlmNTQwYzU1NzNiY2E3ZWE2
+    NjcwM2YxN2JkZmFjZDAzZjdiMTdmZDZjYzdkZjQzMjVjMDllYmI=
   data.tar.gz: !binary |-
-    Mzg5NGI4YzQyMGJiZmM2YTE4ZTI2YWEzNTc0YTcxMzJkNzM0ZDA4Nzc3MzE4
-    Nzk1MmQ5MDE3MDM1YWRlMDY3Y2NlZjUyZDJhZGNhZDE0OGIxN2U3ZGYzMGE4
-    NjZlYWIwOTFmMThjYzZlZDdkZmQwMjVhYjBiN2FiMDE5NmM2MDM=
+    NDU2ZGYxZDcyZGZjNGQ4ZDdkYTkxNGI1YmRlNTI5YmJkODMwOWE0MDc3NGFm
+    OTgwMzdmZjVlNTVjOTFjZTNhNzczZjEwYTE2OTRhMDQ4ZjFmOTIyOGMwNzg5
+    Mjk5NWExYTViZDI3YmFkMzczYTBiZDg2MzFhZTAyOGExNmE5YjA=

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

@@ -266,7 +266,7 @@ Caboose.Store.Modules.Product = (function() {
     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 (self.variant_on_sale(variant)) {
+    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 + "%");

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

@@ -0,0 +1,305 @@
+
+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);

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

@@ -0,0 +1,324 @@
+//
+// Product
+//
+
+Caboose.Store.Modules.Product = (function() {
+  var self = {
+    templates: {
+      images:  JST['caboose/product/images'],
+      options: JST['caboose/product/options']
+    }
+  };
+  
+  //
+  // Initialize
+  //
+  
+  self.initialize = 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);
+    if (!self.$product.length) return false;
+
+    $.get('/products/' + self.$product.data('id') + '/info', function(response) {
+      self.product = response.product;
+      self.option1_values = response.option1_values;
+      self.option2_values = response.option2_values;
+      self.option3_values = response.option3_values;
+      self.render();
+      self.bind_events();
+      self.set_variant(self.get_initial_variant());
+      self.set_options_from_variant(self.variant);
+    });
+    
+  };
+  
+  //
+  // Render
+  //  
+  self.render = function() {
+    var render_functions = [];
+    render_functions.push(self.render_images);
+    render_functions.push(self.render_options);
+    
+    _.each(render_functions, function(render_function, index) {
+      var finished = index == (render_functions.length - 1);
+      
+      render_function(function() {
+        if (finished) self.$product.removeClass('loading');
+      });
+    });
+  };
+
+  self.initalize_zoom = function(image_url) {
+    var big_image = $("#product-images").children("figure").first();
+    big_image.data("zoom-image",image_url);
+    big_image.elevateZoom();
+  }
+  
+  self.render_images = function(callback) {
+    self.$images = $('#product-images', self.$product);        
+    if (!self.$images.length) return false;
+    self.$images.empty().html(self.templates.images({ images: self.product.images }));
+    if (callback) callback();
+  };
+  
+  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() }));
+    if (callback) callback();
+  };
+  
+  //
+  // Out of Stock
+  //
+  
+  self.out_of_stock = function() {
+    self.$product.find('#add-to-cart').after($('<p/>').addClass('message error').text('Out of Stock')).remove();
+  };
+  
+  //
+  // Events
+  //
+  
+  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.thumb_click_handler = function(event) {
+    self.$images.children('figure').css('background-image', 'url(' + $(event.target).data('url-large') + ')');
+    self.initalize_zoom($(event.target).data('url-large').replace('large','huge'));
+  };
+  
+  self.image_click_handler = function(event) {
+    window.location = $(event.target).css('background-image').match(/^url\("(.*)"\)$/)[1];
+  };
+  
+  self.option_click_handler = function(event) {
+    var $target_option = $(event.delegateTarget)
+    var $target_value  = $(event.target);
+    
+    if ($target_value.hasClass('selected')) {
+      $target_value.removeClass('selected');
+      $target_value = $();
+    } else {
+      $target_value.addClass('selected').siblings().removeClass('selected');
+      
+      self.$options.find('ul').not($target_option).each(function(index, element) {
+        var $currentOption = $(element)
+          , $currentValue = $currentOption.children('.selected')
+          , $otherOption = self.$options.find('ul').not($target_option.add($currentOption))
+          , $otherValue = $otherOption.children('.selected')
+          , options = [];
+        
+        if (!$currentValue.length) return true;
+        
+        options.push({ name: $currentOption.data('name'), value: $currentValue.data('value') });
+        options.push({ name: $target_option.data('name'), value: $target_value.data('value') });
+        
+        if (!!!self.get_variant_from_options(options)) {
+          $currentValue.removeClass('selected');
+        } else if ($otherOption.length && $otherValue.length) {
+          options.push({ name: $otherOption.data('name'), value: $otherValue.data('value') });
+          if (!!!self.get_variant_from_options(options)) $otherValue.removeClass('selected');
+        }
+      });
+      
+      $target_option.children().each(function(index, element) {
+        var $currentOption = $target_option
+          , $currentValue = $(element)
+          , $otherOption = self.$options.find('ul').not($target_option).first()
+          , $otherValue = $otherOption.children('.selected')
+          , $otherOtherOption = self.$options.find('ul').not($target_option.add($otherOption))
+          , $otherOtherValue = $otherOtherOption.children('.selected')
+          , options = [];
+        
+        options.push({ name: $currentOption.data('name'), value: $currentValue.data('value') });
+        if ($otherOption.length && $otherValue.length) options.push({ name: $otherOption.data('name'), value: $otherValue.data('value') });
+        if ($otherOtherOption.length && $otherOtherValue.length) options.push({ name: $otherOtherOption.data('name'), value: $otherOtherValue.data('value') });
+        self.toggle_option_value($currentValue, !!self.get_variant_from_options(options));
+      });
+    }
+    
+    self.$options.find('ul').not($target_option).each(function(index, element) {
+      var $currentOption = $(element);
+      
+      $currentOption.children().each(function(index, element) {
+        var $currentValue = $(element)
+          , $otherOption = self.$options.find('ul').not($target_option.add($currentOption))
+          , $otherValue = $otherOption.children('.selected')
+          , options = [];
+        
+        options.push({ name: $currentOption.data('name'), value: $currentValue.data('value') });
+        if ($target_option.length && $target_value.length) options.push({ name: $target_option.data('name'), value: $target_value.data('value') });
+        if ($otherOption.length && $otherValue.length) options.push({ name: $otherOption.data('name'), value: $otherValue.data('value') });
+        self.toggle_option_value($currentValue, !!self.get_variant_from_options(options));
+      });
+    });
+    
+    self.set_variant(self.get_variant_from_options(self.get_current_options()));
+  };
+  
+  //
+  // Option Methods
+  //
+  
+  self.get_options_from_product = function() {
+    return _.compact([
+      self.product.option1 ? self.product.option1 : undefined,
+      self.product.option2 ? self.product.option2 : undefined,
+      self.product.option3 ? self.product.option3 : undefined
+    ]);
+  };
+  
+    
+  self.get_options_from_variant = function(variant) {
+    return _.compact([
+      self.product.option1 ? { name: self.product.option1, value: variant.option1 } : undefined,
+      self.product.option2 ? { name: self.product.option2, value: variant.option2 } : undefined,
+      self.product.option3 ? { name: self.product.option3, value: variant.option3 } : undefined
+    ]);
+  };
+  
+  self.get_options_with_all_values = function() {
+    var options = [];
+    if (self.product.option1) options.push({ name: self.product.option1, values: self.option1_values });
+    if (self.product.option2) options.push({ name: self.product.option2, values: self.option2_values });
+    if (self.product.option3) options.push({ name: self.product.option3, values: self.option3_values });
+    return options;          
+  };
+  
+  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;
+  };
+  
+  self.toggle_option_value = function($value, on) {
+    if (on) {
+      $value.addClass('available').removeClass('unavailable');
+    } else {
+      $value.addClass('unavailable').removeClass('available selected');
+    }
+  };
+  
+  //
+  // Variant Methods
+  //
+  
+  self.get_initial_variant = function () {
+    var variant = _.find(self.product.variants, function(variant) {
+      return variant.quantity_in_stock > 0;
+    });
+    
+    if (!variant) {
+      variant = _.first(self.product.variants);
+      self.out_of_stock();
+    }
+    
+    return variant;
+  };
+  
+  self.get_variant_from_options = function(options) {
+    if (_.find(options, function(option) { return option.value == undefined })) return false;
+    
+    var attributes = _.object(_.map(options, function(option) {
+      return [self.get_option_attribute(option.name), option.value.toString()]
+    }));
+    
+    var variants = _.sortBy(_.where(self.product.variants, attributes), function(variant) { return variant.price });
+    return _.find(variants, function(variant) { return variant.quantity_in_stock > 0 });
+  };
+  
+  self.set_options_from_variant = function(variant) {
+    if (variant.option1) $('#option1 li[data-value="' + variant.option1 + '"]', self.$options).click();
+    if (variant.option1) $('#option2 li[data-value="' + variant.option2 + '"]', self.$options).click();
+    if (variant.option1) $('#option3 li[data-value="' + variant.option3 + '"]', self.$options).click();
+  };
+  
+  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('');
+    }
+  };
+
+  self.variant_on_sale = function(variant) {
+    var is_on_sale = false;
+    if (variant.sale_price != "" && variant.sale_price != 0) {
+      var d = new Date();
+      if (variant.date_sale_starts && d < variant.date_sale_starts) {
+        is_on_sale = false;
+      }
+      else if (variant.date_sale_ends && d > variant.date_sale_ends) {
+        is_on_sale = false;
+      }
+      else {
+        is_on_sale = true;
+      }
+    }
+    return is_on_sale;
+  }
+  
+  self.get_variant = function(id) {
+    return _.find(self.product.variants, function(variant) { return variant.id == (id || self.variant.id) });
+  };
+  
+  //
+  // Image Methods
+  //
+  
+  self.set_image_from_variant = function(variant) {    
+    if (!variant || !variant.images || variant.images.length == 0 || !variant.images[0]) return;
+    self.$product.trigger('variant:updated');
+    
+    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);
+

data/app/controllers/caboose/checkout_controller.rb

@@ -167,7 +167,7 @@ module Caboose
       
       # Find the last order for the user
       @last_order = Order.where(:customer_id => @logged_in_user.id).order("id desc").limit(1).first
-            
+
     end
     
     #===========================================================================

data/app/controllers/caboose/pages_controller.rb

@@ -444,8 +444,9 @@ module Caboose
           current_tags.each{ |t| PageTag.where(:page_id => page.id, :tag => t).destroy_all if !new_tags.include?(t) }
           
           # Add any new tags not in current_tags
-          new_tags.each{ |t| PageTag.create(:page_id => page.id, :tag => t) if !current_tags.include?(t) }
+          new_tags.each{ |t| PageTag.create(:page_id => page.id, :tag => t) if !current_tags.include?(t) }        
         end
+        
       end
     
       resp.success = save && page.save

data/app/controllers/caboose/retargeting_controller.rb

@@ -0,0 +1,41 @@
+
+module Caboose
+  class RetargetingController < ApplicationController
+    layout 'caboose/admin'
+      
+    def before_action
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
+    end
+    
+    # GET /admin/sites/:site_id/retargeting
+    def admin_edit
+      return if !user_is_allowed('sites', 'edit')       
+      if !@site.is_master
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end      
+      @site = Site.find(params[:site_id])
+    end
+        
+    # PUT /admin/sites/:id/retargeting
+    def admin_update
+      render :json => { :error => "You are not allowed to manage sites." } and return if !user_is_allowed('sites', 'edit') || !@site.is_master
+      
+      resp = StdClass.new     
+      site = Site.find(params[:site_id])
+      rc = site.retargeting_config
+    
+      params.each do |name,value|
+        case name          
+          when 'conversion_id'   then rc.conversion_id   = value    
+          when 'labels_function' then rc.labels_function = value                
+    	  end
+    	end
+    	
+    	resp.success = rc.save
+    	render :json => resp
+    end
+    
+  end
+end
+ 

data/app/controllers/caboose/sites_controller.rb

@@ -126,6 +126,7 @@ module Caboose
           when 'description'              then site.description             = value
           when 'under_construction_html'  then site.under_construction_html = value
           when 'use_store'                then site.use_store               = value
+          when 'use_retargeting'          then site.use_retargeting         = value
     	  end
     	end
     	

data/app/helpers/caboose/application_helper.rb

@@ -26,5 +26,20 @@ tinyMCE.init({
     def parent_categories
       Caboose::Category.find(1).children.where(:status => 'Active')
     end
+    
+    def analytics_js
+      return "" if @site.analytics_id.nil? || @site.analytics_id.strip.length == 0
+      str = ''
+      str << "<script>\n"
+      str << "  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){\n"
+      str << "  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),\n"
+      str << "  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n"
+      str << "  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');\n"
+      str << "  ga('create', '#{@site.analytics_id}', 'auto');\n"
+      str << "  ga('send', 'pageview');\n"
+      str << "</script>\n"
+      return str
+    end
+    
   end
 end

data/app/models/caboose/page.rb

@@ -7,7 +7,7 @@ class Caboose::Page < ActiveRecord::Base
   has_many :children, :class_name => 'Caboose::Page', :foreign_key => 'parent_id', :order => 'sort_order, title'
   has_many :page_permissions  
   has_many :blocks, :order => 'sort_order'
-  has_many :page_tags, :class_name => 'Caboose::PageTag', :dependent => :delete_all, :order => 'tag'
+  has_many :page_tags, :class_name => 'Caboose::PageTag', :dependent => :delete_all, :order => 'tag'  
   has_one :page_cache
   attr_accessible :id      ,        
     :site_id               ,

data/app/models/caboose/retargeting_config.rb

@@ -0,0 +1,40 @@
+module Caboose
+  class RetargetingConfig < ActiveRecord::Base
+    self.table_name = "retargeting_configs"
+
+    belongs_to :site
+    attr_accessible :id,
+      :site_id,
+      :conversion_id,      
+      :labels_function
+    
+    def labels(page)          
+      return eval(self.custom_labels_function)    
+    end
+    
+    def js_code(request, page)
+      return "" if !self.site.use_retargeting
+      
+      str = ""      
+      labels = self.labels(request, page)
+      labels.each do |label|                    
+        str << "<script type='text/javascript'>\n"
+        str << "/* <![CDATA[ */\n"
+        str << "var google_conversion_id = #{self.conversion_id};\n"
+        str << "var google_conversion_label = '#{label}';\n"
+        str << "var google_custom_params = window.google_tag_params;\n"
+        str << "var google_remarketing_only = true;\n"
+        str << "/* ]]> */\n"
+        str << "</script>\n"
+        str << "<script type='text/javascript' src='//www.googleadservices.com/pagead/conversion.js'></script>\n"
+        str << "<noscript>\n"
+        str << "<div style='display:inline;'>\n"
+        str << "<img height='1' width='1' style='border-style:none;' alt='' src='//googleads.g.doubleclick.net/pagead/viewthroughconversion/#{self.conversion_id}/?value=1.00&amp;currency_code=USD&amp;label=#{label}&amp;guid=ON&amp;script=0'/>\n"
+        str << "</div>\n"
+        str << "</noscript>\n"
+      end
+      return str
+    end
+    
+  end  
+end

data/app/models/caboose/schema.rb

@@ -130,7 +130,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :country       , :string  ],
         [ :country_code  , :string  ],
         [ :phone         , :string  ]
-      ],
+      ],      
       Caboose::Asset => [
         [ :page_id        , :integer    ],
         [ :user_id        , :integer    ],
@@ -502,6 +502,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :product_image_id      , :integer ],
         [ :variant_id            , :integer ]
       ],
+      Caboose::RetargetingConfig => [
+        [ :site_id               , :integer ],
+        [ :conversion_id         , :string  ],                
+        [ :labels_function       , :text    ]                        
+      ],
       Caboose::Review => [
         [ :product_id            , :integer   ],
         [ :content               , :string    ],
@@ -568,13 +573,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :under_construction_html , :text   ],
         [ :use_store               , :boolean , { :default => false }],
         [ :logo                    , :attachment ],        
-        [ :is_master               , :boolean , { :default => false }]
+        [ :is_master               , :boolean , { :default => false }],
+        [ :analytics_id            , :string ],
+        [ :use_retargeting         , :boolean , { :default => false }]        
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
         [ :user_id     , :integer ],
         [ :role        , :string  ]
-      ],
+      ],            
       Caboose::SmtpConfig => [
         [ :site_id              , :integer ],
         [ :address              , :string  , { :default => 'localhost' }],
@@ -646,7 +653,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :weight_unit               , :string   , { :default => 'oz' }],
         [ :download_url_expires_in   , :string   , { :default => 5    }],
         [ :starting_order_number     , :integer  , { :default => 1000 }]
-      ],
+      ],      
       Caboose::User => [
         [ :site_id              , :integer    ],
         [ :first_name           , :string     ],

data/app/models/caboose/site.rb

@@ -21,10 +21,20 @@ class Caboose::Site < ActiveRecord::Base
   
   def smtp_config
     c = Caboose::SmtpConfig.where(:site_id => self.id).first
+    c = Caboose::SmtpConfig.create(:site_id => self.id) if c.nil?
+    return c
   end
 
   def social_config
     s = Caboose::SocialConfig.where(:site_id => self.id).first
+    s = Caboose::SocialConfig.create(:site_id => self.id) if s.nil?
+    return s
+  end
+  
+  def retargeting_config
+    c = Caboose::RetargetingConfig.where(:site_id => self.id).first
+    c = Caboose::RetargetingConfig.create(:site_id => self.id) if c.nil?      
+    return c      
   end
   
   def self.id_for_domain(domain)

data/app/views/caboose/retargeting/admin_edit.html.erb

@@ -0,0 +1,42 @@
+<%
+s = @site
+rc = s.retargeting_config
+%>
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<p><div id='site_<%= s.id %>_use_retargeting'   ></div></p>
+<p><div id='retargetingconfig_<%= rc.id %>_conversion_id'   ></div></p>
+<h2>Conversion Labels</h2>
+<p><code>def conversion_labels_function(request, page) {</code></p>
+<p><div id='retargetingconfig_<%= rc.id %>_labels_function' ></div></p>
+<p><code># This function returns an array of conversion labels<br />}</code></p>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Site',
+    id: <%= @site.id %>,
+    update_url: "/admin/sites/<%= @site.id %>",
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'use_retargeting' , nice_name: 'Use Retargeting'          , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_retargeting ? true : false) %>, width: 400 }            
+    ]    
+  });
+  new ModelBinder({
+    name: 'RetargetingConfig',
+    id: <%= rc.id %>,
+    update_url: "/admin/sites/<%= @site.id %>/retargeting",
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'conversion_id'   , nice_name: 'Conversion ID'              , type: 'text'     , value: <%= raw Caboose.json(rc.conversion_id  ) %>, width: 600 },
+      { name: 'labels_function' , nice_name: 'Conversion Labels Function' , type: 'textarea' , value: <%= raw Caboose.json(rc.labels_function) %>, width: 600, height: 75, fixed_placeholder: false }            
+    ]    
+  });
+});
+
+</script>
+<% end %>

data/app/views/caboose/sites/_admin_header.html.erb

@@ -24,8 +24,9 @@
 <ul id='tabs'>
 <%
 tabs = {
-  'General'           => "/admin/sites/#{@site.id}",
-  'Block Types'       => "/admin/sites/#{@site.id}/block-types",        
+  'General'           => "/admin/sites/#{@site.id}",  
+  'Block Types'       => "/admin/sites/#{@site.id}/block-types",
+  'Retargeting'       => "/admin/sites/#{@site.id}/retargeting",
   'Delete Site'       => "/admin/sites/#{@site.id}/delete" 
 }
 

data/config/routes.rb

@@ -48,13 +48,20 @@ Caboose::Engine.routes.draw do
   
   get "my-account" => "my_account#index"
   put "my-account" => "my_account#update"
-    
+  
+  #=============================================================================
+  # Retargeting
+  #=============================================================================
+  
+  get     "admin/sites/:site_id/retargeting"       => "retargeting#admin_edit"
+  put     "admin/sites/:site_id/retargeting"       => "retargeting#admin_update"
+  
   #=============================================================================
   # Sites
   #=============================================================================  
                                                                                                                                        
   get     "admin/sites/options"                    => "sites#options"            
-  get     "admin/sites/new"                        => "sites#admin_new"      
+  get     "admin/sites/new"                        => "sites#admin_new"        
   get     "admin/sites/:id/block-types"            => "sites#admin_edit_block_types"
   get     "admin/sites/:id/delete"                 => "sites#admin_delete_form"
   get     "admin/sites/:id"                        => "sites#admin_edit"
@@ -71,7 +78,7 @@ Caboose::Engine.routes.draw do
   put     "admin/sites/:site_id/domains/:id"       => "domains#admin_update"
   delete  "admin/sites/:site_id/domains/:id"       => "domains#admin_delete"
   put     "admin/sites/:site_id/domains/:id/set-primary" => "domains#admin_set_primary"
-  
+        
   #=============================================================================
   # Store
   #=============================================================================  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.189'
+  VERSION = '0.5.190'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.189
+  version: 0.5.190
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -454,6 +454,8 @@ files:
 - app/assets/javascripts/caboose/model/s3.js
 - app/assets/javascripts/caboose/my_account_edit_order.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
@@ -547,6 +549,7 @@ files:
 - app/controllers/caboose/products_controller.rb
 - app/controllers/caboose/redirects_controller.rb
 - app/controllers/caboose/register_controller.rb
+- app/controllers/caboose/retargeting_controller.rb
 - app/controllers/caboose/reviews_controller.rb
 - app/controllers/caboose/roles_controller.rb
 - app/controllers/caboose/settings_controller.rb
@@ -634,6 +637,7 @@ files:
 - app/models/caboose/product_category_sort.rb
 - app/models/caboose/product_image.rb
 - app/models/caboose/product_image_variant.rb
+- app/models/caboose/retargeting_config.rb
 - app/models/caboose/review.rb
 - app/models/caboose/rich_text_block_parser.rb
 - app/models/caboose/role.rb
@@ -854,6 +858,7 @@ files:
 - app/views/caboose/redirects/admin_index.html.erb
 - app/views/caboose/redirects/admin_new.html.erb
 - app/views/caboose/register/index.html.erb
+- app/views/caboose/retargeting/admin_edit.html.erb
 - app/views/caboose/roles/edit.html.erb
 - app/views/caboose/roles/index.html.erb
 - app/views/caboose/roles/new.html.erb