Merge branch 'ACP2E-2905-2' of https://github.com/adobe-commerce-tier-4/magento2ce into 04-29-24-Tier4-Bugfix-Delivery

thiaramus · thiaramus · commit 6d41441dcc59 · 2024-04-30T08:35:53.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -296,7 +296,9 @@ public function preparePriceData(array $priceData, $productTypeId, $websiteId)
             } elseif ($v['website_id'] == 0 && !isset($data[$key])) {
                 $data[$key] = $v;
                 $data[$key]['website_id'] = $websiteId;
-                if ($this->_isPriceFixed($price)) {
+                if ($this->_isPriceFixed($price) &&
+                    $this->isPercentageValue($data[$key])
+                ) {
                     $data[$key]['price'] = $v['price'] * $rates[$websiteId]['rate'];
                     $data[$key]['website_price'] = $v['price'] * $rates[$websiteId]['rate'];
                 }
@@ -466,4 +468,15 @@ private function getMetadataPool()
         }
         return $this->metadataPool;
     }
+
+    /**
+     * Check if data consists of percentage value
+     *
+     * @param array $data
+     * @return bool
+     */
+    private function isPercentageValue(array $data): bool
+    {
+        return (array_key_exists('percentage_value', $data) && $data['percentage_value'] === null);
+    }
 }
diff --git a/app/code/Magento/Checkout/Model/Plugin/RecollectQuoteOnCustomerGroupChange.php b/app/code/Magento/Checkout/Model/Plugin/RecollectQuoteOnCustomerGroupChange.php
@@ -8,13 +8,17 @@
 namespace Magento\Checkout\Model\Plugin;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Recollect quote when customer group updated through API
@@ -31,18 +35,36 @@ class RecollectQuoteOnCustomerGroupChange
      */
     private $customerRepository;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StoreManagerInterface $storeManager
