From 2f309dee4a3f7fcab9f1348235a12e12673813e4 Mon Sep 17 00:00:00 2001 From: Grisha Pomadchin Date: Thu, 13 Mar 2014 12:07:52 +0400 Subject: [PATCH] history fix & new version --- intaro.intarocrm/classes/general/ICrmOrderActions.php | 8 +++----- intaro.intarocrm/install/version.php | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php index 29cd8ae2..49c42114 100755 --- a/intaro.intarocrm/classes/general/ICrmOrderActions.php +++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php @@ -368,9 +368,9 @@ class ICrmOrderActions $dateStart = $dateStart->format('Y-m-d H:i:s'); } - $orderHistory = $api->orderHistory($dateStart); + $dateFinish = new \DateTime(); - $dateStart = new \DateTime($dateStart); + $orderHistory = $api->orderHistory($dateStart); // pushing existing orders foreach ($orderHistory as $order) { @@ -866,13 +866,11 @@ class ICrmOrderActions // set PAYED if($optionsPayment[$order['paymentStatus']]) CSaleOrder::PayOrder($order['externalId'], $optionsPayment[$order['paymentStatus']]); - - $dateStart = new \DateTime(); } } if(count($orderHistory)) - COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, $dateStart->format('Y-m-d H:i:s')); + COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, $dateFinish->format('Y-m-d H:i:s')); $USER->Logout(); if($realUser) $USER->Authorize($realUser); diff --git a/intaro.intarocrm/install/version.php b/intaro.intarocrm/install/version.php index 0d5f1cb3..d04b3ed1 100644 --- a/intaro.intarocrm/install/version.php +++ b/intaro.intarocrm/install/version.php @@ -1,5 +1,5 @@ "0.5.3", - "VERSION_DATE" => "2014-01-28 12:55:00", + "VERSION" => "1.0.1", + "VERSION_DATE" => "2014-03-13 11:57:00", ); \ No newline at end of file