Merge pull request #5160 from magento-tsg-csl3/2.3-develop-pr35

[TSG-CSL3] For 2.3 (pr33)

Author: zakdma

app/code/Magento/Catalog/view/frontend/web/template/product/image_with_borders.html

@@ -6,6 +6,6 @@
 -->
 <span class="product-image-container" data-bind="style: {width: width + 'px'}">
     <span class="product-image-wrapper"  data-bind="style: {'padding-bottom': height/width*100 + '%'}">
-        <img class="product-image-photo" data-bind="attr: {src: src, alt: alt}, style: {width: width + 'px', height: height + 'px'}" />
+        <img class="product-image-photo" data-bind="attr: {src: src, alt: alt}, style: {width: 'auto', height: 'auto'}" />
     </span>
 </span>

app/code/Magento/Customer/etc/fieldset.xml

@@ -57,23 +57,6 @@
                 <aspect name="update" />
             </field>
         </fieldset>
-        <fieldset id="customer_address">
-            <field name="vat_id">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_is_valid">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_request_id">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_request_date">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_request_success">
-                <aspect name="to_quote_address" />
-            </field>
-        </fieldset>
         <fieldset id="sales_convert_order_address">
             <field name="vat_id">
                 <aspect name="to_quote_address" />

app/code/Magento/Quote/Model/ShippingMethodManagement.php

@@ -7,6 +7,7 @@
 namespace Magento\Quote\Model;
 
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
@@ -22,6 +23,7 @@
  * Shipping method read service
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ShippingMethodManagement implements
     \Magento\Quote\Api\ShippingMethodManagementInterface,
@@ -69,6 +71,11 @@ class ShippingMethodManagement implements
      */
     private $quoteAddressResource;
 
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
     /**
      * Constructor
      *
@@ -78,14 +85,16 @@ class ShippingMethodManagement implements
      * @param Quote\TotalsCollector $totalsCollector
      * @param AddressInterfaceFactory|null $addressFactory
      * @param QuoteAddressResource|null $quoteAddressResource
+     * @param CustomerSession|null $customerSession
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
         Cart\ShippingMethodConverter $converter,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
         AddressInterfaceFactory $addressFactory = null,
-        QuoteAddressResource $quoteAddressResource = null
+        QuoteAddressResource $quoteAddressResource = null,
+        CustomerSession $customerSession = null
     ) {
         $this->quoteRepository = $quoteRepository;
         $this->converter = $converter;
@@ -95,10 +104,11 @@ public function __construct(
             ->get(AddressInterfaceFactory::class);
         $this->quoteAddressResource = $quoteAddressResource ?: ObjectManager::getInstance()
             ->get(QuoteAddressResource::class);
+        $this->customerSession = $customerSession ?? ObjectManager::getInstance()->get(CustomerSession::class);
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function get($cartId)
     {
@@ -126,7 +136,7 @@ public function get($cartId)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function getList($cartId)
     {
@@ -155,7 +165,7 @@ public function getList($cartId)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function set($cartId, $carrierCode, $methodCode)
     {
@@ -176,6 +186,8 @@ public function set($cartId, $carrierCode, $methodCode)
     }
 
     /**
+     * Apply carrier code.
+     *
      * @param int $cartId The shopping cart ID.
      * @param string $carrierCode The carrier code.
      * @param string $methodCode The shipping method code.
@@ -209,7 +221,7 @@ public function apply($cartId, $carrierCode, $methodCode)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address)
     {
@@ -240,7 +252,7 @@ public function estimateByExtendedAddress($cartId, AddressInterface $address)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function estimateByAddressId($cartId, $addressId)
     {
@@ -266,6 +278,7 @@ public function estimateByAddressId($cartId, $addressId)
      * @param string $region
      * @param \Magento\Framework\Api\ExtensibleDataInterface|null $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated 100.2.0
      */
     protected function getEstimatedRates(
@@ -277,11 +290,10 @@ protected function getEstimatedRates(
         $address = null
     ) {
         if (!$address) {
-            $address = $this->getAddressFactory()->create()
+            $address = $this->addressFactory->create()
                 ->setCountryId($country)
                 ->setPostcode($postcode)
-                ->setRegionId($regionId)
-                ->setRegion($region);
+                ->setRegionId($regionId);
         }
         return $this->getShippingMethods($quote, $address);
     }
@@ -301,12 +313,21 @@ private function getShippingMethods(Quote $quote, $address)
         $shippingAddress->setCollectShippingRates(true);
 
         $this->totalsCollector->collectAddressTotals($quote, $shippingAddress);
+        $quoteCustomerGroupId = $quote->getCustomerGroupId();
+        $customerGroupId = $this->customerSession->getCustomerGroupId();
+        $isCustomerGroupChanged = $quoteCustomerGroupId !== $customerGroupId;
+        if ($isCustomerGroupChanged) {
+            $quote->setCustomerGroupId($customerGroupId);
+        }
         $shippingRates = $shippingAddress->getGroupedAllShippingRates();
         foreach ($shippingRates as $carrierRates) {
             foreach ($carrierRates as $rate) {
                 $output[] = $this->converter->modelToDataObject($rate, $quote->getQuoteCurrencyCode());
             }
         }
+        if ($isCustomerGroupChanged) {
+            $quote->setCustomerGroupId($quoteCustomerGroupId);
+        }
         return $output;
     }
 

app/code/Magento/Wishlist/Controller/Index/Plugin.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Wishlist plugin before dispatch
@@ -89,7 +90,7 @@ public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject,
                 $this->messageManager->addErrorMessage(__('You must login or register to add items to your wishlist.'));
             }
         }
-        if (!$this->config->isSetFlag('wishlist/general/active')) {
+        if (!$this->config->isSetFlag('wishlist/general/active', ScopeInterface::SCOPE_STORES)) {
             throw new NotFoundException(__('Page not found.'));
         }
     }

app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php

@@ -6,8 +6,12 @@
 
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Test for wishlist plugin before dispatch
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PluginTest extends \PHPUnit\Framework\TestCase
 {
@@ -175,7 +179,7 @@ public function testBeforeDispatch()
         $this->config
             ->expects($this->once())
             ->method('isSetFlag')
-            ->with('wishlist/general/active')
+            ->with('wishlist/general/active', ScopeInterface::SCOPE_STORES)
             ->willReturn(false);
 
         $this->getPlugin()->beforeDispatch($indexController, $this->request);

dev/tests/integration/testsuite/Magento/Customer/_files/customer_group_rollback.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Customer\Api\Data\GroupInterface;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+$groupRepository = $objectManager->get(GroupRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchBuilder */
+$searchBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchBuilder->addFilter(GroupInterface::CODE, 'custom_group')
+    ->create();
+$groups = $groupRepository->getList($searchCriteria)
+    ->getItems();
+foreach ($groups as $group) {
+    try {
+        $groupRepository->delete($group);
+    } catch (NoSuchEntityException $exception) {
+        //Group already removed
+    }
+}