фикс модуля couriers stats

diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php
index 2eb337787473ac46abf0928632207afebf7ca3f3..3a0eef92b7fac07c616d8187bb5e3a923edd022f 100644 (file)
--- a/erp24/controllers/OrdersController.php
+++ b/erp24/controllers/OrdersController.php
@@ -47,6 +47,10 @@ class OrdersController extends Controller
         return $this->render('samovivoz');
     }
 
+    public function actionCouriersStats() {
+        return $this->render('couriers_stats');
+    }
+
     public function actionDelivery2()
     {
         if (!empty($_REQUEST["umoup"])) {

diff --git a/erp24/modul/orders/couriersStats.php b/erp24/modul/orders/couriersStats.php
index 3197fe54226ced55c42ed35de32bf727cfb28315..b34ef08c631b13812722f39e54260cc2cecd207e 100644 (file)
--- a/erp24/modul/orders/couriersStats.php
+++ b/erp24/modul/orders/couriersStats.php
@@ -1,54 +1,78 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/design_new.php");
-include_once("inc/uni.php");
-
-include"templates/top.php";
-
-include_once("inc/db2.php");
-
-$date1=date("Y-m-d",time()-86400*7);
-$date2=date("Y-m-d",time());
-
-
-
-if(!empty($_REQUEST["delivery_date1"])) $date1=htmlentities($_REQUEST["delivery_date1"]);
-if(!empty($_REQUEST["delivery_date2"])) $date2=htmlentities($_REQUEST["delivery_date2"]);
-if(!empty($_REQUEST["delivery"]) and $_REQUEST["delivery"]!="-1")  { $delivery=htmlentities($_REQUEST["delivery"]); $where .=" AND delivery='$delivery' ";   }
-if(!empty($_REQUEST["dostavka_povtor_tip"]) and $_REQUEST["dostavka_povtor_tip"]!="-1") { $dostavka_povtor_tip=htmlentities($_REQUEST["dostavka_povtor_tip"]); $where .=" AND dostavka_povtor_tip='$dostavka_povtor_tip' ";  }
-
-
-
-
-
-if(!empty($_REQUEST["courier_id"]) and $_REQUEST["courier_id"]!="-1")  {  $where .=" AND courier_id='$courier_id'";
-$courier_id=(int) $_REQUEST["courier_id"]; }
-
-
- $data = $db2::getRows("SELECT admin_id as id, name_admin as name FROM admin  WHERE group_id=27 order by active desc, name ASC");
- foreach ($data as $row) 
- $cur_arr[$row["id"]]=$row["name"];     
-
-echo"<h1>Доставки курьеров</h1>
+<?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");
+include_once(dirname(__DIR__, 2) . "/inc/design_new.php");
+include_once(dirname(__DIR__, 2) . "/inc/uni.php");
+
+$date1 = date("Y-m-d", time() - 86400 * 7);
+$date2 = date("Y-m-d", time());
+$delivery = '';
+$dostavka_povtor_tip = '';
+$where = '';
+$courier_id = '';
+$cur_arr = [];
+$price_p = 0;
+$price_c = 0;
+
+if (!empty($_REQUEST["delivery_date1"])) $date1 = htmlentities($_REQUEST["delivery_date1"]);
+if (!empty($_REQUEST["delivery_date2"])) $date2 = htmlentities($_REQUEST["delivery_date2"]);
+if (!empty($_REQUEST["delivery"]) and $_REQUEST["delivery"] != "-1") {
+    $delivery = htmlentities($_REQUEST["delivery"]);
+    $where .= " AND delivery='$delivery' ";
+}
+if (!empty($_REQUEST["dostavka_povtor_tip"]) and $_REQUEST["dostavka_povtor_tip"] != "-1") {
+    $dostavka_povtor_tip = htmlentities($_REQUEST["dostavka_povtor_tip"]);
+    $where .= " AND dostavka_povtor_tip='$dostavka_povtor_tip' ";
+}
+
+
+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 id, name FROM admin WHERE group_id=27 order by active desc, name asc");
+foreach ($data as $row)
+    $cur_arr[$row["id"]] = $row["name"];
+
+echo "<h1>Доставки курьеров</h1>
 <form method=post role=\"form\" class=\"form-horizontal\" action=\"\">
 <table><td>Дата доставки</td><td> <input type=date class=\"form-control datetime\" value=\"$date1\" name=delivery_date1>
 </td><td>-</td><td><input type=date class=\"form-control datetime\" value=\"$date2\" name=delivery_date2></td>
 <td><select class=\"form-control\" name=delivery>
-<option value=\"-1\""; if($delivery=="-1") echo" selected"; echo">-все-</option>
-<option value=\"Такси\""; if($delivery=="Такси") echo" selected"; echo">Такси</option>
-<option value=\"Самовывоз\""; if($delivery=="Самовывоз") echo" selected"; echo">Самовывоз</option>
-<option value=\"Доставка\""; if($delivery=="Доставка") echo" selected"; echo">Доставка</option>
-<option value=\"Доставка из магазина\""; if($dostavka_povtor_tip=="Доставка из магазина") echo" selected"; echo">Доставка из магазина</option>
+<option value=\"-1\"";
+if ($delivery == "-1") echo " selected";
+echo ">-все-</option>
+<option value=\"Такси\"";
+if ($delivery == "Такси") echo " selected";
+echo ">Такси</option>
+<option value=\"Самовывоз\"";
+if ($delivery == "Самовывоз") echo " selected";
+echo ">Самовывоз</option>
+<option value=\"Доставка\"";
+if ($delivery == "Доставка") echo " selected";
+echo ">Доставка</option>
+<option value=\"Доставка из магазина\"";
+if ($dostavka_povtor_tip == "Доставка из магазина") echo " selected";
+echo ">Доставка из магазина</option>
 </select>
 </td>
 
 <td>Повторная</td><td><select class=\"form-control\" name=dostavka_povtor_tip>
-<option value=\"-1\""; if($dostavka_povtor_tip=="-1") echo" selected"; echo">-все-</option>
-<option value=\"Такси\""; if($dostavka_povtor_tip=="Такси") echo" selected"; echo">Такси</option>
-<option value=\"Самовывоз\""; if($dostavka_povtor_tip=="Самовывоз") echo" selected"; echo">Самовывоз</option>
-<option value=\"Доставка\""; if($dostavka_povtor_tip=="Доставка") echo" selected"; echo">Доставка</option>
+<option value=\"-1\"";
+if ($dostavka_povtor_tip == "-1") echo " selected";
+echo ">-все-</option>
+<option value=\"Такси\"";
+if ($dostavka_povtor_tip == "Такси") echo " selected";
+echo ">Такси</option>
+<option value=\"Самовывоз\"";
+if ($dostavka_povtor_tip == "Самовывоз") echo " selected";
+echo ">Самовывоз</option>
+<option value=\"Доставка\"";
+if ($dostavka_povtor_tip == "Доставка") echo " selected";
+echo ">Доставка</option>
 
 </select>
 </td>
@@ -56,18 +80,25 @@ echo"<h1>Доставки курьеров</h1>
 
 <td>
 <select name=courier_id class=\"form-control\">
-<option value=\"-1\""; if($courier_id=="-1") echo" selected"; echo">-все-</option>
+<option value=\"-1\"";
+if ($courier_id == "-1") echo " selected";
+echo ">-все-</option>
 ";
-foreach($cur_arr as $id => $name) { echo"<option value=$id"; if($id==$courier_id) echo" selected"; echo">$name</option>";}
-echo"
+foreach ($cur_arr as $id => $name) {
+    echo "<option value=$id";
+    if ($id == $courier_id) echo " selected";
+    echo ">$name</option>";
+}
+echo "
 </select></td><td><button type=submit class=\"btn btn-success\" name=show>
 поиск</button></td></table>";
-echo"</form>";
+echo "</form>";
+$query = "SELECT * FROM orders_amo  WHERE (status_id=142 or (status_id=143 and (price_dostavka_zatrat>0) ) )
+ AND delivery_date>='$date1' AND delivery_date<='$date2' $where order by delivery_date desc,delivery_time ASC ";
 
- $data = $db2::getRows("SELECT * FROM orders_amo  WHERE (status_id=142 or (status_id=143 and (price_dostavka_zatrat>0) ) )
- AND delivery_date>='$date1' AND delivery_date<='$date2'   $where order by delivery_date desc,delivery_time ASC ");
- 
- echo "<table class=\"table table-hover\">
+$data = $db::getRows($query);
+
+echo "<table class=\"table table-hover\">
 <thead>
 <tr><th> ID</th><th>дата доставки и время</th><th>курьер</th><th>Адрес</th><th>Затраты</th><th>Повторная доставка тип</th><th>Повторная доставка</th></tr>
 
@@ -75,29 +106,29 @@ echo"</form>";
  
  
  <tbody>";
- foreach ($data as $row) {
- echo"<tr "; if($row["status_logist"]=="1") echo" class=\"bg-success\""; echo"><td><a href=\"https://bazacvetov24.amocrm.ru/leads/detail/".$row["amo_id"]."\" target=new>".$row["id"].""; 
- 
-if($row["status_id"]==143) echo"<font color=red>отказ</font>";
- echo"</a></td><td>
- ".$row["delivery"]."  ".$row["delivery_date"]."  ".$row["delivery_time"]."</td>
- <td><a href=\"/orders/edit_courier/?lid_id=".$row["id"]."\" target=new2 class=\"btn btn-sm btn-warning\">".$cur_arr[$row["courier_id"]]."";
- 
-if(empty($cur_arr[$row["courier_id"]]))  echo $row["courier"]; 
- echo"".$row["courier"]."</a>
- </td><td><font color=blue>".$row["dostavka_comment"]."</font> 
- ".$row["delivery_adress"]."  </td><td>".$row["price_dostavka_zatrat"]." </td><td>".$row["dostavka_povtor_tip"]."</td><td>".$row["price_dostavka_povtor_zatrat"]."</td></tr> ";    
-  
-  $price_c=$price_c+$row["price_dostavka_zatrat"];
-  $price_p=$price_p+$row["price_dostavka_povtor_zatrat"];  
-  
-     
- }
- $itog=$price_p+$price_c;
- echo"</tbody><tfooter>
+foreach ($data as $row) {
+    echo "<tr ";
+    if ($row["status_logist"] == "1") echo " class=\"bg-success\"";
+    echo "><td><a href=\"https://bazacvetov24.amocrm.ru/leads/detail/" . $row["amo_id"] . "\" target=new>" . $row["id"] . "";
+
+    if ($row["status_id"] == 143) echo "<font color=red>отказ</font>";
+    echo "</a></td><td>
+ " . $row["delivery"] . "  " . $row["delivery_date"] . "  " . $row["delivery_time"] . "</td>
+ <td><a href=\"/orders/edit_courier/?lid_id=" . $row["id"] . "\" target=new2 class=\"btn btn-sm btn-warning\">" . ($cur_arr[$row["courier_id"]] ?? '') . "";
+
+    if (empty($cur_arr[$row["courier_id"]])) echo $row["courier"];
+    echo "" . $row["courier"] . "</a>
+ </td><td><font color=blue>" . $row["dostavka_comment"] . "</font> 
+ " . $row["delivery_adress"] . "  </td><td>" . $row["price_dostavka_zatrat"] . " </td><td>" . $row["dostavka_povtor_tip"] . "</td><td>" . $row["price_dostavka_povtor_zatrat"] . "</td></tr> ";
+
+    $price_c = $price_c + $row["price_dostavka_zatrat"];
+    $price_p = $price_p + $row["price_dostavka_povtor_zatrat"];
+
+
+}
+$itog = $price_p + $price_c;
+echo "</tbody><tfooter>
 <tr><th colspan=4>Итого: $price_c+$price_p=$itog руб.</th> <th>$price_c</th> <th></th>  <th>$price_p</th> 
  
  
  </tfooter></table>";
-
-include"templates/bottom.php";

diff --git a/erp24/views/orders/couriers_stats.php b/erp24/views/orders/couriers_stats.php
new file mode 100644 (file)
index 0000000..a09307a
--- /dev/null
+++ b/erp24/views/orders/couriers_stats.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/orders/couriersStats.php';