From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 23 Dec 2024 10:56:36 +0000 (+0300)
Subject: [ERP-265] отображение
X-Git-Tag: 1.7~115^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=fd78f0b665ab0f77e7dad6187ccf398bc43b286c;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-265] отображение
---

diff --git a/erp24/modul/orders/delivery.php b/erp24/modul/orders/delivery.php
index 1ea98a0a..aab5dae5 100644
--- a/erp24/modul/orders/delivery.php
+++ b/erp24/modul/orders/delivery.php
@@ -22,11 +22,6 @@ function openCurl($host) {
 }
 
 $action = $_GET['action'] ?? null;
-if ($action && $action == 'amoUpdateToday') {
-    $host = getMyHost() . '/cron/amo142?date1=' . date('Y-m-d') . '&date2=' . date('Y-m-d') . '&status_id=142&key=getJH6GFi4tpU84YVPW9M__Xe_eQ24baWRFGl9ance&token_cloud=iC04295J9HyD2H3GJF3btky&grant_type=refresh_token&secret_phrase=VJJVkt467ltuXU__356XEtS';
-    openCurl($host);
-}
-
 if ($action && $action == 'amoUpdateDate') {
     $date = $_GET['date'];
     $host = getMyHost() . '/cron/amo142?date1=' . $date . '&date2=' . $date . '&status_id=142&key=getJH6GFi4tpU84YVPW9M__Xe_eQ24baWRFGl9ance&token_cloud=iC04295J9HyD2H3GJF3btky&grant_type=refresh_token&secret_phrase=VJJVkt467ltuXU__356XEtS';
@@ -137,17 +132,15 @@ foreach($data as $row) {
 
 
 
-
-echo'<h1>Заказы из amo и чеки в магазинах <a href="/orders/delivery?action=amoUpdateToday" target="_blank" class="btn btn-info">
-импортировать заказы из amo с датой доставки '.date("d.m.Y",time()).'</a></h1>';
-
+echo '<div class="ordersDelivery m-5">';
+echo'<h1>Заказы из amo и чеки в магазинах</h1>';
 
 echo '<form action="/orders/delivery" method="GET" target="_blank">';
 echo '<input type="hidden" name="action" value="amoUpdateDate" />';
-echo '<input type="date" name="date" required />';
-echo '<input type="submit" class="btn btn-info" value="синхронизировать заказы с amo"/>';
+echo '<input type="date" name="date" required value="' . date('Y-m-d') . '"/>&nbsp;&nbsp;&nbsp;';
+echo '<input type="submit" class="btn btn-info" value="импортировать заказы с amo на выбранную дату"/>';
 echo '</form>';
-
+echo '<div style="color: red; font-size: 1rem; ">После импортирования заказов из АМО<br> нужно перезагрузить страницу с заказами</div>';
 //echo'<a href="?umoup=1" class="btn btn-info">синхронизировать заказы с amo</a>';
 
 $products=array(); $payment_types=array();
@@ -175,16 +168,18 @@ $lid_id = $lid_id ?? '';
 
 echo"<form action=\"\" method=post>";
 echo '<input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />';
-echo "<table><td>
+echo "<table class='mt-5'><tr><td>
 <input type=text name=lid_id value=\"$lid_id\" placeholder=\"ID заказа\" class=\"form-control\" style=\"width:100px;\">
 </td><td>
 <input type=text name=amo_id value=\"\"  placeholder=\"amo ID\"  class=\"form-control\" style=\"width:100px;\">
 </td>
 
-<td>дата доставки:
+<td class='px-5'>дата доставки:
+<span class='d-inline-block'>
 <input type=date name=delivery_date value=\"$delivery_date\"  class=\"form-control\">
+</span>
 </td>
-
+</tr>
 </table>
 ";   
 
@@ -215,10 +210,14 @@ $data=$db::getRows("SELECT entity_id,export_val FROM export_import_table WHERE e
 foreach($data as $row) $exportStore[$row["entity_id"]]=$row["export_val"];
 
 
-
-foreach($status_ar2 as $id =>$name)    echo"<label from=\"st__$id\" class=\"m-1\"><input type=checkbox name=statuses[$id] id=\"st__$id\">$name</label>";
+$cnt = 0;
+foreach($status_ar2 as $id =>$name) {
+    $cnt ++;
+    if ($cnt == 7) echo '<br>';
+    echo "<label from=\"st__$id\" class=\"m-1\"><input type=checkbox name=statuses[$id] id=\"st__$id\">&nbsp;$name</label>";
+}
     
-echo"<button class=\"btn btn-success\">вывод</button></form>";
+echo"<br><button class=\"btn btn-success\">вывод</button></form>";
 $users_arr = $db::mapping("SELECT id, name FROM admin WHERE group_id>3 ");
 
 $data = $db::getRows("SELECT id, name FROM products_1c WHERE tip='city_store' ");
@@ -300,8 +299,8 @@ $data4= $db::getRows("SELECT * FROM create_checks WHERE date >= NOW()- 37 * INTE
 foreach($data4 as $row4) $create_check_arr[$row4["order_id"]][]=$row4;
   
   
-  echo"SELECT *, TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated FROM orders_amo
-WHERE $where AND delivery_date <= NOW() order by delivery_date DESC, updated_at DESC LIMIT 1750 ";
+  echo"<details><summary>SQL</summary>SELECT *, TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated FROM orders_amo
+WHERE $where AND delivery_date <= NOW() order by delivery_date DESC, updated_at DESC LIMIT 1750</details>";
 
 $data = $db::getRows("SELECT *, TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated FROM orders_amo
 WHERE $where AND delivery_date <= NOW() order by delivery_date DESC, updated_at DESC LIMIT 1750");
@@ -729,4 +728,4 @@ $.ajax({
 include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';
     
     
-    
\ No newline at end of file
+echo '</div>';