RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-02 19:33:14 +03:00
Code Issues Projects Releases Wiki Activity

Fixed the error with same client addresses (#85)

Browse Source
This commit is contained in:
Dima Uryvskiy 2020-11-11 18:34:57 +03:00 committed by GitHub
parent f8620c9951
commit 41ce30b143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retailcrm/lib/RetailcrmOrderBuilder.php
View File

@ -196,6 +196,24 @@ class RetailcrmOrderBuilder
return (empty($this->apiSite) || is_bool($this->apiSite)) ? null : $this->apiSite; return (empty($this->apiSite) || is_bool($this->apiSite)) ? null : $this->apiSite;
} }
/**
* Clear object
*
* @return mixed
*/
public function reset()
{
$this->cmsOrder = null;
$this->cmsCart = null;
$this->cmsCustomer = null;
$this->invoiceAddress = null;
$this->deliveryAddress = null;
$this->createdCustomer = null;
$this->corporateCompanyExtractCache = null;
return $this;
}
/** /**
* Returns order with prepared customer data. Customer is created if it's not exist, shouldn't be called to just * Returns order with prepared customer data. Customer is created if it's not exist, shouldn't be called to just
* build order. * build order.

18
retailcrm/lib/events/RetailcrmExportEvent.php
View File

@ -65,11 +65,21 @@ class RetailcrmExportEvent extends RetailcrmAbstractEvent implements RetailcrmEv
$orderBuilder->defaultLangFromConfiguration()->setApi($api); $orderBuilder->defaultLangFromConfiguration()->setApi($api);
foreach ($orderRecords as $record) { foreach ($orderRecords as $record) {
$orderBuilder->reset();
$order = new Order($record['id_order']); $order = new Order($record['id_order']);
$orderCart = new Cart($order->id_cart); $orderCart = new Cart($order->id_cart);
$orderCustomer = new Customer($order->id_customer); $orderCustomer = new Customer($order->id_customer);
$orderBuilder->setCmsOrder($order);
if (!empty($orderCart->id)) {
$orderBuilder->setCmsCart($orderCart);
} else {
$orderBuilder->setCmsCart(null);
}
if (!empty($orderCustomer->id)) { if (!empty($orderCustomer->id)) {
$orderBuilder->setCmsCustomer($orderCustomer); $orderBuilder->setCmsCustomer($orderCustomer);
} else { } else {
@ -79,14 +89,6 @@ class RetailcrmExportEvent extends RetailcrmAbstractEvent implements RetailcrmEv
$orderBuilder->setCmsCustomer(null); $orderBuilder->setCmsCustomer(null);
} }
if (!empty($orderCart->id)) {
$orderBuilder->setCmsCart($orderCart);
} else {
$orderBuilder->setCmsCart(null);
}
$orderBuilder->setCmsOrder($order);
try { try {
$orders[] = $orderBuilder->buildOrderWithPreparedCustomer(); $orders[] = $orderBuilder->buildOrderWithPreparedCustomer();
} catch (\InvalidArgumentException $exception) { } catch (\InvalidArgumentException $exception) {