From 0583e770713679ac2547aa9d2d98886a3f1c75f0 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Wed, 3 Apr 2024 20:20:09 +0300 Subject: [PATCH] api2 edit --- erp24/api2/controllers/DataController.php | 34 +++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 5c8e598..70d7f17 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -606,7 +606,27 @@ class DataController extends BaseController { } } + $update = false; + if (!empty($start_time) && !empty($end_time)) { + $start_time_unix = strtotime($start_time); + $startMonth = date("Y-m-01"); + $end_time_unix = strtotime($end_time); + if ( + $startMonth <= (date("Y-m-d", strtotime($start_time))) + || + ($end_time_unix < (time() - 90 * 86400)) + ) { + $update = true; + } + } + $update = true; if (!empty($result['write_offs'])) { + if (!empty($start_time) and !empty($end_time)) { + if ($update) { + WriteOffs::deleteAll(['and', ['>=', 'date', $start_time], ['<=', 'date', $end_time]]); + } + } + foreach ($result["write_offs"] as $gi => $arr) { if (!empty($arr["error"])) { file_put_contents(self::OUT_DIR . '/created_write_offs_erp_error.txt', PHP_EOL . " " . $arr["id"] . " error=" . $arr["error"], FILE_APPEND); @@ -734,20 +754,6 @@ class DataController extends BaseController { } } - $update = false; - if (!empty($start_time) && !empty($end_time)) { - $start_time_unix = strtotime($start_time); - $startMonth = date("Y-m-01"); - $end_time_unix = strtotime($end_time); - if ( - $startMonth <= (date("Y-m-d", strtotime($start_time))) - || - ($end_time_unix < (time() - 90 * 86400)) - ) { - $update = true; - } - } - if (!empty($checks_dell) and !empty($start_time) and !empty($end_time)) { if ($update) { Sales::updateAll(['operation' => 'Удален'], ['and', ['>=', 'date', $start_time], ['<=', 'date', $end_time]]); -- 2.39.5