Skip to content

Commit 00e08b8

Browse files
sidolovsidolov
authored
ENGCOM-5591: Fix: Update customer email in quote #24049 
2 parents 44ee74d + 9e35b78 commit 00e08b8

File tree

3 files changed

+176
-0
lines changed

3 files changed

+176
-0
lines changed

‎app/code/Magento/Customer/Observer/UpgradeQuoteCustomerEmailObserver.php

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Customer\Observer;
9+
10+
use Magento\Framework\Event\ObserverInterface;
11+
use Magento\Framework\Event\Observer;
12+
use Magento\Framework\Exception\NoSuchEntityException;
13+
use Magento\Quote\Api\CartRepositoryInterface;
14+
15+
/**
16+
* Class observer UpgradeQuoteCustomerEmailObserver
17+
*/
18+
class UpgradeQuoteCustomerEmailObserver implements ObserverInterface
19+
{
20+
/**
21+
* @var CartRepositoryInterface
22+
*/
23+
private $quoteRepository;
24+
25+
/**
26+
* @param CartRepositoryInterface $quoteRepository
27+
*/
28+
public function __construct(
29+
CartRepositoryInterface $quoteRepository
30+
) {
31+
$this->quoteRepository = $quoteRepository;
32+
}
33+
34+
/**
35+
* Upgrade quote customer email when customer has changed email
36+
*
37+
* @param Observer $observer
38+
* @return void
39+
*/
40+
public function execute(Observer $observer): void
41+
{
42+
/** @var \Magento\Customer\Model\Data\Customer $customerOrig */
43+
$customerOrig = $observer->getEvent()->getOrigCustomerDataObject();
44+
if (!$customerOrig) {
45+
return;
46+
}
47+
48+
$emailOrig = $customerOrig->getEmail();
49+
50+
/** @var \Magento\Customer\Model\Data\Customer $customer */
51+
$customer = $observer->getEvent()->getCustomerDataObject();
52+
$email = $customer->getEmail();
53+
54+
if ($email == $emailOrig) {
55+
return;
56+
}
57+
58+
try {
59+
$quote = $this->quoteRepository->getForCustomer($customer->getId());
60+
$quote->setCustomerEmail($email);
61+
$this->quoteRepository->save($quote);
62+
} catch (NoSuchEntityException $e) {
63+
return;
64+
}
65+
}
66+
}

‎app/code/Magento/Customer/Test/Unit/Observer/UpgradeQuoteCustomerEmailObserverTest.php

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Customer\Test\Unit\Observer;
9+
10+
use Magento\Customer\Observer\UpgradeQuoteCustomerEmailObserver;
11+
12+
/**
13+
* Class UpgradeQuoteCustomerEmailObserverTest for testing upgrade quote customer email
14+
*/
15+
class UpgradeQuoteCustomerEmailObserverTest extends \PHPUnit\Framework\TestCase
16+
{
17+
/**
18+
* @var UpgradeQuoteCustomerEmailObserver
19+
*/
20+
protected $model;
21+
22+
/**
23+
* @var \Magento\Quote\Api\CartRepositoryInterface
24+
*/
25+
protected $quoteRepositoryMock;
26+
27+
/**
28+
* @var \Magento\Framework\Event\Observer
29+
*/
30+
protected $observerMock;
31+
32+
/**
33+
* @var \Magento\Framework\Event
34+
*/
35+
protected $eventMock;
36+
37+
/**
38+
* @inheritdoc
39+
*/
40+
protected function setUp()
41+
{
42+
$this->observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
43+
->disableOriginalConstructor()
44+
->getMock();
45+
46+
$this->eventMock = $this->getMockBuilder(\Magento\Framework\Event::class)
47+
->disableOriginalConstructor()
48+
->setMethods(['getCustomerDataObject', 'getOrigCustomerDataObject'])
49+
->getMock();
50+
51+
$this->observerMock->expects($this->any())->method('getEvent')->will($this->returnValue($this->eventMock));
52+
53+
$this->quoteRepositoryMock = $this
54+
->getMockBuilder(\Magento\Quote\Api\CartRepositoryInterface::class)
55+
->getMockForAbstractClass();
56+
$this->model = new UpgradeQuoteCustomerEmailObserver($this->quoteRepositoryMock);
57+
}
58+
59+
/**
60+
* Unit test for verifying quote customers email upgrade observer
61+
*/
62+
public function testUpgradeQuoteCustomerEmail()
63+
{
64+
$email = "test@test.com";
65+
$origEmail = "origtest@test.com";
66+
67+
$customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
68+
->disableOriginalConstructor()
69+
->getMock();
70+
$customerOrig = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
71+
->disableOriginalConstructor()
72+
->getMock();
73+
74+
$quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
75+
->setMethods(['setCustomerEmail'])
76+
->disableOriginalConstructor()
77+
->getMock();
78+
79+
$this->eventMock->expects($this->any())
80+
->method('getCustomerDataObject')
81+
->will($this->returnValue($customer));
82+
$this->eventMock->expects($this->any())
83+
->method('getOrigCustomerDataObject')
84+
->will($this->returnValue($customerOrig));
85+
86+
$customerOrig->expects($this->any())
87+
->method('getEmail')
88+
->willReturn($this->returnValue($origEmail));
89+
90+
$customer->expects($this->any())
91+
->method('getEmail')
92+
->willReturn($this->returnValue($email));
93+
94+
$this->quoteRepositoryMock->expects($this->once())
95+
->method('getForCustomer')
96+
->willReturn($quoteMock);
97+
98+
$quoteMock->expects($this->once())
99+
->method('setCustomerEmail');
100+
101+
$this->quoteRepositoryMock->expects($this->once())
102+
->method('save')
103+
->with($quoteMock);
104+
105+
$this->model->execute($this->observerMock);
106+
}
107+
}

‎app/code/Magento/Customer/etc/events.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@
1515
<event name="sales_quote_save_after">
1616
<observer name="customer_visitor" instance="Magento\Customer\Observer\Visitor\BindQuoteCreateObserver" />
1717
</event>
18+
<event name="customer_save_after_data_object">
19+
<observer name="upgrade_quote_customer_email" instance="Magento\Customer\Observer\UpgradeQuoteCustomerEmailObserver"/>
20+
</event>
1821
</config>

0 commit comments

Comments
 (0)