Skip to content

Commit 9ebee4b

Browse files
magento-engcom-teammagento-engcom-team
authored
[EngCom] Public Pull Requests - 2.3-develop
 - merged latest code from mainline branch
2 parents a4966fe + 3290565 commit 9ebee4b

File tree

22 files changed

+127
-64
lines changed

22 files changed

+127
-64
lines changed

‎app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
namespace Magento\ConfigurableProduct\Setup\Patch\Data;
88

9+
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
910
use Magento\Eav\Setup\EavSetup;
1011
use Magento\Eav\Setup\EavSetupFactory;
11-
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
1313
use Magento\Framework\Setup\Patch\DataPatchInterface;
1414
use Magento\Framework\Setup\Patch\PatchVersionInterface;
15-
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
1615

1716
/**
1817
* Class InstallInitialConfigurableAttributes
18+
*
1919
* @package Magento\ConfigurableProduct\Setup\Patch
2020
*/
2121
class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchVersionInterface
@@ -24,6 +24,7 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
2424
* @var ModuleDataSetupInterface
2525
*/
2626
private $moduleDataSetup;
27+
2728
/**
2829
* @var EavSetupFactory
2930
*/
@@ -43,7 +44,7 @@ public function __construct(
4344
}
4445

4546
/**
46-
* {@inheritdoc}
47+
* @inheritdoc
4748
*/
4849
public function apply()
4950
{
@@ -64,40 +65,43 @@ public function apply()
6465
'color'
6566
];
6667
foreach ($attributes as $attributeCode) {
67-
$relatedProductTypes = explode(
68-
',',
69-
$eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
70-
);
71-
if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
72-
$relatedProductTypes[] = Configurable::TYPE_CODE;
73-
$eavSetup->updateAttribute(
74-
\Magento\Catalog\Model\Product::ENTITY,
75-
$attributeCode,
76-
'apply_to',
77-
implode(',', $relatedProductTypes)
68+
$attribute = $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to');
69+
if ($attribute) {
70+
$relatedProductTypes = explode(
71+
',',
72+
$attribute
7873
);
74+
if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
75+
$relatedProductTypes[] = Configurable::TYPE_CODE;
76+
$eavSetup->updateAttribute(
77+
\Magento\Catalog\Model\Product::ENTITY,
78+
$attributeCode,
79+
'apply_to',
80+
implode(',', $relatedProductTypes)
81+
);
82+
}
7983
}
8084
}
8185
}
8286

8387
/**
84-
* {@inheritdoc}
88+
* @inheritdoc
8589
*/
8690
public static function getDependencies()
8791
{
8892
return [];
8993
}
9094

9195
/**
92-
* {@inheritdoc}
96+
* @inheritdoc
9397
*/
9498
public static function getVersion()
9599
{
96100
return '2.0.0';
97101
}
98102

99103
/**
100-
* {@inheritdoc}
104+
* @inheritdoc
101105
*/
102106
public function getAliases()
103107
{

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="CustomerLogoutStorefrontByMenuItemsActionGroup">
12-
<conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcome}}"
13-
dependentSelector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
12+
<conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
13+
dependentSelector="{{StorefrontPanelHeaderSection.customerLogoutLink}}"
1414
visible="false"
1515
stepKey="clickHeaderCustomerMenuButton" />
1616
<click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" />
1616
<element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
1717
<element name="notYouLink" type="button" selector=".greet.welcome span a"/>
18-
<element name="customerWelcome" type="text" selector=".panel.header .customer-welcome"/>
19-
<element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-menu"/>
18+
<element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
19+
<element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/>
2020
<element name="customerLoginLink" type="button" selector=".panel.header .header.links .authorization-link a" timeout="30"/>
2121
<element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
2222
</section>

‎app/code/Magento/Customer/view/frontend/templates/account/customer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
data-toggle="dropdown"
1717
data-trigger-keypress-button="true"
1818
data-bind="scope: 'customer'">
19-
<span data-bind="text: customer().fullname"></span>
2019
<button type="button"
2120
class="action switch"
2221
tabindex="-1"

‎app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use Magento\Store\Model\ScopeInterface;
1010

