Merge pull request #611 from magento-troll/pull-primary

Issues fixed:

- MAGETWO-60283 Prices of configurable product are incorrectly recalculated when display currency is changed
- MAGETWO-53583 "Use Default" checkbox is checked again after saving empty fields (description, name, etc)
- MAGETWO-43911 [GITHUB] Untranslatable string
- MAGETWO-60127 [GITHUB] Number input fields have invalid 'maxlength' attribute #7125
- MAGETWO-60128 [GITHUB] Customer Addresses: Can't convert undefined to object #7115

Author: sdwright

app/code/Magento/Catalog/Block/Product/View.php

@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
-use Magento\Catalog\Model\Product;
 
 /**
  * Product View block
@@ -29,6 +28,7 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
+     * @deprecated
      */
     protected $priceCurrency;
 
@@ -225,40 +225,34 @@ public function getJsonConfig()
             $config = [
                 'productId' => $product->getId(),
                 'priceFormat' => $this->_localeFormat->getPriceFormat()
-                ];
+            ];
             return $this->_jsonEncoder->encode($config);
         }
 
         $tierPrices = [];
         $tierPricesList = $product->getPriceInfo()->getPrice('tier_price')->getTierPriceList();
         foreach ($tierPricesList as $tierPrice) {
-            $tierPrices[] = $this->priceCurrency->convert($tierPrice['price']->getValue());
+            $tierPrices[] = $tierPrice['price']->getValue();
         }
         $config = [
-            'productId' => $product->getId(),
+            'productId'   => $product->getId(),
             'priceFormat' => $this->_localeFormat->getPriceFormat(),
-            'prices' => [
-                'oldPrice' => [
-                    'amount' => $this->priceCurrency->convert(
-                        $product->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue()
-                    ),
+            'prices'      => [
+                'oldPrice'   => [
+                    'amount'      => $product->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue(),
                     'adjustments' => []
                 ],
-                'basePrice' => [
-                    'amount' => $this->priceCurrency->convert(
-                        $product->getPriceInfo()->getPrice('final_price')->getAmount()->getBaseAmount()
-                    ),
+                'basePrice'  => [
+                    'amount'      => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getBaseAmount(),
                     'adjustments' => []
                 ],
                 'finalPrice' => [
-                    'amount' => $this->priceCurrency->convert(
-                        $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue()
-                    ),
+                    'amount'      => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue(),
                     'adjustments' => []
                 ]
             ],
-            'idSuffix' => '_clone',
-            'tierPrices' => $tierPrices
+            'idSuffix'    => '_clone',
+            'tierPrices'  => $tierPrices
         ];
 
         $responseObject = new \Magento\Framework\DataObject();

app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

@@ -20,9 +20,9 @@
                 <input type="number"
                        name="qty"
                        id="qty"
-                       maxlength="12"
                        value="<?php /* @escapeNotVerified */ echo $block->getProductDefaultQty() * 1 ?>"
-                       title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty"
+                       title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+                       class="input-text qty"
                        data-validate="<?php echo $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
                        />
             </div>
@@ -58,4 +58,4 @@
         }
     }
 </script>
-<?php endif; ?>
+<?php endif; ?>

app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml

@@ -17,7 +17,13 @@
             <div class="field qty">
                 <label class="label" for="qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
                 <div class="control">
-                    <input type="number" name="qty" id="qty" maxlength="12" value="" title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty" data-validate="{'required-number':true,digits:true}"/>
+                    <input type="number"
+                           name="qty"
+                           id="qty"
+                           value=""
+                           title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+                           class="input-text qty"
+                           data-validate="{'required-number':true,digits:true}"/>
                 </div>
             </div>
             <?php endif; ?>

app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

@@ -96,7 +96,6 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                            size="4"
                            title="<?php echo $block->escapeHtml(__('Qty')); ?>"
                            class="input-text qty"
-                           maxlength="12"
                            data-validate="{required:true,'validate-greater-than-zero':true}"
                            data-role="cart-item-qty"/>
                 </div>

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -79,8 +79,7 @@
                            }, value: qty"
                            type="number"
                            size="4"
-                           class="item-qty cart-item-qty"
-                           maxlength="12"/>
+                           class="item-qty cart-item-qty">
                     <button data-bind="attr: {
                            id: 'update-cart-item-'+item_id,
                            'data-cart-item': item_id,

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

@@ -92,6 +92,18 @@ public function __construct(
         );
     }
 
+    /**
+     * Get cache key informative items.
+     *
+     * @return array
+     */
+    public function getCacheKeyInfo()
+    {
+        $parentData = parent::getCacheKeyInfo();
+        $parentData[] = $this->priceCurrency->getCurrencySymbol();
+        return $parentData;
+    }
+
     /**
      * Get allowed attributes
      *

app/code/Magento/Customer/view/frontend/web/js/model/customer-addresses.js

@@ -11,20 +11,23 @@ define(
     ],
     function($, ko, address) {
         "use strict";
+
         var isLoggedIn = ko.observable(window.isCustomerLoggedIn);
+
         return {
             getAddressItems: function() {
                 var items = [];
-                if (isLoggedIn) {
+                if (isLoggedIn()) {
                     var customerData = window.customerData;
                     if (Object.keys(customerData).length) {
                         $.each(customerData.addresses, function (key, item) {
                             items.push(new address(item));
                         });
                     }
                 }
+
                 return items;
             }
         }
     }
-);
+);