Merge remote-tracking branch 'origin/MAGETWO-39682' into develop

Author: Alex Bomko

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -45,19 +45,21 @@
         <?php endif; ?>
         <button type="submit"
                 name="update_cart_action"
+                data-cart-empty=""
                 value="empty_cart"
                 title="<?php echo $block->escapeHtml(__('Clear Shopping Cart')); ?>"
                 class="action clear" id="empty_cart_button">
             <span><?php echo __('Clear Shopping Cart'); ?></span>
         </button>
         <button type="submit"
                 name="update_cart_action"
+                data-cart-item-update=""
                 value="update_qty"
                 title="<?php echo $block->escapeHtml(__('Update Shopping Cart')); ?>"
                 class="action update">
             <span><?php echo __('Update Shopping Cart'); ?></span>
         </button>
-        <input type="hidden" value="" id="update_cart_action_container" />
+        <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
     </div>
 </form>
 <?php echo $block->getChildHtml('checkout.cart.order.actions') ?>

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

@@ -93,6 +93,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                 <div class="control qty">
                     <input id="cart-<?php echo $_item->getId() ?>-qty"
                            name="cart[<?php echo $_item->getId() ?>][qty]"
+                           data-cart-item-id="<?php echo $_item->getSku() ?>"
                            value="<?php echo $block->getQty() ?>"
                            type="number"
                            size="4"

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

@@ -87,7 +87,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
     <?php endif; ?>
         <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
             <div class="control qty">
-                <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{'required-number':true,'validate-greater-than-zero':true}" data-role="cart-item-qty"/>
+                <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" data-cart-item-id="<?php echo $block->escapeHtml(__($_item->getSku())) ?>" maxlength="12" data-validate="{'required-number':true,'validate-greater-than-zero':true}" data-role="cart-item-qty"/>
             </div>
             <?php $cols++; ?>
         </td>

app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

@@ -42,7 +42,7 @@
                                     <span><?php echo __('Qty') ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="number" id="ship-<?php echo $_index ?>-<?php echo $_item->getQuoteItemId() ?>-qty" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
+                                    <input type="number" data-multiship-item-id="<?php echo $_item->getSku() ?>" id="ship-<?php echo $_index ?>-<?php echo $_item->getQuoteItemId() ?>-qty" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
                                 </div>
                             </div>
                         </td>
@@ -61,7 +61,7 @@
                             <?php endif; ?>
                         </td>
                         <td class="col actions" data-th="<?php echo $block->escapeHtml(__('Actions'));?>">
-                            <a href="<?php echo $block->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="action delete">
+                            <a href="<?php echo $block->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="action delete" data-multiship-item-update="">
                                 <span><?php echo __('Remove item') ?></span>
                             </a>
                         </td>
@@ -76,7 +76,7 @@
             <button type="submit" title="<?php echo __('Go to Shipping Information') ?>" class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($block->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?php echo __('Go to Shipping Information') ?></span></button>
         </div>
         <div class="secondary">
-            <button type="submit" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty &amp; Addresses') ?></span></button>
+            <button type="submit" data-multiship-item-update="" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty &amp; Addresses') ?></span></button>
             <button type="button" title="<?php echo __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?php echo __('Enter a New Address') ?></span></button>
             <a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Shopping Cart') ?></span></a>
         </div>