RetailCRM-Mirror/legacy
1
0
Fork 0
mirror of https://github.com/retailcrm/legacy.git synced 2025-04-04 14:13:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from dmamontov/master

Browse source 
fix api error parse, add trim in filter, add search edit in updateCustomers
This commit is contained in:
Alex Lushpai 2015-10-30 14:30:50 +03:00
commit af8ec4657a
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
retailcrm/src/Components/RequestProxy.php
View file

@ -28,6 +28,10 @@ class RequestProxy
if (isset($response['errors'])) {
foreach ($response['errors'] as $error) {
if (is_array($error)) {
$error = @implode(', ', $error);
}
$this->logger->write(
"[$method] $error \n",
$this->container->errorLog

15
retailcrm/src/Helpers/ApiHelper.php
View file

@ -76,11 +76,15 @@ class ApiHelper
$this->logger->put($timemark, $this->container->customersLog);
}
public function updateCustomers($customers)
public function updateCustomers($customers, $searchEdit = false)
{
$timemark = date('Y-m-d H:i:s');
foreach ($customers as $customer) {
$this->api->ordersEdit($customer);
if ($searchEdit) {
$this->checkCustomers($customer, true);
} else {
$this->api->ordersEdit($customer);
}
time_nanosleep(0, 250000000);
}
@ -151,7 +155,7 @@ class ApiHelper
return $orders;
}
private function checkCustomers($customer)
private function checkCustomers($customer, $searchEdit = false)
{
$criteria = array(
@ -189,6 +193,11 @@ class ApiHelper
$_externalId = $customer['externalId'];
};
if ($searchEdit) {
$customer['externalId'] = $_externalId;
$this->api->customersEdit($customer);
}
return $_externalId;
}
} else {

2
retailcrm/src/Helpers/DataHelper.php
View file

@ -25,6 +25,8 @@ class DataHelper
if (is_null($haystack[$key]) || $haystack[$key] === '' || count($haystack[$key]) == 0) {
unset($haystack[$key]);
} elseif (!is_array($value)) {
$haystack[$key] = trim($value);
}
}