+     */
+    private $storeManager;
+
     /**
      * Initialize Constructor
      *
      * @param CartRepositoryInterface $cartRepository
      * @param CustomerRepositoryInterface $customerRepository
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         CartRepositoryInterface $cartRepository,
-        CustomerRepositoryInterface $customerRepository
+        CustomerRepositoryInterface $customerRepository,
+        ?ScopeConfigInterface $scopeConfig = null,
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->cartRepository = $cartRepository;
         $this->customerRepository = $customerRepository;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()
+            ->get(ScopeConfigInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
@@ -82,11 +104,19 @@ public function aroundSave(
             && empty($previousCustomerData['taxvat'])
         ) {
             try {
-                /** @var Quote $quote */
-                $quote = $this->cartRepository->getActiveForCustomer($customer->getId());
-                $quote->setCustomerGroupId($customer->getGroupId());
-                $quote->collectTotals();
-                $this->cartRepository->save($quote);
+                $customerAccountShareScope = $this->scopeConfig->getValue(
+                    Share::XML_PATH_CUSTOMER_ACCOUNT_SHARE,
+                    ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+                );
+                if ($customerAccountShareScope === Share::SHARE_WEBSITE) {
+                    /** @var Quote $quote */
+                    $quote = $this->cartRepository->getActiveForCustomer($customer->getId());
+                    $quote->setCustomerGroupId($customer->getGroupId());
+                    $quote->collectTotals();
+                    $this->cartRepository->save($quote);
+                } else {
+                    $this->collectTotalsForCustomerGlobalScope($customer);
+                }
                 // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
             } catch (NoSuchEntityException $e) {
                 //no active cart for customer
@@ -95,4 +125,25 @@ public function aroundSave(
 
         return $result;
     }
+
+    /**
+     * Re-collect totals for customer share account global scope
+     *
+     * @param Customer|AbstractModel $customer
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    private function collectTotalsForCustomerGlobalScope(Customer|AbstractModel $customer): void
+    {
+        $allStores = $this->storeManager->getStores();
+        foreach ($allStores as $store) {
+            /** @var Quote $quote */
+            $quote = $this->cartRepository->getActiveForCustomer($customer->getId(), [$store->getId()]);
+            if ($quote) {
+                $quote->setCustomerGroupId($customer->getGroupId());
+                $quote->collectTotals();
+                $this->cartRepository->save($quote);
+            }
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -8,51 +8,64 @@
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\DataObject;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test class for \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice.
  *
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class TierpriceTest extends \PHPUnit\Framework\TestCase
+class TierpriceTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     protected $metadataPool;
 
     /**
-     * @var \Magento\Catalog\Model\ProductRepository
+     * @var ProductRepository
      */
     protected $productRepository;
 
     /**
-     * @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory
+     * @var ProductTierPriceInterfaceFactory
      */
     private $tierPriceFactory;
 
     /**
-     * @var \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice
+     * @var Tierprice
      */
     protected $_model;
 
     protected function setUp(): void
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice::class
+        $this->_model = Bootstrap::getObjectManager()->create(
+            Tierprice::class
         );
-        $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $this->productRepository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
-        $this->metadataPool = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\EntityManager\MetadataPool::class
+        $this->metadataPool = Bootstrap::getObjectManager()->create(
+            MetadataPool::class
         );
-        $this->tierPriceFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
+        $this->tierPriceFactory = Bootstrap::getObjectManager()
+            ->create(ProductTierPriceInterfaceFactory::class);
 
         $this->_model->setAttribute(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            Bootstrap::getObjectManager()->get(
                 \Magento\Eav\Model\Config::class
             )->getAttribute(
                 'catalog_product',
@@ -63,7 +76,7 @@ protected function setUp(): void
 
     public function testValidate()
     {
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $product->setTierPrice(
             [
                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
@@ -81,9 +94,9 @@ public function testValidate()
      */
     public function testValidateDuplicate(array $tierPricesData)
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $product->setTierPrice($tierPricesData);
 
         $this->_model->validate($product);
@@ -116,9 +129,9 @@ public function validateDuplicateDataProvider(): array
      */
     public function testValidateDuplicateWebsite()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $product->setTierPrice(
             [
                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
@@ -134,9 +147,9 @@ public function testValidateDuplicateWebsite()
      */
     public function testValidatePercentage()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $product->setTierPrice(
             [
                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'percentage_value' => 101],
@@ -149,15 +162,15 @@ public function testValidatePercentage()
     public function testPreparePriceData()
     {
         $data = [
-            ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-            ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 4],
-            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.4, 'price' => 3],
-            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => '5.40', 'price' => 2],
+            ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8, 'percentage_value' => 10],
+            ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5, 'percentage_value' => null],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5, 'percentage_value' => 40],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 4, 'percentage_value' => 10],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.4, 'price' => 3, 'percentage_value' => 50],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => '5.40', 'price' => 2, 'percentage_value' => null],
         ];
 
-        $newData = $this->_model->preparePriceData($data, \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE, 1);
+        $newData = $this->_model->preparePriceData($data, Type::TYPE_SIMPLE, 1);
         $this->assertCount(4, $newData);
         $this->assertArrayHasKey('1-2', $newData);
         $this->assertArrayHasKey('1-5', $newData);
@@ -167,9 +180,9 @@ public function testPreparePriceData()
 
     public function testAfterLoad()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $fixtureProduct = $this->productRepository->get('simple');
         $product->setId($fixtureProduct->getId());
@@ -185,14 +198,14 @@ public function testAfterLoad()
      * @dataProvider saveExistingProductDataProvider
      * @param array $tierPricesData
      * @param int $tierPriceCount
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\StateException
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
      */
     public function testSaveExistingProduct(array $tierPricesData, int $tierPriceCount): void
     {
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var $product Product */
         $product = $this->productRepository->get('simple', true);
         $tierPrices = [];
         foreach ($tierPricesData as $tierPrice) {
@@ -222,7 +235,7 @@ public function saveExistingProductDataProvider(): array
                         'website_id' => 0,
                         'customer_group_id' => 0,
                         'qty' => 10,
-                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                        'extension_attributes' => new DataObject(['percentage_value' => 50])
                     ],
                 ],
                 5,
@@ -237,7 +250,7 @@ public function saveExistingProductDataProvider(): array
                         'website_id' => 0,
                         'customer_group_id' => 0,
                         'qty' => 10,
-                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 10])
+                        'extension_attributes' => new DataObject(['percentage_value' => 10])
                     ],
                 ],
                 5,
@@ -251,7 +264,7 @@ public function saveExistingProductDataProvider(): array
                         'website_id' => 0,
                         'customer_group_id' => 0,
                         'qty' => 10,
-                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                        'extension_attributes' => new DataObject(['percentage_value' => 50])
                     ],
                 ],
                 4,
@@ -266,13 +279,13 @@ public function saveExistingProductDataProvider(): array
                         'website_id' => 0,
                         'customer_group_id' => 32000,
                         'qty' => 20,
-                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 90])
+                        'extension_attributes' => new DataObject(['percentage_value' => 90])
                     ],
                     [
                         'website_id' => 0,
                         'customer_group_id' => 0,
                         'qty' => 10,
-                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                        'extension_attributes' => new DataObject(['percentage_value' => 50])
                     ],
                 ],
                 6,
@@ -285,18 +298,18 @@ public function saveExistingProductDataProvider(): array
      * @dataProvider saveNewProductDataProvider
      * @param array $tierPricesData
      * @param int $tierPriceCount
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\StateException
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws LocalizedException
+     * @throws StateException
      */
     public function testSaveNewProduct(array $tierPricesData, int $tierPriceCount): void
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Model\Product::class);
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()
+            ->create(Product::class);
         $product->isObjectNew(true);
-        $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+        $product->setTypeId(Type::TYPE_SIMPLE)
             ->setAttributeSetId(4)
             ->setName('Simple Product New')
             ->setSku('simple product new')
@@ -330,7 +343,7 @@ public function saveNewProductDataProvider(): array
                         'website_id' => 0,
                         'customer_group_id' => 0,
                         'qty' => 10,
-                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                        'extension_attributes' => new DataObject(['percentage_value' => 50])
                     ],
                 ],
                 6,