1111
/**
12+
* Saves data from order to purchased links.
13+
*
1214
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1315
*/
1416
class SaveDownloadableOrderItemObserver implements ObserverInterface
@@ -92,9 +94,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
9294
if ($purchasedLink->getId()) {
9395
return $this;
9496
}
97+
$storeId = $orderItem->getOrder()->getStoreId();
98+
$orderStatusToEnableItem = $this->_scopeConfig->getValue(
99+
\Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
100+
ScopeInterface::SCOPE_STORE,
101+
$storeId
102+
);
95103
if (!$product) {
96104
$product = $this->_createProductModel()->setStoreId(
97-
$orderItem->getOrder()->getStoreId()
105+
$storeId
98106
)->load(
99107
$orderItem->getProductId()
100108
);
@@ -150,6 +158,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
150158
)->setNumberOfDownloadsBought(
151159
$numberOfDownloads
152160
)->setStatus(
161+
\Magento\Sales\Model\Order\Item::STATUS_PENDING == $orderStatusToEnableItem ?
162+
\Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
153163
\Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
154164
)->setCreatedAt(
155165
$orderItem->getCreatedAt()
@@ -165,6 +175,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
165175
}
166176

167177
/**
178+
* Create purchased model.
179+
*
168180
* @return \Magento\Downloadable\Model\Link\Purchased
169181
*/
170182
protected function _createPurchasedModel()
@@ -173,6 +185,8 @@ protected function _createPurchasedModel()
173185
}
174186

175187
/**
188+
* Create product model.
189+
*
176190
* @return \Magento\Catalog\Model\Product
177191
*/
178192
protected function _createProductModel()
@@ -181,6 +195,8 @@ protected function _createProductModel()
181195
}
182196

183197
/**
198+
* Create purchased item model.
199+
*
184200
* @return \Magento\Downloadable\Model\Link\Purchased\Item
185201
*/
186202
protected function _createPurchasedItemModel()
@@ -189,6 +205,8 @@ protected function _createPurchasedItemModel()
189205
}
190206

191207
/**
208+
* Create items collection.
209+
*
192210
* @return \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection
193211
*/
194212
protected function _createItemsCollection()

‎app/code/Magento/Quote/Model/Quote/Item/Compare.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function getOptionValues($value)
5050
if (is_string($value) && $this->jsonValidator->isValid($value)) {
5151
$value = $this->serializer->unserialize($value);
5252
if (is_array($value)) {
53-
unset($value['qty'], $value['uenc']);
53+
unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
5454
$value = array_filter($value, function ($optionValue) {
5555
return !empty($optionValue);
5656
});

‎app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ public function __construct(
8989
* @param bool $forceSyncMode
9090
*
9191
* @return bool
92+
* @throws \Exception
9293
*/
9394
public function send(
9495
\Magento\Sales\Api\Data\OrderInterface $order,
9596
\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
9697
\Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
9798
$forceSyncMode = false
9899
) {
99-
$creditmemo->setSendEmail(true);
100+
$creditmemo->setSendEmail($this->identityContainer->isEnabled());
100101

101102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
102103
$transport = [
@@ -145,6 +146,7 @@ public function send(
145146
* @param \Magento\Sales\Api\Data\OrderInterface $order
146147
*
147148
* @return string
149+
* @throws \Exception
148150
*/
149151
private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
150152
{

‎app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class CreditmemoSender extends Sender
5757
* @param CreditmemoIdentity $identityContainer
5858
* @param Order\Email\SenderBuilderFactory $senderBuilderFactory
5959
* @param \Psr\Log\LoggerInterface $logger
60+
* @param Renderer $addressRenderer
6061
* @param PaymentHelper $paymentHelper
6162
* @param CreditmemoResource $creditmemoResource
6263
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
63-
* @param Renderer $addressRenderer
6464
* @param ManagerInterface $eventManager
6565
*/
6666
public function __construct(
@@ -96,10 +96,11 @@ public function __construct(
9696
* @param Creditmemo $creditmemo
9797
* @param bool $forceSyncMode
9898
* @return bool
99+
* @throws \Exception
99100
*/
100101
public function send(Creditmemo $creditmemo, $forceSyncMode = false)
101102
{
102-
$creditmemo->setSendEmail(true);
103+
$creditmemo->setSendEmail($this->identityContainer->isEnabled());
103104

104105
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
105106
$order = $creditmemo->getOrder();
@@ -146,6 +147,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
146147
*
147148
* @param Order $order
148149
* @return string
150+
* @throws \Exception
149151
*/
150152
protected function getPaymentHtml(Order $order)
151153
{

‎app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class InvoiceSender extends Sender
5757
* @param InvoiceIdentity $identityContainer
5858
* @param Order\Email\SenderBuilderFactory $senderBuilderFactory
5959
* @param \Psr\Log\LoggerInterface $logger
60+
* @param Renderer $addressRenderer
6061
* @param PaymentHelper $paymentHelper
6162
* @param InvoiceResource $invoiceResource
6263
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
63-
* @param Renderer $addressRenderer
6464
* @param ManagerInterface $eventManager
6565
*/
6666
public function __construct(
@@ -96,10 +96,11 @@ public function __construct(
9696
* @param Invoice $invoice
9797
* @param bool $forceSyncMode
9898
* @return bool
99+
* @throws \Exception
99100
*/
100101
public function send(Invoice $invoice, $forceSyncMode = false)
101102
{
102-
$invoice->setSendEmail(true);
103+
$invoice->setSendEmail($this->identityContainer->isEnabled());
103104

104105
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
105106
$order = $invoice->getOrder();
@@ -146,6 +147,7 @@ public function send(Invoice $invoice, $forceSyncMode = false)
146147
*
147148
* @param Order $order
148149
* @return string
150+
* @throws \Exception
149151
*/
150152
protected function getPaymentHtml(Order $order)
151153
{

‎app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class ShipmentSender extends Sender
5757
* @param ShipmentIdentity $identityContainer
5858
* @param Order\Email\SenderBuilderFactory $senderBuilderFactory
5959
* @param \Psr\Log\LoggerInterface $logger
60+
* @param Renderer $addressRenderer
6061
* @param PaymentHelper $paymentHelper
6162
* @param ShipmentResource $shipmentResource
6263
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
63-
* @param Renderer $addressRenderer
6464
* @param ManagerInterface $eventManager
6565
*/
6666
public function __construct(
@@ -96,10 +96,11 @@ public function __construct(
9696
* @param Shipment $shipment
9797
* @param bool $forceSyncMode
9898
* @return bool
99+
* @throws \Exception
99100
*/
100101
public function send(Shipment $shipment, $forceSyncMode = false)
101102
{
102-
$shipment->setSendEmail(true);
103+
$shipment->setSendEmail($this->identityContainer->isEnabled());
103104

104105
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
105106
$order = $shipment->getOrder();
@@ -146,6 +147,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
146147
*
147148
* @param Order $order
148149
* @return string
150+
* @throws \Exception
149151
*/
150152
protected function getPaymentHtml(Order $order)
151153
{

‎app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ public function __construct(
8989
* @param bool $forceSyncMode
9090
*
9191
* @return bool
92+
* @throws \Exception
9293
*/
9394
public function send(
9495
\Magento\Sales\Api\Data\OrderInterface $order,
9596
\Magento\Sales\Api\Data\InvoiceInterface $invoice,
9697
\Magento\Sales\Api\Data\InvoiceCommentCreationInterface $comment = null,
9798
$forceSyncMode = false
9899
) {
99-
$invoice->setSendEmail(true);
100+
$invoice->setSendEmail($this->identityContainer->isEnabled());
100101

101102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
102103
$transport = [
@@ -145,6 +146,7 @@ public function send(
145146
* @param \Magento\Sales\Api\Data\OrderInterface $order
146147
*
147148
* @return string
149+
* @throws \Exception
148150
*/
149151
private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
150152
{

‎app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ public function __construct(
8989
* @param bool $forceSyncMode
9090
*
9191
* @return bool
92+
* @throws \Exception
9293
*/
9394
public function send(
9495
\Magento\Sales\Api\Data\OrderInterface $order,
9596
\Magento\Sales\Api\Data\ShipmentInterface $shipment,
9697
\Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
9798
$forceSyncMode = false
9899
) {
99-
$shipment->setSendEmail(true);
100+
$shipment->setSendEmail($this->identityContainer->isEnabled());
100101

101102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
102103
$transport = [
@@ -145,6 +146,7 @@ public function send(
145146
* @param \Magento\Sales\Api\Data\OrderInterface $order
146147
*
147148
* @return string
149+
* @throws \Exception
148150
*/
149151
private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
150152
{

0 commit comments

Comments
 (0)