Skip to content

Commit 82c349f

Browse files
apoltoratskyiapoltoratskyi
authored
Merge pull request #104 from magento-commerce/1.1.20-release
1.1.20 release
2 parents 2d29ccc + 4e97730 commit 82c349f

18 files changed

+2646
-5
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/quality-patches",
33
"description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
44
"type": "magento2-component",
5-
"version": "1.1.19",
5+
"version": "1.1.20",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎patches-info.json

+1-1
Large diffs are not rendered by default.

‎patches/commerce/ACSD-46520_2.4.3-p2.patch

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php b/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php
2+
index 2e3ef806b34..71f927501bb 100644
3+
--- a/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php
4+
+++ b/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php
5+
@@ -73,14 +73,13 @@ class Balance
6+
$order->setCustomerBalanceRefunded(
7+
$order->getCustomerBalanceRefunded() + $customerBalanceRefunded
8+
);
9+
+ $this->orderRepository->save($order);
10+
$status = $order->getConfig()->getStateDefaultStatus($order->getState());
11+
$comment = __(
12+
'We refunded %1 to Store Credit',
13+
$order->getBaseCurrency()->formatTxt($customerBalanceRefunded)
14+
);
15+
$order->addCommentToStatusHistory($comment, $status, false);
16+
- $this->orderRepository->save($order);
17+
-
18+
$websiteId = $this->storeManager->getStore($order->getStoreId())->getWebsiteId();
19+
20+
$this->balanceFactory->create()
21+
diff --git a/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php b/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php
22+
index 5d77925ebfe..69cbb29adc5 100644
23+
--- a/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php
24+
+++ b/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php
25+
@@ -63,7 +63,8 @@ class CreditMemoResolver
26+
return true;
27+
}
28+
29+
- if ($this->comparator->equal((float)$subject->getBaseTotalPaid(), $totalRefunded)) {
30+
+ // If total invoiced is equal to total refunded amount then CreditMemo can not be created anymore
31+
+ if ($this->comparator->equal($totalRefunded, $totalInvoiced)) {
32+
return false;
33+
}
34+

‎patches/commerce/MDVA-44315_2.4.2.patch

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
diff --git a/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php b/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php
2+
index 735fef3d49b..c6160827811 100644
3+
--- a/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php
4+
+++ b/vendor/magento/module-customer-balance/Model/Creditmemo/Balance.php
5+
@@ -9,7 +9,9 @@ namespace Magento\CustomerBalance\Model\Creditmemo;
6+
7+
use Magento\CustomerBalance\Model\Balance\History;
8+
use Magento\CustomerBalance\Model\BalanceFactory;
9+
+use Magento\Framework\App\ObjectManager;
10+
use Magento\Framework\Exception\NoSuchEntityException;
11+
+use Magento\Sales\Api\OrderRepositoryInterface;
12+
use Magento\Sales\Model\Order\Creditmemo;
13+
use Magento\Store\Model\StoreManagerInterface;
14+
15+
@@ -28,22 +30,31 @@ class Balance
16+
*/
17+
private $storeManager;
18+
19+
+ /**
20+
+ * @var OrderRepositoryInterface
21+
+ */
22+
+ private $orderRepository;
23+
+
24+
/**
25+
* @param BalanceFactory $balanceFactory
26+
* @param StoreManagerInterface $storeManager
27+
+ * @param OrderRepositoryInterface|null $orderRepository
28+
*/
29+
public function __construct(
30+
BalanceFactory $balanceFactory,
31+
- StoreManagerInterface $storeManager
32+
+ StoreManagerInterface $storeManager,
33+
+ ?OrderRepositoryInterface $orderRepository = null
34+
) {
35+
$this->balanceFactory = $balanceFactory;
36+
$this->storeManager = $storeManager;
37+
+ $this->orderRepository = $orderRepository ?: ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
38+
}
39+
40+
/**
41+
* Save refunded customer balance.
42+
*
43+
* @param Creditmemo $creditmemo
44+
+ * @return void
45+
* @throws NoSuchEntityException
46+
*/
47+
public function save(Creditmemo $creditmemo) :void
48+
@@ -63,6 +74,7 @@ class Balance
49+
$order->setCustomerBalanceRefunded(
50+
$order->getCustomerBalanceRefunded() + $customerBalanceRefunded
51+
);
52+
+ $this->orderRepository->save($order);
53+
$status = $order->getConfig()->getStateDefaultStatus($order->getState());
54+
$comment = __(
55+
'We refunded %1 to Store Credit',
56+
diff --git a/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php b/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php
57+
index 5d77925ebfe..69cbb29adc5 100644
58+
--- a/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php
59+
+++ b/vendor/magento/module-customer-balance/Plugin/CreditMemoResolver.php
60+
@@ -63,7 +63,8 @@ class CreditMemoResolver
61+
return true;
62+
}
63+
64+
- if ($this->comparator->equal((float)$subject->getBaseTotalPaid(), $totalRefunded)) {
65+
+ // If total invoiced is equal to total refunded amount then CreditMemo can not be created anymore
66+
+ if ($this->comparator->equal($totalRefunded, $totalInvoiced)) {
67+
return false;
68+
}
69+

‎patches/os/ACSD-44851_2.4.4.patch

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
2+
index a47e2efdb8d1..ed958adf3364 100644
3+
--- a/lib/web/mage/menu.js
4+
+++ b/lib/web/mage/menu.js
5+
@@ -437,6 +437,22 @@ define([
6+
target = $(event.target).closest('.ui-menu-item');
7+
target.get(0).scrollIntoView();
8+
9+
+ // Open submenu on click
10+
+ if (target.has('.ui-menu').length) {
11+
+ this.expand(event);
12+
+ } else if (!this.element.is(':focus') &&
13+
+ $(this.document[0].activeElement).closest('.ui-menu').length
14+
+ ) {
15+
+ // Redirect focus to the menu
16+
+ this.element.trigger('focus', [true]);
17+
+
18+
+ // If the active item is on the top level, let it stay active.
19+
+ // Otherwise, blur the active item since it is no longer visible.
20+
+ if (this.active && this.active.parents('.ui-menu').length === 1) { //eslint-disable-line
21+
+ clearTimeout(this.timer);
22+
+ }
23+
+ }
24+
+
25+
if (!target.hasClass('level-top') || !target.has('.ui-menu').length) {
26+
window.location.href = target.find('> a').attr('href');
27+
}

‎patches/os/ACSD-45675_2.4.3.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/vendor/magento/module-catalog-import-export/Model/Export/Product.php b/vendor/magento/module-catalog-import-export/Model/Export/Product.php
2+
index 4a2ca0b4ec5..42329cb7c55 100644
3+
--- a/vendor/magento/module-catalog-import-export/Model/Export/Product.php
4+
+++ b/vendor/magento/module-catalog-import-export/Model/Export/Product.php
5+
@@ -448,6 +448,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
6+
{
7+
$collection = $this->_categoryColFactory->create()->addNameToResult();
8+
/* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
9+
+ $collection->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
10+
foreach ($collection as $category) {
11+
$structure = preg_split('#/+#', $category->getPath());
12+
$pathSize = count($structure);

0 commit comments

Comments
 (0)