caboose-store 0.0.42 → 0.0.43

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJkYjRkN2M0ODYyMjczNTcwNzliZWE3N2NiMmNlMmI1NzlkOTAyNg==
+    Y2E4NmY4NDlmY2NjNDRjNzdlYjhlODIzYzA3ZWVlZWUxZTczYjZkZQ==
   data.tar.gz: !binary |-
-    NzQ1ZjdhMjJjZjUyMDJlMzM1NjZlODU5NjAwOGJlNjFiMzI3ZGYyMA==
+    OWZmMGYyODQ0ZTExMTM2MmMzZmFhMDg1NjY4MTAwMjIzNzE3NTRlNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWUzMDNjNzZmMTdhOGYyNWVhYzRiNmJiZDI2NmJkMjU1OGU0NGM2YTA3MjI0
-    MGY4N2JlZGU5OGE4OWUwMGRiZmY4MTlmMmQ0MTUyZjA3YTZmYjRkNjUxMWI2
-    NDFhM2MyNGQ0MTc2NjZmMzczNWFhYWEwZWUyMjJjNDk1YTU0MWY=
+    M2U4MWMxZTc5ODRhMWRiMGQyODJmOGM2MGFmYjEzM2NhNDE4MzA5MDJhNjA1
+    YTJjMDI5YzhkMWE3NTE1NmViNDAxYTc1OTBkYjhmMDAxNjU1ODUzZTdjN2Qw
+    YjRjZTY5YmNkNDdiYTMwNmU3ZGI4Y2Q1M2RiNTA2ZDEyYzM2OGU=
   data.tar.gz: !binary |-
-    Nzg2OTRiNmZiNGNkZDhhZmFkZWY1MzgxZjY2YWJhNDA0YzA2NTkyZmQ3YjM4
-    MWQwOTE5YTEwNWQzNmEyZTk2YTI5OGQwZjZhMDUxNjgwOGRkYWY4YjFjOTcy
-    ZWJjNDgxYWQzMzA3YmQ4NzE4MzYzNWYzZDM4NDdlNDQwZjYwMWY=
+    OTRjYjI0YTE3ZjY2MDU5NGQ3YWE3ODg4NzMwNThjYTVkOGNmZWE2MmJjNDM0
+    YTVjOGE0MjcxZTc5MTE4ODkxODczNTQxNmU1M2RlNzM5MjhmNDJiNmI4Nzcx
+    ZTY1YTRjYzNmNTdhMzA5Y2U5MjliM2I3YTZhOTgzZjZmYzI3OWU=

data/app/assets/javascripts/caboose_store/modules/product.js

@@ -25,9 +25,11 @@ Caboose.Store.Modules.Product = (function() {
       self.option2_values = response.option2_values;
       self.option3_values = response.option3_values;
       self.render();
-      self.bindEvents();
+      self.bindEvents();      
       self.setVariant(self.getInitialVariant());
+      console.log('Test1');      
       self.setOptionsFromVariant(self.variant);
+      console.log('Test2');
     });
   };
   
@@ -96,9 +98,9 @@ Caboose.Store.Modules.Product = (function() {
     if ($targetValue.hasClass('selected')) {
       $targetValue.removeClass('selected');
       $targetValue = $();
-    } else {
+    } else {      
       $targetValue.addClass('selected').siblings().removeClass('selected');
-      
+            
       self.$options.find('ul').not($targetOption).each(function(index, element) {
         var $currentOption = $(element)
           , $currentValue = $currentOption.children('.selected')
@@ -109,8 +111,8 @@ Caboose.Store.Modules.Product = (function() {
         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: $targetOption.data('name'), value: $targetValue.data('value') });        
+                      
         if (!!!self.getVariantFromOptions(options)) {
           $currentValue.removeClass('selected');
         } else if ($otherOption.length && $otherValue.length) {
@@ -165,9 +167,8 @@ Caboose.Store.Modules.Product = (function() {
       self.product.option3 ? self.product.option3 : undefined
     ]);
   };
-  
-    
-  self.getOptionsFromVariant = function(variant) {
+        
+  self.getOptionsFromVariant = 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,
@@ -224,7 +225,7 @@ Caboose.Store.Modules.Product = (function() {
   
   self.getInitialVariant = function () {
     var variant = _.find(self.product.variants, function(variant) {
-      return variant.quantity_in_stock > 0;
+      return variant.quantity_in_stock > 0 || variant.ignore_quantity != false;
     });
     
     if (!variant) {
@@ -243,14 +244,16 @@ Caboose.Store.Modules.Product = (function() {
     }));
     
     var variants = _.sortBy(_.where(self.product.variants, attributes), function(variant) { return variant.price });
-    return _.find(variants, function(variant) { return variant.quantity_in_stock > 0 });
+    return _.find(variants, function(variant) { 
+      return variant.quantity_in_stock > 0 || variant.ignore_quantity != false; 
+    });
   };
   
-  self.setOptionsFromVariant = function(variant) {
+  self.setOptionsFromVariant = 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();
-  };
+    if (variant.option2) $('#option2 li[data-value="' + variant.option2 + '"]', self.$options).click();
+    if (variant.option3) $('#option3 li[data-value="' + variant.option3 + '"]', self.$options).click();
+  };  
   
   self.setVariant = function(variant) {
     self.variant = variant;

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

@@ -1,7 +1,6 @@
 <!--<% _.each(options, function(option, index) { %>
   <select id="<%= 'option' + (index + 1) %>" name="<%= option.name %>">
-    <option value="">Choose an Option</option>
-    
+    <option value="">Choose an Option</option>    
     <% _.each(option.values, function(value) { %>
       <option value="<%= value %>"><%= value %></option>
     <% }); %>

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.42'
+  VERSION = '0.0.43'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms