Skip to content

Commit afe3bf7

Browse files
author
Oleksandr Rykh
authored
1.0.8 release (#7)
* 1.0.8 release * 1.0.8 release - fixed incorrect versions * 1.0.8 release - fixed incorrect versions * 1.0.8 release - move patch into correct folder * 1.0.8 release - fixed incorrect versions * 1.0.8 release - fix a patch
1 parent 378c715 commit afe3bf7

12 files changed

+1248
-3
lines changed

‎composer.json‎

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

‎patches.json‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,10 @@
427427
"MDVA-30977": {
428428
"magento/magento2-base": {
429429
"Fixes the issue with random products missing from categories after reindex.": {
430-
">=2.3.4 <2.4.0": {
430+
">=2.3.4 <2.3.5": {
431+
"file": "os/MDVA-30977__fixes_issue_with_missing_random_products_from_categories_after_reindex__2.3.4.patch"
432+
},
433+
">=2.3.5 <2.4.0": {
431434
"file": "os/MDVA-30977__fixes_issue_with_missing_random_products_from_categories_after_reindex__2.3.5-p1.patch"
432435
}
433436
}
@@ -643,5 +646,78 @@
643646
}
644647
}
645648
}
649+
},
650+
"MDVA-31242": {
651+
"magento/magento2-b2b-base": {
652+
"Fixes the issue where Wrong currency sign in Credit Memo grid is displayed.": {
653+
">=1.1.0 <1.2.1": {
654+
"file": "commerce/MDVA-31242__fixed_case_with_getting_collection_size__2.4.0.patch"
655+
}
656+
}
657+
}
658+
},
659+
"MDVA-31295": {
660+
"magento/magento2-ee-base": {
661+
"Fixes the issue where reward points are not calculated when a partial order completes and items are taxed.": {
662+
">=2.3.0 <2.4.2": {
663+
"file": "commerce/MDVA-31295__fixes_reward_points_are_not_calculated__2.3.1.patch"
664+
}
665+
}
666+
}
667+
},
668+
"MDVA-30112": {
669+
"magento/inventory-composer-metapackage": {
670+
"Fixes the issue where when there are orders more than the 'bunch-size' value, Magento considers the orders with 'pending' status as inconsistencies.": {
671+
">=1.1.4 <1.1.6": {
672+
"file": "os/MDVA-30112__fixes_the_issue_with_order_pending_status_is_inconsistency__2.3.5.patch"
673+
}
674+
}
675+
},
676+
"magento/inventory-metapackage": {
677+
"Fixes the issue where when there are orders more than the 'bunch-size' value, Magento considers the orders with 'pending' status as inconsistencies.": {
678+
">=1.2.0 <1.2.2": {
679+
"file": "os/MDVA-30112__fixes_the_issue_with_order_pending_status_is_inconsistency__2.3.5.patch"
680+
}
681+
}
682+
}
683+
},
684+
"MDVA-31150": {
685+
"magento/magento2-ee-base": {
686+
"Fixes the issue where Store Credit and Gift Card balances are not returned by GET Invoice Rest API call when Invoice was Posted by Rest API call and order was particularly paid by Store Credit and Gift Card accounts.": {
687+
">=2.3.0 <2.4.2": {
688+
"file": "commerce/MDVA-31150__fixes_issue_when_store_credit_and_gift_card_are_not_return__2.3.5-p2.patch"
689+
}
690+
}
691+
}
692+
},
693+
"MDVA-29954": {
694+
"magento/magento2-b2b-base": {
695+
"Fixes the issue where 'New Company Registration Request' and 'You've been linked to a company' emails were sent from wrong address.": {
696+
">=1.1.0 <1.1.6 || 1.2.0 || 1.3.0": {
697+
"file": "commerce/MDVA-29954__fixes_emails_were_sent_from_wrong_address__2.3.3.patch"
698+
}
699+
}
700+
}
701+
},
702+
"MDVA-28357": {
703+
"magento/magento2-base": {
704+
"Fixes the issue SKU search in Advanced Search page doesn't work": {
705+
">=2.3.2 <2.3.6 || >=2.4.0 <2.4.1": {
706+
"file": "os/MDVA-28357__fixes_the_issue_SKU_search_in_advanced_search__2.3.4-p2.patch"
707+
}
708+
}
709+
}
710+
},
711+
"MDVA-30963": {
712+
"magento/magento2-base": {
713+
"Fixes the issue Admin Product search filter not working as expected": {
714+
">=2.3.3 <2.4.2": {
715+
"file": "os/MDVA-30963__fixes_admin_product_search_filter__2.4.0.patch"
716+
},
717+
">=2.3.2 <2.3.3": {
718+
"file": "os/MDVA-32010__fixes_admin_product_search_filter__2.3.2.patch"
719+
}
720+
}
721+
}
646722
}
647723
}

