From 3cca3ae13a7cc9afbb0dcafc1d2b4589c5dcc88a Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 6 Jun 2024 13:35:52 +0300 Subject: [PATCH] fix part 001 --- erp24/controllers/OrdersController.php | 2 + erp24/modul/orders/collation.php | 107 +++++++++++++++---------- erp24/views/orders/collation.php | 5 ++ 3 files changed, 71 insertions(+), 43 deletions(-) create mode 100644 erp24/views/orders/collation.php diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php index e4147dcb..def5f554 100644 --- a/erp24/controllers/OrdersController.php +++ b/erp24/controllers/OrdersController.php @@ -51,6 +51,8 @@ class OrdersController extends Controller public function actionAjaxCreateCheckJson() { return $this->renderPartial('ajax-create-check-json'); } public function actionAjaxCheckRemove() { return $this->renderPartial('ajax-check-remove'); } + public function actionCollation() { return $this->render('collation'); } + public function actionDelivery2() { if (!empty($_REQUEST["umoup"])) { diff --git a/erp24/modul/orders/collation.php b/erp24/modul/orders/collation.php index 4bf0166d..90e43f77 100644 --- a/erp24/modul/orders/collation.php +++ b/erp24/modul/orders/collation.php @@ -1,14 +1,13 @@ -Сверка интернет магазин -
+ @@ -85,14 +84,14 @@ unset($status_ar2[38207182]); //foreach($status_ar2 as $id =>$name) echo""; -$data = $db::getRows("SELECT id, name FROM admin WHERE 1 "); +$data = $db::getRows("SELECT id, name FROM admin WHERE 1 = 1"); foreach($data as $row) $users_arr[$row["id"]]=$row["name"]; -$data = $db::getRows("SELECT id, name FROM products_1c WHERE tip='city_store' "); +$data = $db::getRows("SELECT id, name FROM products_1c WHERE tip='city_store'"); foreach($data as $row) $stores_arr[$row["id"]]=$row["name"]; -$data = $db::getRows("SELECT id, name FROM city_store WHERE 1 "); +$data = $db::getRows("SELECT id, name FROM city_store WHERE 1 = 1"); foreach($data as $row) $store_arr[$row["id"]]=$row["name"]; @@ -120,7 +119,7 @@ if(!empty($delivery_arr_in)) $where0 .=" ) "; $where2=""; -foreach($_REQUEST["statuses"] as $is =>$idf) { +foreach($_REQUEST["statuses"] ?? [] as $is =>$idf) { if($idf=='on') $where2 .=" or status_id='$is'"; } @@ -134,7 +133,7 @@ foreach($_REQUEST["statuses"] as $is =>$idf) { -$data= $db::getRows("SELECT * FROM orders_cheking WHERE date>=NOW()- INTERVAL 17 day "); +$data= $db::getRows("SELECT * FROM orders_cheking WHERE date>=NOW()::date- INTERVAL '17 day'"); foreach($data as $row) { $orders_cheking_array[$row["amo_id"]]=" ".$row["name"]." ".$row["date"]." ".$row["delivery_date"]." ".$users_arr[$row["admin_id"]]." ".$row["status"]." "; $orders_cheking_status_array[$row["amo_id"]]=$row["status"]; @@ -144,7 +143,7 @@ foreach($data as $row) { -$checkarr= $db::getRows("SELECT * FROM sales WHERE date>=NOW()- INTERVAL 120 day order by date DESC"); +$checkarr= $db::getRows("SELECT * FROM sales WHERE date>=NOW()::date - INTERVAL '120 day' order by date DESC"); //$cheks_txt="; foreach($checkarr as $checkr) { $cheks_txt ="
=NOW()- INTERVAL 1 day AND type='Продажа'"); +$data4= $db::getRow("SELECT * FROM create_checks WHERE date>=NOW()::date- INTERVAL '1 day' AND type='Продажа'"); foreach($data4 as $row4) $create_check_arr[$row4["order_id"]]=$row4; $j=0; -$data = $db2::getRows("SELECT *,DATE_FORMAT(delivery_date, '%d.%m.%Y') as dated FROM orders_amo WHERE 1 $where AND delivery_date <= NOW() order by delivery_date DESC LIMIT 750"); +$data = $db::getRows("SELECT *,TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated FROM orders_amo WHERE 1 = 1 $where AND delivery_date <= NOW() order by delivery_date DESC LIMIT 750"); echo"
дата доставки:
@@ -427,7 +426,7 @@ echo"
проверка дата доставкиномер заказа, статус заказасумма заказа, магазинвид оплаты чекисоздать новый чек
} catch (Exception $e) { - echo 'Выброшено исключение: ', $e->getMessage(), "\n"; + echo 'Выброшено исключение: ', $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString(), "\n"; } echo"