Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ecommerce orders deadlock issue 1175 #1178

Merged
merged 10 commits into from
May 26, 2020
Merged

Ecommerce orders deadlock issue 1175 #1178

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1ba60b
Added exception to prevent order rollback and filter to avoid unneces…
giorello May 22, 2020
a03dd65
Change parameter to avoid the creation of eCommerce rows with wrong d…
giorello May 22, 2020
1721e41
Whitespace removed (phpcs).
giorello May 22, 2020
9a41f1e
Whitespace removed (phpcs).
giorello May 22, 2020
25dbf19
Merge branch 'develop' into ecommerceOrdersDeadlockIssue-1175
giorello May 22, 2020
e23b9bf
Tests case added for markAsModified in Observer
giorello May 25, 2020
8074a77
Tests improved
giorello May 26, 2020
29472af
Fixed phpcs
giorello May 26, 2020
1713bf3
Fixed phpcs
giorello May 26, 2020
361db83
Fix phpcs
giorello May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/community/Ebizmarts/MailChimp/Model/Api/ItemSynchronizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ protected function addSyncDataToken($id, $token)

protected function markSyncDataAsModified($id)
{
$this->_updateSyncData($id, null, null, 1);
$this->_updateSyncData($id, null, null, 1, null, null, null, true);
}

protected function markSyncDataAsDeleted($id, $syncedFlag = null)
Expand Down
39 changes: 22 additions & 17 deletions app/code/community/Ebizmarts/MailChimp/Model/Observer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,27 +440,32 @@ public function newOrder(Varien_Event_Observer $observer)
$this->removeCampaignData();
$items = $order->getAllItems();

foreach ($items as $item) {
if ($this->isBundleItem($item) || $this->isConfigurableItem($item)) {
continue;
}
try {
foreach ($items as $item) {
if ($this->isBundleItem($item) || $this->isConfigurableItem($item)) {
continue;
}

$mailchimpStoreId = $helper->getMCStoreId($storeId);
$productId = $item->getProductId();
$dataProduct = $this->getMailchimpEcommerceSyncDataModel()->getEcommerceSyncDataItem(
$productId,
Ebizmarts_MailChimp_Model_Config::IS_PRODUCT,
$mailchimpStoreId
);
$mailchimpStoreId = $helper->getMCStoreId($storeId);
$productId = $item->getProductId();
$dataProduct = $this->getMailchimpEcommerceSyncDataModel()->getEcommerceSyncDataItem(
$productId,
Ebizmarts_MailChimp_Model_Config::IS_PRODUCT,
$mailchimpStoreId
);

$isMarkedAsDeleted = $dataProduct->getMailchimpSyncDeleted();
$isMarkedAsDeleted = $dataProduct->getMailchimpSyncDeleted();
$isMarkedAsModified = $dataProduct->getMailchimpSyncModified();

if (!$isMarkedAsDeleted) {
$apiProducts = $this->makeApiProduct();
$apiProducts->setMailchimpStoreId($mailchimpStoreId);
$apiProducts->setMagentoStoreId($storeId);
$apiProducts->update($productId);
if (!$isMarkedAsDeleted && !$isMarkedAsModified) {
$apiProducts = $this->makeApiProduct();
$apiProducts->setMailchimpStoreId($mailchimpStoreId);
$apiProducts->setMagentoStoreId($storeId);
$apiProducts->update($productId);
}
}
} catch (Exception $e) {
$helper->logError($e->getMessage());
}
}

Expand Down