caboose-cms 0.5.56 → 0.5.57

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTkzNGRkMmQ3YWRiMDVmOWE1NjA3MjExMTM5ZDI2NGI5MWUxODc3MA==
+    ODFmNjUxMWMxNmI5NWIwN2RlN2I4Yjg3YzY5NjM5ZDIwY2VjZTg5ZQ==
   data.tar.gz: !binary |-
-    NGI4NjU2ZGU5ZDUzOTQzMDc4NmVkZDcxMzRlOTUxMzIxMmJkZmYyOQ==
+    MTQyZDczZTJmZDY0Y2JiNzBhOTI2YTcwMGE5OGRhMzMzNzg5NzE1Ng==
 SHA512:
   metadata.gz: !binary |-
-    MzM1NzQ4MGE0MTAxMzIyNjQ5YzE3YWY2MDJjY2E2MjdiZThlYjI1NmQ2OWYx
-    MzA5YzE4MWYwZTUyYTJmNGQ2YzVjYmE2YjgxYzliZjU5ZTU2ZDdlYmE3NmM4
-    YTMyMGZlYTMxZGQ3ZWVmZGM5MjZiMjllNWY1OGVkM2EzMmFiYmE=
+    ZGQ0ZDM1ZGY2NzMyNjNlYTQ2NWZhODkwN2Y4M2FkNjIwMjQzNTIxMjkwOWYx
+    MzI1MWM5NzkyYjYxMjE4MTAwMjRkZjIxNjQyNTZkM2JmNTgzZGNhYzJjOGVk
+    M2UzMDM2N2UzODc1MDJmOTY5YzU3N2ZhMzAzYzc4NjEyNzM4MGY=
   data.tar.gz: !binary |-
-    OWY5NmJiOTdmNmVkZGRiYzExM2QyNTZkMmI3YjM4MWIxNmE2YmFiYTZjYmY0
-    MDVlOWFhODc5ZThhOGNhMTAzYzBiMjQ3NGUzZDdjMWQ1MzU0NGI1Mjc5NzMz
-    YWQwNTVkNDhmM2NlMjM5ZThiZWViOWNlMjQzMjgwZTEwY2JiNzI=
+    YWFlZTBmODdhZjA2MjA0YjU4ZjA3MTk5ZjJiMmIwOTQ2MmQyMDE2NGIzZGU4
+    NWUyMWVkNjUwODAxYzZiN2UxYjAzMWIyYTdiMGNhMjcwYjZkZDNlZTAwZWMw
+    ZTIyNjA4MmY4ZTg3OWQ3ZDYyODhmMzczM2Q0ZTFkZDE4YTA0NjA=

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

