Merge pull request #13 from Shopify/currency-fix

Fix to currency problem when using Ajax

Author: cshold

assets/ajaxify.js

@@ -34,7 +34,6 @@
 // JQUERY API (c) Copyright 2009 Jaded Pixel. Author: Caroline Schnapp. All Rights Reserved. Includes slight modifications to addItemFromForm
 
 if ((typeof Shopify) === 'undefined') { Shopify = {}; }
-Shopify.money_format = '${{amount}}';
 
 // -------------------------------------------------------------------------------------
 // API Helper Functions
@@ -272,7 +271,7 @@ var ajaxifyShopify = (function(module, $) {
 
     // Default settings
     settings = {
-      debug: true,
+      debug: false,
       method: 'drawer', // Method options are drawer, modal, and flip. Default is drawer.
       formSelector: 'form[action="/cart/add"]',
       addToCartSelector: 'input[type="submit"]',
@@ -281,7 +280,8 @@ var ajaxifyShopify = (function(module, $) {
       toggleCartButton: null,
       btnClass: null,
       wrapperClass: null,
-      useCartTemplate: false
+      useCartTemplate: false,
+      moneyFormat: '${{amount}}'
     };
 
     // Override defaults with arguments
@@ -343,7 +343,7 @@ var ajaxifyShopify = (function(module, $) {
       $cartCountSelector.html(cart.item_count);
     }
     if ($cartCostSelector) {
-      $cartCostSelector.html(Shopify.formatMoney(cart.total_price));
+      $cartCostSelector.html(Shopify.formatMoney(cart.total_price, settings.moneyFormat));
     }
   };
 
@@ -668,7 +668,7 @@ var ajaxifyShopify = (function(module, $) {
         itemAdd: itemAdd,
         itemMinus: itemMinus,
         itemQty: itemQty,
-        price: Shopify.formatMoney(cartItem.price)
+        price: Shopify.formatMoney(cartItem.price, settings.moneyFormat)
       };
 
       items.push(item);
@@ -677,7 +677,7 @@ var ajaxifyShopify = (function(module, $) {
     // Gather all cart data and add to DOM
     data = {
       items: items,
-      totalPrice: Shopify.formatMoney(cart.total_price),
+      totalPrice: Shopify.formatMoney(cart.total_price, settings.moneyFormat),
       btnClass: $btnClass
     }
     $cartContainer.append(template(data));

layout/theme.liquid

@@ -160,7 +160,8 @@
       cartCostSelector: '#cartCost', // Update the total cart cost when a product is added. Default is null.
       toggleCartButton: '#cartToggle', // To toggle drawer/modal cart, include the selector here. Default is null and will take you to /cart page.
       useCartTemplate: true, // True to use cart.liquid markup. Default is false and uses handlebars.js for template.
-      btnClass: 'btn' // Your main button class for styling purposes if useCartTemplate is set to false. Default is null.
+      btnClass: 'btn', // Your main button class for styling purposes if useCartTemplate is set to false. Default is null.
+      moneyFormat: {{ shop.money_format | json }} // Your shop money format, defined in liquid.
     });
   });
   </script>

templates/product.liquid

@@ -19,8 +19,8 @@
     <div class="grid-item large--one-half">
 
       {% comment %}
-        If we only have one product, show a large version of it.
-        If we have more than 1, show it and loop through the rest as thumbnails.
+        If we only have one product image, show a large version of it.
+        If we have more than 1, show it then loop through the rest as thumbnails.
       {% endcomment %}
       {% if product.images.size == 0 %}
 
@@ -241,7 +241,10 @@ jQuery(function($) {
   // Add label if only one product option and it isn't 'Title'. Could be 'Size'.
   {% if product.options.size == 1 and product.options.first != 'Title' %}
     $('.selector-wrapper:eq(0)').prepend('<label>{{ product.options.first }}</label>');
-  {% else %}
+  {% endif %}
+  
+  // Hide selectors if we only have 1 variant and its title contains 'Default'.
+  {% if product.variants.size == 1 and product.variants.first.title contains 'Default' %}
     $('.selector-wrapper').hide();
   {% endif %}