Merge branch 'master' of https://github.com/okfocus/stone-island

1 files changed, 5 insertions, 1 deletions

diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
index 9a24afa5..72c44405 100644
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
@@ -64,6 +64,7 @@ var CartSummary = ScrollableView.extend({
       var size_id = item['Size']
 
       var $el = $("<div>").addClass("cart_item_row")
+      $el.html("<img src='img/spinner.gif'>")
       $el.data({
         code: code_ten,
         size: size_id,
@@ -95,6 +96,10 @@ var CartSummary = ScrollableView.extend({
             // console.log(size)
             size_name = size['Default']['Text']
             size_name = SIZE_LOOKUP[ size_name ] || size_name
+            if (! size_name && ! size['Default']['Labeled']) {
+              size_name = size['Default']['Text'] + " " + size['Default']['ClassFamily']
+            }
+
             return true
           }
           return false
@@ -109,7 +114,6 @@ var CartSummary = ScrollableView.extend({
                     .replace(/{{color}}/, color_name)
                     .replace(/{{quantity}}/, 1)
                     .replace(/{{price}}/, as_cash(details.Item.Price.DiscountedPrice))
-        $el.data("price", details.Item.Price.DiscountedPrice)
         $el.html(t)
         this.refreshScroller()
       }.bind(this))