Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix duplicate automatic email for same product

Browse Source 
[MAILPOET-3254]

It was happening when a second order was placed which contained the same product and some additional product.
This commit is contained in:
wxa
2021-03-25 12:24:22 +03:00
committed by Veljko V
parent 599cfd5a8c
commit dd6aff01db
2 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php
View File

@ -128,17 +128,18 @@ class PurchasedProduct {
$schedulingCondition = function(Newsletter $automaticEmail) use ($orderedProducts, $subscriber) { $schedulingCondition = function(Newsletter $automaticEmail) use ($orderedProducts, $subscriber) {
$meta = $automaticEmail->getMeta(); $meta = $automaticEmail->getMeta();
if (empty($meta['option'])) return false; if (empty($meta['option'])) return false;
if ($this->repository->wasScheduledForSubscriber($automaticEmail->id, $subscriber->id)) {
$sentAllProducts = $this->repository->alreadySentAllProducts($automaticEmail->id, $subscriber->id, 'orderedProducts', $orderedProducts);
if ($sentAllProducts) return false;
}
$metaProducts = array_column($meta['option'], 'id'); $metaProducts = array_column($meta['option'], 'id');
$matchedProducts = array_intersect($metaProducts, $orderedProducts); $matchedProducts = array_intersect($metaProducts, $orderedProducts);
if (empty($matchedProducts)) return false;
return !empty($matchedProducts); if ($this->repository->wasScheduledForSubscriber($automaticEmail->id, $subscriber->id)) {
$sentAllProducts = $this->repository->alreadySentAllProducts($automaticEmail->id, $subscriber->id, 'orderedProducts', $matchedProducts);
if ($sentAllProducts) return false;
}
return true;
}; };
$this->loggerFactory->getLogger(self::SLUG)->addInfo( $this->loggerFactory->getLogger(self::SLUG)->addInfo(

34
tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php
View File

@ -162,9 +162,41 @@ class PurchasedProductTest extends \MailPoetTest {
$event->scheduleEmailWhenProductIsPurchased($orderId); $event->scheduleEmailWhenProductIsPurchased($orderId);
$queue1 = SendingQueue::where('newsletter_id', $newsletter->id)->findMany(); $queue1 = SendingQueue::where('newsletter_id', $newsletter->id)->findMany();
// Create a second order with the same product and some additional product.
// This was a cause for a duplicate email: https://mailpoet.atlassian.net/browse/MAILPOET-3254
$orderDetails = Stub::make(
new OrderDetails(),
[
'get_billing_email' => 'test@example.com',
'get_items' => function() use ($productId) {
return [
Stub::make(
\WC_Order_Item_Product::class,
[
'get_product_id' => $productId,
]
),
Stub::make(
\WC_Order_Item_Product::class,
[
'get_product_id' => '12345', // Dummy extra product ID
]
),
];
},
]
);
$orderDetails->total = 'order_total';
$orderId = 13;
$helper = Stub::make(WCHelper::class, [
'wcGetOrder' => $orderDetails,
]);
$event = new PurchasedProduct($helper);
$event->scheduleEmailWhenProductIsPurchased($orderId); $event->scheduleEmailWhenProductIsPurchased($orderId);
$queue2 = SendingQueue::where('newsletter_id', $newsletter->id)->findMany(); $queue2 = SendingQueue::where('newsletter_id', $newsletter->id)->findMany();
expect($queue1)->count(count($queue2)); expect($queue2)->count(count($queue1));
} }
public function testItDoesNotScheduleEmailWhenPurchasedProductDoesNotMatchConfiguredProductIds() { public function testItDoesNotScheduleEmailWhenPurchasedProductDoesNotMatchConfiguredProductIds() {