‎patches/commerce/MDVA-29954__fixes_emails_were_sent_from_wrong_address__2.3.3.patch‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/vendor/magento/module-company/Model/Email/Sender.php b/vendor/magento/module-company/Model/Email/Sender.php
2+
index fe31d20f8..18960965e 100644
3+
--- a/vendor/magento/module-company/Model/Email/Sender.php
4+
+++ b/vendor/magento/module-company/Model/Email/Sender.php
5+
@@ -257,11 +257,6 @@ class Sender
6+
$mergedCustomerData = $this->customerData->getDataObjectByCustomer($customer, $companyId);
7+
8+
if ($companySuperUser && $mergedCustomerData) {
9+
- $sender = [
10+
- 'name' => $companySuperUser->getName(),
11+
- 'email' => $companySuperUser->getEmail()
12+
- ];
13+
-
14+
$mergedCustomerData->setData('companyAdminEmail', $companySuperUser->getEmail());
15+
$this->sendEmailTemplate(
16+
$customer->getEmail(),
17+
@@ -270,7 +265,7 @@ class Sender
18+
ScopeInterface::SCOPE_STORE,
19+
$customer->getStoreId()
20+
),
21+
- $sender,
22+
+ $this->xmlPathRegisterEmailIdentity,
23+
['customer' => $mergedCustomerData],
24+
$customer->getStoreId()
25+
);
26+
@@ -308,10 +303,7 @@ class Sender
27+
$recipient,
28+
$toName,
29+
$this->emailTemplateConfig->getCompanyCreateNotifyAdminTemplateId(),
30+
- [
31+
- 'email' => $customer->getEmail(),
32+
- 'name' => $this->customerViewHelper->getCustomerName($customer)
33+
- ],
34+
+ $this->xmlPathRegisterEmailIdentity,
35+
[
36+
'customer' => $customer->getFirstname(),
37+
'company' => $companyName,

‎patches/commerce/MDVA-31150__fixes_issue_when_store_credit_and_gift_card_are_not_return__2.3.5-p2.patch‎

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
diff --git a/vendor/magento/module-customer-balance/Model/Plugin/InvoiceRepository.php b/vendor/magento/module-customer-balance/Model/Plugin/InvoiceRepository.php
2+
index b88514d7f78..21a1c82ff0f 100644
3+
--- a/vendor/magento/module-customer-balance/Model/Plugin/InvoiceRepository.php
4+
+++ b/vendor/magento/module-customer-balance/Model/Plugin/InvoiceRepository.php
5+
@@ -5,22 +5,29 @@
6+
*/
7+
namespace Magento\CustomerBalance\Model\Plugin;
8+
9+
+use Magento\Sales\Api\Data\InvoiceExtension;
10+
+use Magento\Sales\Api\Data\InvoiceExtensionFactory;
11+
use Magento\Sales\Api\Data\InvoiceInterface;
12+
+use Magento\Sales\Api\Data\InvoiceSearchResultInterface;
13+
+use Magento\Sales\Api\InvoiceRepositoryInterface;
14+
15+
+/**
16+
+ * Plugin for Invoice repository
17+
+ */
18+
class InvoiceRepository
19+
{
20+
/**
21+
- * @var \Magento\Sales\Api\Data\InvoiceExtensionFactory
22+
+ * @var InvoiceExtensionFactory
23+
*/
24+
private $extensionFactory;
25+
26+
/**
27+
* Init plugin
28+
*
29+
- * @param \Magento\Sales\Api\Data\InvoiceExtensionFactory $invoiceExtensionFactory
30+
+ * @param InvoiceExtensionFactory $invoiceExtensionFactory
31+
*/
32+
public function __construct(
33+
- \Magento\Sales\Api\Data\InvoiceExtensionFactory $invoiceExtensionFactory
34+
+ InvoiceExtensionFactory $invoiceExtensionFactory
35+
) {
36+
$this->extensionFactory = $invoiceExtensionFactory;
37+
}
38+
@@ -28,16 +35,16 @@ class InvoiceRepository
39+
/**
40+
* Get invoice customer balance
41+
*
42+
- * @param \Magento\Sales\Api\InvoiceRepositoryInterface $subject
43+
- * @param \Magento\Sales\Api\Data\InvoiceInterface $resultEntity
44+
- * @return \Magento\Sales\Api\Data\InvoiceInterface
45+
+ * @param InvoiceRepositoryInterface $subject
46+
+ * @param InvoiceInterface $resultEntity
47+
+ * @return InvoiceInterface
48+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
49+
*/
50+
public function afterGet(
51+
- \Magento\Sales\Api\InvoiceRepositoryInterface $subject,
52+
- \Magento\Sales\Api\Data\InvoiceInterface $resultEntity
53+
+ InvoiceRepositoryInterface $subject,
54+
+ InvoiceInterface $resultEntity
55+
) {
56+
- /** @var \Magento\Sales\Api\Data\InvoiceExtension $extensionAttributes */
57+
+ /** @var InvoiceExtension $extensionAttributes */
58+
$extensionAttributes = $resultEntity->getExtensionAttributes();
59+
if ($extensionAttributes === null) {
60+
$extensionAttributes = $this->extensionFactory->create();
61+
@@ -51,14 +58,16 @@ class InvoiceRepository
62+
}
63+
64+
/**
65+
- * @param \Magento\Sales\Api\InvoiceRepositoryInterface $subject
66+
- * @param \Magento\Sales\Api\Data\InvoiceSearchResultInterface $resultInvoice
67+
- * @return \Magento\Sales\Api\Data\InvoiceSearchResultInterface
68+
+ * Add customer balance amount information to invoice list
69+
+ *
70+
+ * @param InvoiceRepositoryInterface $subject
71+
+ * @param InvoiceSearchResultInterface $resultInvoice
72+
+ * @return InvoiceSearchResultInterface
73+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
74+
*/
75+
public function afterGetList(
76+
- \Magento\Sales\Api\InvoiceRepositoryInterface $subject,
77+
- \Magento\Sales\Api\Data\InvoiceSearchResultInterface $resultInvoice
78+
+ InvoiceRepositoryInterface $subject,
79+
+ InvoiceSearchResultInterface $resultInvoice
80+
) {
81+
/** @var InvoiceInterface $invoice */
82+
foreach ($resultInvoice->getItems() as $invoice) {
83+
@@ -70,19 +79,25 @@ class InvoiceRepository
84+
/**
85+
* Add customer balance amount information to invoice
86+
*
87+
- * @param \Magento\Sales\Api\InvoiceRepositoryInterface $subject
88+
- * @param \Magento\Sales\Api\Data\InvoiceInterface $entity
89+
+ * @param InvoiceRepositoryInterface $subject
90+
+ * @param InvoiceInterface $entity
91+
*
92+
* @return void
93+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
94+
*/
95+
public function beforeSave(
96+
- \Magento\Sales\Api\InvoiceRepositoryInterface $subject,
97+
- \Magento\Sales\Api\Data\InvoiceInterface $entity
98+
+ InvoiceRepositoryInterface $subject,
99+
+ InvoiceInterface $entity
100+
) {
101+
$extensionAttributes = $entity->getExtensionAttributes();
102+
- if ($extensionAttributes) {
103+
+ if (!$extensionAttributes) {
104+
+ return;
105+
+ }
106+
+
107+
+ if ($extensionAttributes->getCustomerBalanceAmount() !== null) {
108+
$entity->setCustomerBalanceAmount($extensionAttributes->getCustomerBalanceAmount());
109+
+ }
110+
+ if ($extensionAttributes->getBaseCustomerBalanceAmount() !== null) {
111+
$entity->setBaseCustomerBalanceAmount($extensionAttributes->getBaseCustomerBalanceAmount());
112+
}
113+
}
114+
diff --git a/vendor/magento/module-gift-card-account/Model/Plugin/InvoiceRepository.php b/vendor/magento/module-gift-card-account/Model/Plugin/InvoiceRepository.php
115+
index 8b9bb605033..ba681ffd49a 100644
116+
--- a/vendor/magento/module-gift-card-account/Model/Plugin/InvoiceRepository.php
117+
+++ b/vendor/magento/module-gift-card-account/Model/Plugin/InvoiceRepository.php
118+
@@ -5,38 +5,44 @@
119+
*/
120+
namespace Magento\GiftCardAccount\Model\Plugin;
121+
122+
+use Magento\Sales\Api\Data\InvoiceExtension;
123+
+use Magento\Sales\Api\Data\InvoiceExtensionFactory;
124+
+use Magento\Sales\Api\Data\InvoiceInterface;
125+
+use Magento\Sales\Api\Data\InvoiceSearchResultInterface;
126+
+use Magento\Sales\Api\InvoiceRepositoryInterface;
127+
+
128+
/**
129+
* Plugin for Invoice repository.
130+
*/
131+
class InvoiceRepository
132+
{
133+
/**
134+
- * @var \Magento\Sales\Api\Data\InvoiceExtensionFactory
135+
+ * @var InvoiceExtensionFactory
136+
*/
137+
private $extensionFactory;
138+
139+
/**
140+
- * @param \Magento\Sales\Api\Data\InvoiceExtensionFactory $extensionFactory
141+
+ * @param InvoiceExtensionFactory $extensionFactory
142+
*/
143+
public function __construct(
144+
- \Magento\Sales\Api\Data\InvoiceExtensionFactory $extensionFactory
145+
+ InvoiceExtensionFactory $extensionFactory
146+
) {
147+
$this->extensionFactory = $extensionFactory;
148+
}
149+
150+
/**
151+
- * @param \Magento\Sales\Api\InvoiceRepositoryInterface $subject
152+
- * @param \Magento\Sales\Api\Data\InvoiceInterface $entity
153+
- *
154+
- * @return \Magento\Sales\Api\Data\InvoiceInterface
155+
+ * Sets gift card account data from extension attributes to Invoice models after get
156+
*
157+
+ * @param InvoiceRepositoryInterface $subject
158+
+ * @param InvoiceInterface $entity
159+
+ * @return InvoiceInterface
160+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
161+
*/
162+
public function afterGet(
163+
- \Magento\Sales\Api\InvoiceRepositoryInterface $subject,
164+
- \Magento\Sales\Api\Data\InvoiceInterface $entity
165+
+ InvoiceRepositoryInterface $subject,
166+
+ InvoiceInterface $entity
167+
) {
168+
- /** @var \Magento\Sales\Api\Data\InvoiceExtension $extensionAttributes */
169+
+ /** @var InvoiceExtension $extensionAttributes */
170+
$extensionAttributes = $entity->getExtensionAttributes();
171+
172+
if ($extensionAttributes === null) {
173+
@@ -52,16 +58,17 @@ class InvoiceRepository
174+
}
175+
176+
/**
177+
- * @param \Magento\Sales\Api\InvoiceRepositoryInterface $subject
178+
- * @param \Magento\Sales\Api\Data\InvoiceSearchResultInterface $entities
179+
+ * Sets gift card account data from extension attributes to Invoice models after get list
180+
*
181+
- * @return \Magento\Sales\Api\Data\InvoiceSearchResultInterface
182+
+ * @param InvoiceRepositoryInterface $subject
183+
+ * @param InvoiceSearchResultInterface $entities
184+
+ * @return InvoiceSearchResultInterface
185+
*/
186+
public function afterGetList(
187+
- \Magento\Sales\Api\InvoiceRepositoryInterface $subject,
188+
- \Magento\Sales\Api\Data\InvoiceSearchResultInterface $entities
189+
+ InvoiceRepositoryInterface $subject,
190+
+ InvoiceSearchResultInterface $entities
191+
) {
192+
- /** @var \Magento\Sales\Api\Data\InvoiceInterface $entity */
193+
+ /** @var InvoiceInterface $entity */
194+
foreach ($entities->getItems() as $entity) {
195+
$this->afterGet($subject, $entity);
196+
}
197+
@@ -70,24 +77,26 @@ class InvoiceRepository
198+
}
199+
200+
/**
201+
- * Sets gift card account data from extension attributes
202+
- * to Invoice model.
203+
- *
204+
- * @param \Magento\Sales\Api\InvoiceRepositoryInterface $subject
205+
- * @param \Magento\Sales\Api\Data\InvoiceInterface $entity
206+
+ * Sets gift card account data from extension attributes to Invoice model before save
207+
*
208+
+ * @param InvoiceRepositoryInterface $subject
209+
+ * @param InvoiceInterface $entity
210+
* @return void
211+
- *
212+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
213+
*/
214+
public function beforeSave(
215+
- \Magento\Sales\Api\InvoiceRepositoryInterface $subject,
216+
- \Magento\Sales\Api\Data\InvoiceInterface $entity
217+
+ InvoiceRepositoryInterface $subject,
218+
+ InvoiceInterface $entity
219+
) {
220+
$extensionAttributes = $entity->getExtensionAttributes();
221+
+ if (!$extensionAttributes) {
222+
+ return;
223+
+ }
224+
225+
- if ($extensionAttributes) {
226+
+ if ($extensionAttributes->getGiftCardsAmount() !== null) {
227+
$entity->setGiftCardsAmount($extensionAttributes->getGiftCardsAmount());
228+
+ }
229+
+ if ($extensionAttributes->getBaseGiftCardsAmount() !== null) {
230+
$entity->setBaseGiftCardsAmount($extensionAttributes->getBaseGiftCardsAmount());
231+
}
232+
}

0 commit comments

Comments
 (0)