Merge branch 'MAGETWO-69080' into MPI-PR-2.1.10

YevSent · YevSent · commit d8d701cecbd0 · 2017-09-22T11:25:41.000+03:00
diff --git a/app/code/Magento/Checkout/CustomerData/DefaultItem.php b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
@@ -70,6 +70,7 @@ protected function doGetItemData()
             'item_id' => $this->item->getId(),
             'configure_url' => $this->getConfigureUrl(),
             'is_visible_in_site_visibility' => $this->item->getProduct()->isVisibleInSiteVisibility(),
+            'product_id' => $this->item->getProduct()->getId(),
             'product_name' => $this->item->getProduct()->getName(),
             'product_sku' => $this->item->getProduct()->getSku(),
             'product_url' => $this->getProductUrl(),
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <link src="Magento_Checkout::js/view/configure/product-customer-data.js"/>
+    </head>
     <update handle="catalog_product_view"/>
     <body>
         <referenceBlock name="head.components">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -17,7 +17,7 @@
             <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="<?php /* @escapeNotVerified */ echo $block->getProductDefaultQty() * 1 ?>" title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty" data-validate="{'required-number':true,digits:true}"/>
+                    <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}"/>
                 </div>
             </div>
             <?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js b/app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js
@@ -0,0 +1,59 @@
+require([
+    'jquery',
+    'Magento_Customer/js/customer-data'
+], function ($, customerData) {
+    'use strict';
+
+    var selectors = {
+        qtySelector: '#product_addtocart_form [name="qty"]',
+        productIdSelector: '#product_addtocart_form [name="product"]'
+    },
+    cartData = customerData.get('cart'),
+    productId = $(selectors.productIdSelector).val(),
+    productQty,
+    productQtyInput,
+
+    /**
+    * Updates product's qty input value according to actual data
+    */
+    updateQty = function () {
+
+        if (productQty || productQty === 0) {
+            productQtyInput = productQtyInput || $(selectors.qtySelector);
+
+            if (productQtyInput && productQty.toString() !== productQtyInput.val()) {
+                productQtyInput.val(productQty);
+            }
+        }
+    },
+
+    /**
+    * Sets productQty according to cart data from customer-data
+    *
+    * @param {Object} data - cart data from customer-data
+    */
+    setProductQty = function (data) {
+        var product;
+
+        if (!(data && data.items && data.items.length && productId)) {
+            return;
+        }
+        product = data.items.find(function (item) {
+            return item['product_id'] === productId ||
+                item['item_id'] === productId;
+        });
+
+        if (!product) {
+            return;
+        }
+        productQty = product.qty;
+    };
+
+    cartData.subscribe(function (updateCartData) {
+        setProductQty(updateCartData);
+        updateQty();
+    });
+
+    setProductQty(cartData());
+    updateQty();
+});
