Merge remote-tracking branch 'origin/MC-17882' into 2.2-develop-pr34

Author: serhii-balko

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

@@ -62,8 +62,8 @@
                                            name="ship[<?= $block->escapeHtml($_index) ?>][<?= $block->escapeHtml($_item->getQuoteItemId()) ?>][qty]"
                                            value="<?= $block->escapeHtml($_item->getQty()) ?>"
                                            size="2"
-                                           class="input-text qty"
-                                           data-validate="{number: true}"/>
+                                           class="input-text qty required-entry"
+                                           data-validate="{number: true, required:true}"/>
                                 </div>
                             </div>
                         </td>

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

@@ -13,11 +13,11 @@
             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-                <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
                 <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                     <dl class="item options tooltip content">
                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                        <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
+                        <dd><?= $block->escapeHtml($_formatedOptionValue['full_view'], ['span']) ?></dd>
                     </dl>
                 <?php endif; ?>
             </dd>

app/code/Magento/Ups/Model/Carrier.php

@@ -1347,7 +1347,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
             $shipperPart->addChild('PhoneNumber', $request->getShipperContactPhoneNumber());
 
             $addressPart = $shipperPart->addChild('Address');
-            $addressPart->addChild('AddressLine1', $request->getShipperAddressStreet());
+            $addressPart->addChild('AddressLine1', $request->getShipperAddressStreet1());
             $addressPart->addChild('AddressLine2', $request->getShipperAddressStreet2());
             $addressPart->addChild('City', $request->getShipperAddressCity());
             $addressPart->addChild('CountryCode', $request->getShipperAddressCountryCode());

lib/web/mage/msie/file-reader.js

@@ -23,7 +23,9 @@ define([
         reader.onload = function () {
             var bytes, length, index;
 
+            /* eslint-disable no-undef */
             bytes = new Uint8Array(reader.result);
+            /* eslint-enable */
             length = bytes.length;
 
             for (index = 0; index < length; index++) {