Merge pull request #9300 from adobe-commerce-tier-4/Tier4-Kings-PR-10-14-2024

[Support Tier-4-Kings glo28218] 10.14.2024 Regular delivery of bugfixes and improvements

Author: internal-magento-queue-manager[bot]

app/code/Magento/Catalog/view/frontend/web/js/related-products.js

@@ -47,14 +47,12 @@ define([
          * @return {Boolean} - Prevent default event action and event propagation.
          */
         _selectAllRelated: function (e) {
-            var innerHTML = this.options.relatedProductsCheckFlag ?
-                this.options.selectAllMessage : this.options.unselectAllMessage;
+            let isChecked = this.options.relatedProductsCheckFlag;
 
-            $(e.target).html(innerHTML);
-            $(this.options.relatedCheckbox + ':visible').attr(
-                'checked',
-                this.options.relatedProductsCheckFlag = !this.options.relatedProductsCheckFlag
-            );
+            $(e.target).html(isChecked ? this.options.selectAllMessage : this.options.unselectAllMessage);
+            this.options.relatedProductsCheckFlag = !isChecked;
+
+            $(this.options.relatedCheckbox + ':visible').prop('checked', this.options.relatedProductsCheckFlag);
             this._addRelatedToProduct();
 
             return false;

app/code/Magento/Directory/Test/Fixture/CurrencyRate.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Directory\Test\Fixture;
+
+use Magento\Directory\Model\Currency;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DataObject;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
+
+/**
+ * Data fixture for currency rate.
+ */
+class CurrencyRate implements RevertibleDataFixtureInterface
+{
+    /**
+     * @var FormatInterface
+     */
+    private $format;
+
+    /**
+     * @var Currency
+     */
+    private $currency;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    public function __construct(
+        FormatInterface $format,
+        Currency $currency,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->format = $format;
+        $this->currency = $currency;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    public function apply(array $data = []): ?DataObject
+    {
+        foreach ($data as $currencyCode => $rate) {
+            foreach ($rate as $currencyTo => $value) {
+                $value = abs((float) $this->format->getNumber($value));
+                $data[$currencyCode][$currencyTo] = $value;
+            }
+        }
+
+        return $this->currency->saveRates($data);
+    }
+
+    public function revert(DataObject $data): void
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $currencyTable = $this->resourceConnection->getTableName('directory_currency_rate');
+
+        foreach ($data as $currencyCode => $rate) {
+            foreach ($rate as $currencyTo) {
+                $connection->delete(
+                    $currencyTable,
+                    [
+                        'currency_from = ?' => $currencyCode,
+                        'currency_to = ?' => $currencyTo,
+                    ]
+                );
+            }
+        }
+    }
+}

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

@@ -694,12 +694,14 @@ protected function _prepareCustomerQuote($quote)
                         $hasDefaultBilling = true;
                     }
                 }
-                //save here new customer address
-                $shippingAddress->setCustomerId($quote->getCustomerId());
-                $this->addressRepository->save($shippingAddress);
-                $quote->addCustomerAddress($shippingAddress);
+                if (!$shippingAddress->getId()) {
+                    //save here new customer address
+                    $shippingAddress->setCustomerId($quote->getCustomerId());
+                    $this->addressRepository->save($shippingAddress);
+                    $quote->addCustomerAddress($shippingAddress);
+                    $this->addressesToSync[] = $shippingAddress->getId();
+                }
                 $shipping->setCustomerAddressData($shippingAddress);
-                $this->addressesToSync[] = $shippingAddress->getId();
                 $shipping->setCustomerAddressId($shippingAddress->getId());
             }
         }
@@ -727,11 +729,13 @@ protected function _prepareCustomerQuote($quote)
                     }
                     $billingAddress->setIsDefaultBilling(true);
                 }
-                $billingAddress->setCustomerId($quote->getCustomerId());
-                $this->addressRepository->save($billingAddress);
-                $quote->addCustomerAddress($billingAddress);
+                if (!$billingAddress->getId()) {
+                    $billingAddress->setCustomerId($quote->getCustomerId());
+                    $this->addressRepository->save($billingAddress);
+                    $quote->addCustomerAddress($billingAddress);
+                    $this->addressesToSync[] = $billingAddress->getId();
+                }
                 $billing->setCustomerAddressData($billingAddress);
