Merge pull request #345 from magento-folks/bugs

[Folks] Bug-fix S69

Author: irenelagno

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -31,7 +31,7 @@ $numColumns = sizeof($block->getColumns());
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">
             <?php $massActionAvailable = $block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable() ?>
-            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility()): ?>
+            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable): ?>
             <div class="admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>
                     <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -30,8 +30,8 @@ $numColumns = sizeof($block->getColumns());
     <?php else: ?>
         <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
-    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility()): ?>
-        <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
+    <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
+    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable): ?>
         <div class="admin__data-grid-header admin__data-grid-toolbar">
             <div class="admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>

app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml

@@ -178,7 +178,7 @@
                                                                 </item>
                                                                 <!-- Value of region_id field is filtered by the value of county_id attribute -->
                                                                 <item name="filterBy" xsi:type="array">
-                                                                    <item name="target" xsi:type="string"><![CDATA[<%= provider %>:<%= parentScope %>.country_id]]></item>
+                                                                    <item name="target" xsi:type="string">${ $.provider }:${ $.parentScope }.country_id</item>
                                                                     <item name="field" xsi:type="string">country_id</item>
                                                                 </item>
                                                             </item>

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

@@ -38,7 +38,7 @@
     <div class="cart main actions">
         <?php if ($block->getContinueShoppingUrl()): ?>
             <a class="action continue"
-               href="<?php echo $block->getContinueShoppingUrl() ?>"
+               href="<?php echo $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
                title="<?php echo $block->escapeHtml(__('Continue Shopping')); ?>">
                 <span><?php echo __('Continue Shopping') ?></span>
             </a>

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

@@ -9,6 +9,7 @@
 <div class="cart-empty">
     <?php echo $block->getChildHtml('checkout_cart_empty_widget'); ?>
     <p><?php echo __('You have no items in your shopping cart.') ?></p>
-    <p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $block->getContinueShoppingUrl()) ?></p>
+    <p><?php echo __('Click <a href="%1">here</a> to continue shopping.',
+            $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
     <?php echo $block->getChildHtml('shopping.cart.table.after'); ?>
 </div>

app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml

@@ -9,4 +9,4 @@
 ?>
 <?php if ($block->getRealOrderId()) : ?><p><?php echo __('Order #') . $block->getRealOrderId() ?></p><?php endif ?>
 <?php if ($error = $block->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
-<p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $block->getContinueShoppingUrl()) ?></p>
+<p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -464,14 +464,13 @@ protected function _addShippingItem($quoteItemId, $data)
         $qty = isset($data['qty']) ? (int)$data['qty'] : 1;
         //$qty       = $qty > 0 ? $qty : 1;
         $addressId = isset($data['address']) ? $data['address'] : false;
-
-        if (!$this->isAddressIdApplicable($addressId)) {
-            throw new LocalizedException(__('Please check shipping address information.'));
-        }
-
         $quoteItem = $this->getQuote()->getItemById($quoteItemId);
 
         if ($addressId && $quoteItem) {
+            if (!$this->isAddressIdApplicable($addressId)) {
+                throw new LocalizedException(__('Please check shipping address information.'));
+            }
+
             /**
              * Skip item processing if qty 0
              */

app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php

@@ -133,18 +133,11 @@ public function testSetShippingItemsInformation()
                 ]
             ]
         ];
-        $customerAddressId = 42;
-
-        $customerAddressMock = $this->getMock('\Magento\Customer\Model\Data\Address', [], [], '', false);
-        $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
-        $customerAddresses = [$customerAddressMock];
-
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([]);
         $this->checkoutSessionMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
 
         $this->helperMock->expects($this->once())->method('getMaximumQty')->willReturn(500);
 
-        $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);
         $this->quoteMock->expects($this->once())->method('getItemById')->with(array_keys($info[0])[0])
             ->willReturn(null);
 
@@ -189,7 +182,10 @@ public function testSetShippingItemsInformationForAddressLeak()
         $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
         $customerAddresses = [$customerAddressMock];
 
+        $quoteItemMock = $this->getMock('\Magento\Quote\Model\Quote\Item', [], [], '', false);
+        $this->quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([]);
+
         $this->checkoutSessionMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
         $this->helperMock->expects($this->once())->method('getMaximumQty')->willReturn(500);
         $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);

dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Multishipping/MultishippingAgreementReview.php

@@ -3,14 +3,70 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CheckoutAgreements\Test\Block\Multishipping;
 
-use Magento\CheckoutAgreements\Test\Block\Onepage\AgreementReview;
+use \Magento\Multishipping\Test\Block\Checkout\Overview;
+use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement;
+use Magento\Mtf\Client\Locator;
 
 /**
- * Multiple addresses checkout order review block.
+ * Class MultishippingAgreementReview
+ * Multiple page checkout order review block
  */
-class MultishippingAgreementReview extends AgreementReview
+class MultishippingAgreementReview extends Overview
 {
-    //
+    /**
+     * Notification agreements locator
+     *
+     * @var string
+     */
+    protected $notification = 'div.mage-error';
+
+    /**
+     * Agreement locator
+     *
+     * @var string
+     */
+    protected $agreement = './/div[contains(@id, "checkout-review-submit")]//label[.="%s"]';
+
+    /**
+     * Agreement checkbox locator
+     *
+     * @var string
+     */
+    protected $agreementCheckbox = 'input[name^=agreement]';
+
+    /**
+     * Get notification massage
+     *
+     * @return string
+     */
+    public function getNotificationMassage()
+    {
+        return $this->_rootElement->find($this->notification)->getText();
+    }
+
+    /**
+     * Set agreement
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setAgreement($value)
+    {
+        $this->_rootElement->find($this->agreementCheckbox, Locator::SELECTOR_CSS, 'checkbox')->setValue($value);
+    }
+
+    /**
+     * Check agreement
+     *
+     * @param CheckoutAgreement $agreement
+     * @return bool
+     */
+    public function checkAgreement(CheckoutAgreement $agreement)
+    {
+        return $this->_rootElement
+            ->find(sprintf($this->agreement, $agreement->getCheckboxText()), Locator::SELECTOR_XPATH)->isVisible();
+    }
 }