@@ -5,8 +5,8 @@
 Caboose.Store.Modules.Cart = (function() {
   var self = {
     templates: {
-      lineItems: JST['caboose/cart/line_items'],
-      addToCart: JST['caboose/cart/add_to_cart']
+      line_items: JST['caboose/cart/line_items'],
+      add_to_cart: JST['caboose/cart/add_to_cart']
     }
   };
   
@@ -15,12 +15,12 @@ Caboose.Store.Modules.Cart = (function() {
   //
   
   self.initialize = function() {
-    self.renderAddToCart();
-    self.renderItemCount();
+    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.removeHandler);
-    self.$cart.on('keyup', 'input', self.updateHandler);
+    self.$cart.on('click', '#remove-from-cart', self.remove_handler);
+    self.$cart.on('keyup', 'input', self.update_handler);
     self.render();
   };
   
@@ -28,10 +28,10 @@ Caboose.Store.Modules.Cart = (function() {
   // Set Variant
   //
   
-  self.setVariant = function(variant) {
-    if (self.$addToCart) {
-      self.$addToCart.find('input[name=variant_id]').val(variant ? variant.id : "");
-      self.$addToCart.trigger('change');
+  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');
     }
   };
   
@@ -41,38 +41,35 @@ Caboose.Store.Modules.Cart = (function() {
   
   self.render = function() {
     $.get('/cart/items', function(response) {
-      self.$cart.empty().html(self.templates.lineItems({ order: response.order }));
+      self.$cart.empty().html(self.templates.line_items({ order: response.order }));
       self.$cart.removeClass('loading');
     });
   };
   
-  self.renderAddToCart = function() {
-    self.$addToCart = $('#add-to-cart');
-    if (!self.$addToCart.length) return false;
-    self.$addToCart.empty().html(self.templates.addToCart());
-    $('input[name=quantity]', self.$addToCart).on('keyup', self.quantityKeyupHandler);
-    $('form', self.$addToCart).on('submit', self.addHandler);
+  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.renderItemCount = function(itemCount) {
+  self.render_item_count = function(item_count) {
     var $link = $('#cart-link, .cart-link');
     if (!$link.length) return false;
     
-    function setCount(count) {
-      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));
-      }
+    function set_count(count) {
+      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 (itemCount) {
-      setCount(itemCount);
+    if (item_count) {
+      set_count(item_count);
     } else {
       $.get('/cart/item-count', function(response) {
-        setCount(response.item_count);
+        set_count(response.item_count);
       });
     }
   };
@@ -81,12 +78,12 @@ Caboose.Store.Modules.Cart = (function() {
   // Event Handlers
   //
   
-  self.quantityKeyupHandler = function(event) {
+  self.qty_keyup_handler = function(event) {
     var $quantity = $(event.target);
     $quantity.val($quantity.val().match(/\d*\.?\d+/));
   };
   
-  self.addHandler = function(event) {
+  self.add_handler = function(event) {
     event.preventDefault();
     var $form = $(event.target);
     
@@ -99,11 +96,11 @@ Caboose.Store.Modules.Cart = (function() {
         data: $form.serialize(),
         success: function(response) {
           if (response.success) {
-            self.renderItemCount(response.item_count);
-            if (self.$addToCart.length) self.$addToCart.trigger('added');
+            self.render_item_count(response.item_count);
+            if (self.$add_to_cart.length) self.$add_to_cart.trigger('added');
             
-            if (!self.$addToCart.find('.message').length) {
-              self.$addToCart
+            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/>')
@@ -111,11 +108,11 @@ Caboose.Store.Modules.Cart = (function() {
                     .append($('<a/>').attr('href', '/checkout').html('Continue to checkout'))
                   )
                 );                
-              self.$addToCart.find('.message').fadeIn();
+              self.$add_to_cart.find('.message').fadeIn();
               Caboose.Store.Modules.Product.$product.trigger('added-to-cart');
               
               //setTimeout(function() {
-              //  self.$addToCart.find('.message').fadeOut(function() { $(this).remove() });
+              //  self.$add_to_cart.find('.message').fadeOut(function() { $(this).remove() });
               //}, 5000);
             }
           } else {
@@ -126,9 +123,9 @@ Caboose.Store.Modules.Cart = (function() {
     }
   };
   
-  self.updateHandler = function(event) {
+  self.update_handler = function(event) {
     var $quantity = $(event.target)
-      , $lineItem = $quantity.parents('li').first();
+    var $line_item = $quantity.parents('li').first();
     
     $quantity.val($quantity.val().match(/\d*\.?\d+/));
     if ($quantity.val() == "") return false;
@@ -136,11 +133,11 @@ Caboose.Store.Modules.Cart = (function() {
     delay(function() {
       $.ajax({
         type: 'put',
-        url: '/cart/items/' + $lineItem.data('id'),
+        url: '/cart/items/' + $line_item.data('id'),
         data: { quantity: $quantity.val() },
         success: function(response) {
           if (response.success) {
-            $lineItem.find('.price').empty().text('$' + response.line_item.price);
+            $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]);
@@ -150,26 +147,25 @@ Caboose.Store.Modules.Cart = (function() {
     }, 1000);
   };
   
-  self.removeHandler = function(event) {
-    var $lineItem = $(event.target).parents('li').first();
+  self.remove_handler = function(event) {
+    var $line_item = $(event.target).parents('li').first();
     
     $.ajax({
       type: 'delete',
-      url: '/cart/items/' + $lineItem.data('id'),
+      url: '/cart/items/' + $line_item.data('id'),
       success: function(response) {
         if (response.success) {
           self.render();
-          self.renderItemCount(response.item_count);
+          self.render_item_count(response.item_count);
         }
       }
     });
   };
   
-  self.redirectHandler = function(event) {
+  self.redirect_handler = function(event) {
     event.preventDefault();
     window.location = $(event.target).attr('href');
   };
   
   return self;
 }).call(Caboose.Store);
-

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

@@ -8,17 +8,19 @@ Caboose.Store.Modules.CheckoutStep3 = (function() {
   };
   
   self.bind_event_handlers = function() {
-    $('#checkout button').click(self.shipping_click_handler);    
+    $('a.shipping_rate').click(self.shipping_click_handler);    
   };
 
   self.shipping_click_handler = function(event) {
+    event.preventDefault();
     $('#message').html("<p class='loading'>Saving information...</p>");            
     $.ajax({
       url: '/checkout/shipping',
       type: 'put',      
       data: { 
-        shipping_method:      $(event.target).data('shipping-method'),
-        shipping_method_code: $(event.target).data('shipping-code') 
+        carrier:      $(event.target).data('carrier'),
+        service_code: $(event.target).data('service-code'),
+        service_name: $(event.target).data('service-name')         
       },
       success: function(resp) {
         if (resp.errors && resp.errors.length > 0)

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

@@ -7,7 +7,7 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
   
   self.initialize = function() {
     $('#checkout-confirm').hide();
-    $('#relay').hide();
+    //$('#relay').hide();
     self.bind_event_handlers();    
     self.expiration_change_handler();
   };
@@ -30,6 +30,7 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
   };
   
   self.continue_handler = function(event) {
+    alert('Testing');
     if (!self.is_confirm)
     {
       var cc = $('#billing-cc-number').val();

data/app/assets/javascripts/caboose/model/index_table.js

@@ -545,11 +545,11 @@ IndexTable.prototype = {
     {
       var div = $('<div/>').addClass('note')
         .append($('<h2/>').html('Bulk Import'))
-        .append($('<p/>').html("Enter either the URL where CSV data can be downloaded or the CSV data.</p>"))
-        .append($('<p/>')
-          .append('CSV Data URL').append('<br />')
-          .append($('<input/>').attr('id', that.container + '_bulk_import_data_url').attr('placeholder', 'CSV Data URL').css('width', '100%'))
-        )
+        //.append($('<p/>').html("Enter either the URL where CSV data can be downloaded or the CSV data.</p>"))
+        //.append($('<p/>')
+        //  .append('CSV Data URL').append('<br />')
+        //  .append($('<input/>').attr('id', that.container + '_bulk_import_data_url').attr('placeholder', 'CSV Data URL').css('width', '100%'))
+        //)
         .append($('<p/>')
           .append('CSV Data').append('<br />')
           .append($('<textarea/>').attr('id', that.container + '_bulk_import_data').attr('placeholder', 'CSV Data').css('width', '100%').css('height', '150px'))
@@ -780,7 +780,7 @@ IndexTable.prototype = {
       data: $('#new_form').serialize(),
       success: function(resp) {
         if (resp.error) $('#' + that.container + '_new_message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.redirect || resp.refresh) that.refresh();
+        if (resp.redirect || resp.refresh || resp.success) that.refresh();
       }
     });
   },

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

@@ -5,7 +5,7 @@
 Caboose.Store.Modules.Product = (function() {
   var self = {
     templates: {
-      images: JST['caboose/product/images'],
+      images:  JST['caboose/product/images'],
       options: JST['caboose/product/options']
     }
   };
@@ -25,41 +25,40 @@ Caboose.Store.Modules.Product = (function() {
       self.option2_values = response.option2_values;
       self.option3_values = response.option3_values;
       self.render();
-      self.bindEvents();
-      self.setVariant(self.getInitialVariant());
-      self.setOptionsFromVariant(self.variant);
+      self.bind_events();
+      self.set_variant(self.get_initial_variant());
+      self.set_options_from_variant(self.variant);
     });
   };
   
   //
   // Render
-  //
-  
+  //  
   self.render = function() {
-    var renderFunctions = [];
-    renderFunctions.push(self.renderImages);
-    renderFunctions.push(self.renderOptions);
+    var render_functions = [];
+    render_functions.push(self.render_images);
+    render_functions.push(self.render_options);
     
-    _.each(renderFunctions, function(renderFunction, index) {
-      var finished = index == (renderFunctions.length - 1);
+    _.each(render_functions, function(render_function, index) {
+      var finished = index == (render_functions.length - 1);
       
-      renderFunction(function() {
+      render_function(function() {
         if (finished) self.$product.removeClass('loading');
       });
     });
   };
   
-  self.renderImages = function(callback) {
-    self.$images = $('#product-images', self.$product);
+  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.renderOptions = function(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.getOptionsWithAllValues() }));
+    self.$options.empty().html(self.templates.options({ options: self.get_options_with_all_values() }));
     if (callback) callback();
   };
   
@@ -67,7 +66,7 @@ Caboose.Store.Modules.Product = (function() {
   // Out of Stock
   //
   
-  self.outOfStock = function() {
+  self.out_of_stock = function() {
     self.$product.find('#add-to-cart').after($('<p/>').addClass('message error').text('Out of Stock')).remove();
   };
   
@@ -75,90 +74,91 @@ Caboose.Store.Modules.Product = (function() {
   // Events
   //
   
-  self.bindEvents = function() {
-    self.$images.find('ul > li > figure').on('click', self.thumbClickHandler);
-    self.$images.children('figure').on('click', self.imageClickHandler);
-    self.$options.find('ul').on('click', 'li', self.optionClickHandler);
+  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.thumbClickHandler = function(event) {
+  self.thumb_click_handler = function(event) {
+    //self.$images.children('figure').css('background-image', 'url(' + $(event.target).data('url-large') + ')');
     self.$images.children('figure').css('background-image', 'url(' + $(event.target).data('url-large') + ')');
   };
   
-  self.imageClickHandler = function(event) {
+  self.image_click_handler = function(event) {
     window.location = $(event.target).css('background-image').match(/^url\("(.*)"\)$/)[1];
   };
   
-  self.optionClickHandler = function(event) {
-    var $targetOption = $(event.delegateTarget)
-      , $targetValue = $(event.target);
+  self.option_click_handler = function(event) {
+    var $target_option = $(event.delegateTarget)
+    var $target_value  = $(event.target);
     
-    if ($targetValue.hasClass('selected')) {
-      $targetValue.removeClass('selected');
-      $targetValue = $();
+    if ($target_value.hasClass('selected')) {
+      $target_value.removeClass('selected');
+      $target_value = $();
     } else {
-      $targetValue.addClass('selected').siblings().removeClass('selected');
+      $target_value.addClass('selected').siblings().removeClass('selected');
       
-      self.$options.find('ul').not($targetOption).each(function(index, element) {
+      self.$options.find('ul').not($target_option).each(function(index, element) {
         var $currentOption = $(element)
           , $currentValue = $currentOption.children('.selected')
-          , $otherOption = self.$options.find('ul').not($targetOption.add($currentOption))
+          , $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: $targetOption.data('name'), value: $targetValue.data('value') });
+        options.push({ name: $target_option.data('name'), value: $target_value.data('value') });
         
-        if (!!!self.getVariantFromOptions(options)) {
+        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.getVariantFromOptions(options)) $otherValue.removeClass('selected');
+          if (!!!self.get_variant_from_options(options)) $otherValue.removeClass('selected');
         }
       });
       
-      $targetOption.children().each(function(index, element) {
-        var $currentOption = $targetOption
+      $target_option.children().each(function(index, element) {
+        var $currentOption = $target_option
           , $currentValue = $(element)
-          , $otherOption = self.$options.find('ul').not($targetOption).first()
+          , $otherOption = self.$options.find('ul').not($target_option).first()
           , $otherValue = $otherOption.children('.selected')
-          , $otherOtherOption = self.$options.find('ul').not($targetOption.add($otherOption))
+          , $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.toggleOptionValue($currentValue, !!self.getVariantFromOptions(options));
+        self.toggle_option_value($currentValue, !!self.get_variant_from_options(options));
       });
     }
     
-    self.$options.find('ul').not($targetOption).each(function(index, element) {
+    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($targetOption.add($currentOption))
+          , $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 ($targetOption.length && $targetValue.length) options.push({ name: $targetOption.data('name'), value: $targetValue.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.toggleOptionValue($currentValue, !!self.getVariantFromOptions(options));
+        self.toggle_option_value($currentValue, !!self.get_variant_from_options(options));
       });
     });
     
-    self.setVariant(self.getVariantFromOptions(self.getCurrentOptions()));
+    self.set_variant(self.get_variant_from_options(self.get_current_options()));
   };
   
   //
   // Option Methods
   //
   
-  self.getOptionsFromProduct = function() {
+  self.get_options_from_product = function() {
     return _.compact([
       self.product.option1 ? self.product.option1 : undefined,
       self.product.option2 ? self.product.option2 : undefined,
@@ -167,7 +167,7 @@ Caboose.Store.Modules.Product = (function() {
   };
   
     
-  self.getOptionsFromVariant = function(variant) {
+  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,
@@ -175,7 +175,7 @@ Caboose.Store.Modules.Product = (function() {
     ]);
   };
   
-  self.getOptionsWithAllValues = function() {
+  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 });
@@ -183,7 +183,7 @@ Caboose.Store.Modules.Product = (function() {
     return options;          
   };
   
-  self.getOptionAttribute = function(option) {
+  self.get_option_attribute = function(option) {
     optionName = _.isObject(option) ? option.name : option;
     
     if (self.product.option1 == optionName) {
@@ -195,7 +195,7 @@ Caboose.Store.Modules.Product = (function() {
     }
   };
   
-  self.getCurrentOptions = function() {
+  self.get_current_options = function() {
     var options = [];
     
     self.$options.children('ul').each(function(index, element) {
@@ -210,7 +210,7 @@ Caboose.Store.Modules.Product = (function() {
     return options;
   };
   
-  self.toggleOptionValue = function($value, on) {
+  self.toggle_option_value = function($value, on) {
     if (on) {
       $value.addClass('available').removeClass('unavailable');
     } else {
@@ -222,44 +222,44 @@ Caboose.Store.Modules.Product = (function() {
   // Variant Methods
   //
   
-  self.getInitialVariant = function () {
+  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.outOfStock();
+      self.out_of_stock();
     }
     
     return variant;
   };
   
-  self.getVariantFromOptions = function(options) {
+  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.getOptionAttribute(option.name), option.value.toString()]
+      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.setOptionsFromVariant = function(variant) {
+  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.setVariant = function(variant) {
+  self.set_variant = function(variant) {
     self.variant = variant;
-    Caboose.Store.Modules.Cart.setVariant(variant);
-    if (variant) self.setImageFromVariant(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));
   };
   
-  self.getVariant = function(id) {
+  self.get_variant = function(id) {
     return _.find(self.product.variants, function(variant) { return variant.id == (id || self.variant.id) });
   };
   
@@ -267,7 +267,7 @@ Caboose.Store.Modules.Product = (function() {
   // Image Methods
   //
   
-  self.setImageFromVariant = function(variant) {    
+  self.set_image_from_variant = function(variant) {    
     if (!variant || !variant.images || variant.images.length == 0 || !variant.images[0]) return;
     self.$product.trigger('variant:updated');