-                $this->addressesToSync[] = $billingAddress->getId();
                 $billing->setCustomerAddressId($billingAddress->getId());
 
                 // Admin order: `Same As Billing Address`- when new billing address saved in address book

app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php

@@ -7,157 +7,37 @@
 
 namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
 
-use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency as BackendCurrency;
-use Magento\Directory\Model\Currency\DefaultLocator;
-use Magento\Directory\Model\CurrencyFactory;
 use Magento\Framework\Currency\Exception\CurrencyException;
 use Magento\Framework\DataObject;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Locale\CurrencyInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Adminhtml grid item renderer currency
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Currency extends BackendCurrency
 {
-    /**
-     * @var CurrencyFactory
-     */
-    private $currencyFactory;
-
-    /**
-     * @param Context $context
-     * @param StoreManagerInterface $storeManager
-     * @param DefaultLocator $currencyLocator
-     * @param CurrencyFactory $currencyFactory
-     * @param CurrencyInterface $localeCurrency
-     * @param array $data
-     */
-    public function __construct(
-        Context $context,
-        StoreManagerInterface $storeManager,
-        DefaultLocator $currencyLocator,
-        CurrencyFactory $currencyFactory,
-        CurrencyInterface $localeCurrency,
-        array $data = []
-    ) {
-        parent::__construct(
-            $context,
-            $storeManager,
-            $currencyLocator,
-            $currencyFactory,
-            $localeCurrency,
-            $data
-        );
-        $this->currencyFactory = $currencyFactory;
-    }
-
     /**
      * Renders grid column
      *
      * @param DataObject $row
      * @return string
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
      * @throws CurrencyException
      */
     public function render(DataObject $row)
     {
         $data = $row->getData($this->getColumn()->getIndex());
-        $currencyCode = $this->getStoreCurrencyCode($row);
+        $currencyCode = $this->_getCurrencyCode($row);
 
         if (!$currencyCode) {
             return $data;
         }
-        $rate = $this->getStoreCurrencyRate($currencyCode, $row);
-        $data = (float) $data * $rate;
+        $data = (float)$data * $this->_getRate($row);
         $data = sprintf('%f', $data);
-        return $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
-    }
-
-    /**
-     * Get admin currency code
-     *
-     * @return string
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    private function getAdminCurrencyCode(): string
-    {
-        $adminWebsiteId = (int) $this->_storeManager
-            ->getStore(Store::ADMIN_CODE)
-            ->getWebsiteId();
-        return (string) $this->_storeManager
-            ->getWebsite($adminWebsiteId)
-            ->getBaseCurrencyCode();
-    }
-
-    /**
-     * Get store currency code
-     *
-     * @param DataObject $row
-     * @return string
-     * @throws NoSuchEntityException
-     */
-    private function getStoreCurrencyCode(DataObject $row): string
-    {
-        $catalogPriceScope = $this->getCatalogPriceScope();
-        $storeId = $this->_request->getParam('store_ids');
-        if ($catalogPriceScope != 0 && !empty($storeId)) {
-            $currencyCode = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
-        } elseif ($catalogPriceScope != 0) {
-            $currencyCode = $this->_currencyLocator->getDefaultCurrency($this->_request);
-        } else {
-            $currencyCode = $this->_getCurrencyCode($row);
-        }
-        return $currencyCode;
-    }
-
-    /**
-     * Get store currency rate
-     *
-     * @param string $currencyCode
-     * @param DataObject $row
-     * @return float
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    private function getStoreCurrencyRate(string $currencyCode, DataObject $row): float
-    {
-        $catalogPriceScope = $this->getCatalogPriceScope();
-        $adminCurrencyCode = $this->getAdminCurrencyCode();
-
-        if (((int)$catalogPriceScope !== 0
-            && $adminCurrencyCode !== $currencyCode)) {
-            $currency = $this->currencyFactory->create()->load($adminCurrencyCode);
-            $currencyRate = $currency->getAnyRate($currencyCode);
-        } else {
-            $currencyRate = $this->_getRate($row);
-        }
-        return (float) $currencyRate;
-    }
-
-    /**
-     * Get catalog price scope from the admin config
-     *
-     * @return int
-     */
-    private function getCatalogPriceScope(): int
-    {
-        return (int) $this->_scopeConfig->getValue(
-            Store::XML_PATH_PRICE_SCOPE,
-            ScopeInterface::SCOPE_WEBSITE
-        );
+        $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
+        return $data;
     }
 }