From b2fce7aed4441256e9975ba11b01f39168c46155 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 19 Apr 2024 17:15:08 +0300
Subject: [PATCH] orders samovivoz

---
 erp24/controllers/OrdersController.php |  4 +++
 erp24/modul/orders/samovivoz.php       | 34 ++++++++++++++------------
 erp24/views/orders/samovivoz.php       |  5 ++++
 3 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 erp24/views/orders/samovivoz.php

diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php
index 7bb3e9f3..2eb33778 100644
--- a/erp24/controllers/OrdersController.php
+++ b/erp24/controllers/OrdersController.php
@@ -43,6 +43,10 @@ class OrdersController extends Controller
         return $this->render('logist_table_day');
     }
 
+    public function actionSamovivoz() {
+        return $this->render('samovivoz');
+    }
+
     public function actionDelivery2()
     {
         if (!empty($_REQUEST["umoup"])) {
diff --git a/erp24/modul/orders/samovivoz.php b/erp24/modul/orders/samovivoz.php
index b352101e..d90f9f1f 100644
--- a/erp24/modul/orders/samovivoz.php
+++ b/erp24/modul/orders/samovivoz.php
@@ -1,9 +1,11 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
+<?php
+include_once(dirname(__DIR__, 2) . "/startup.php");
+include_once(dirname(__DIR__, 2) . "/inc/db.php");
+include_once(dirname(__DIR__, 2) . "/inc/base_new.php");
+
+global $manager_id, $courier_id;
+
 if(empty($_CONFIG["title"])) $_CONFIG["title"]="Сделки: Самовывозы в магазинах";
-include"templates/top.php";
 
 $sql_table="orders_amo";
 $date1=date("Y-m-d",time()-86400*3);
@@ -15,7 +17,7 @@ if(isset($_REQUEST["manager_id"]) and $_REQUEST["manager_id"]!="-1")  { $manager
 //if(!empty($_REQUEST["courier_id"]) and $_REQUEST["courier_id"]!="-1")  {  $where .=" AND courier_id='$courier_id'";$courier_id=(int) $_REQUEST["courier_id"]; }
 
 
- $data = $db::getRows("SELECT * FROM admin  WHERE 1 order by active desc, name ASC");
+ $data = $db::getRows("SELECT * FROM admin  WHERE 1 = 1 order by active desc, name ASC");
  foreach ($data as $row) {
  $users_arr[$row["id"]]=$row["name"];  
   if($row["group_id"]==10)  $manager_arr[$row["id"]]=$row["name"];  
@@ -30,8 +32,9 @@ if(isset($_REQUEST["manager_id"]) and $_REQUEST["manager_id"]!="-1")  { $manager
 
 
 echo"
-<form method=post role=\"form\" class=\"form-horizontal\" action=\"\">
-<table><td>Дата</td><td> <input type=text class=\"form-control datetime\" value=\"$date1\" style=\"width:130px;\" name=created_at1>
+<form method=post role=\"form\" class=\"form-horizontal\" action=\"\">";
+echo '<input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />';
+echo "<table><td>Дата</td><td> <input type=text class=\"form-control datetime\" value=\"$date1\" style=\"width:130px;\" name=created_at1>
 </td><td>-</td><td><input type=text class=\"form-control datetime\" value=\"$date2\" style=\"width:130px;\" name=created_at2></td>
 <td><select name=manager_id class=\"form-control\">
 <option value=\"-1\""; if($manager_id=="-1") echo" selected"; echo">-все-</option>
@@ -39,16 +42,17 @@ echo"
 foreach($manager_arr as $id => $name) { echo"<option value=$id"; if($id==$courier_id) echo" selected"; echo">$name</option>";}
 echo"</select></td><td><select name=tiporder class=\"form-control\">
 <option value=\"-1\""; if($courier_id=="-1") echo" selected"; echo">-все-</option>";
-foreach($order_arr as $id => $name) { echo"<option value=$id"; if($id==$tiporder) echo" selected"; echo">$name</option>";}
+foreach($order_arr ?? [] as $id => $name) { echo"<option value=$id"; if($id==$tiporder) echo" selected"; echo">$name</option>";}
 echo"</select></td><td><button type=submit class=\"btn btn-success\" name=show>поиск</button></td></table></form>";
 
 //$where  created_at>='$date1 00:00:00' AND created_at<='$date2 23:59:59' AND
 
- $data = $db::getRows("SELECT *,DATE_FORMAT(created_at, '%d.%m.%Y в %H:%i') as created,
- DATE_FORMAT(delivery_date, '%d.%m.%Y') as delivery_date2
- 
- FROM $sql_table WHERE  status_id='39041956' order by delivery_date DESC, created_at DESC");
+$sql = "SELECT *,TO_CHAR(created_at, 'DD.MM.YYYY в HH:MM') as created,
+ TO_CHAR(delivery_date, 'DD.MM.YYYY') as delivery_date2
  
+ FROM $sql_table WHERE  status_id='39041956' order by delivery_date DESC, created_at DESC";
+//var_dump($sql); die;
+$data = $db::getRows($sql);
  
  echo "<table class=\"table table-hover\"><thead><tr><th>ID заказа</th>
  <th>Дата самовывоза</th><th>Магазин</th><th>Клиент</th><th>Сумма</th></tr></thead><tbody>"; 
@@ -60,7 +64,7 @@ echo"<a href=\"/orders/show/?id=".$row["id"]."\">".$row["client"]." ".$row["deli
 
 
 ".$row["delivery_adress"]." ".$row["brend"]."";
-echo"<br><small>".$row["created"]."</small></td><td><h3  onclick=\"ajaxOrder(".$row["id"].");return false;\">".$row["delivery_date2"]."</h3></td><td><span class=\"btn btn-info\">".$store_arr[$row["store_id"]]."</span><br><span class=\"btn btn-xs";
+echo"<br><small>".$row["created"]."</small></td><td><h3  onclick=\"ajaxOrder(".$row["id"].");return false;\">".$row["delivery_date2"]."</h3></td><td><span class=\"btn btn-info\">".($store_arr[$row["store_id"]]??'')."</span><br><span class=\"btn btn-xs";
  if($row["pay"]=="Оплачен") echo" btn-success";
  echo"\">".$row["pay"]."</span> ".$row["pay_text"]." ".$row["payment_type_id"]." </td><td>".$row["client"]." ".$row["phone"]."  ".$row["order_text"]."    </td><td>".$row["price"]."</td></tr> ";   
 }
@@ -110,4 +114,4 @@ $.ajax({
 
 </script>";
 
-include"templates/bottom.php";
+include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';
\ No newline at end of file
diff --git a/erp24/views/orders/samovivoz.php b/erp24/views/orders/samovivoz.php
new file mode 100644
index 00000000..77202c7b
--- /dev/null
+++ b/erp24/views/orders/samovivoz.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/orders/samovivoz.php';
\ No newline at end of file
-- 
2.39.5