From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Wed, 10 Apr 2024 10:20:01 +0000 (+0300)
Subject: правки по заказу
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=5a274a0e78be66c342fd31103a9d80a11c4bd090;p=yii-erp24%2F.git

правки по заказу
---

diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php
index ae14484..e6a951e 100644
--- a/erp24/controllers/OrdersController.php
+++ b/erp24/controllers/OrdersController.php
@@ -4,6 +4,8 @@ namespace app\controllers;
 
 include_once('../inc/base_new.php');
 include_once('../inc/amo_inc.php');
+error_reporting(E_ALL ^ E_NOTICE);
+ini_set("memory_limit", "256M");
 
 use Exception;
 use Yii;
diff --git a/erp24/modul/orders/delivery.php b/erp24/modul/orders/delivery.php
index 8dda8c0..55ee50c 100644
--- a/erp24/modul/orders/delivery.php
+++ b/erp24/modul/orders/delivery.php
@@ -3,7 +3,7 @@ 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");
-
+error_reporting(E_ALL);
  try {
      
 //include"templates/top.php";
@@ -223,10 +223,23 @@ foreach($_REQUEST["statuses"] ?? [] as $is =>$idf)  {
    
 $checkarr= $db::getRows("SELECT * FROM sales WHERE date >= NOW()- 37 * INTERVAL '1 day' ");
 //$cheks_txt=";
+$sale = [];
+$check_sale_cnt = [];
+$check_vozvrat_cnt = [];
 foreach($checkarr as $checkr) {
+    if (!in_array($checkr["order_id"], $check_sale_cnt)) {
+        $check_sale_cnt[$checkr["order_id"]] = 0;
+    }
+    if (!in_array($checkr["order_id"], $check_vozvrat_cnt)) {
+        $check_vozvrat_cnt[$checkr["order_id"]] = 0;
+    }
+    if (!in_array($checkr["order_id"], $sale)) {
+        $sale[$checkr["order_id"]] = '';
+    }
 $cheks_txt ="<div class=\"col text-center p-1 m-1 "; 
 if($checkr["operation"]=="Возврат")  $cheks_txt .=" bg-warning"; else $cheks_txt .=" bg-success";
-$cheks_txt .="\">Чек ".$checkr["operation"]." ".round($checkr["summ"],2)."руб. ".$checkr["number"]." ".$checkr["date"]." продавец ".$usersArr[$checkr["seller_id"]]."  ";
+$cheks_txt .="\">Чек ".$checkr["operation"]." ".round($checkr["summ"],2)."руб. ".$checkr["number"]." ".$checkr["date"];
+$cheks_txt .=" продавец ".($usersArr[$checkr["seller_id"]] ?? '-')."  ";
 if($checkr["operation"]=="Продажа") $cheks_txt .="<span class=\"btn btn-sm btn-danger\" onclick=\"ajax_return_check('".$checkr["id"]."');$(this).hide();\">сделать возврат</span>";
 $cheks_txt .="</div>";
 
@@ -315,7 +328,7 @@ echo"
 
 </td><td";
 
-if(in_array($row["amo_id"], $in_orders)) echo" class=\"bg-danger\"";
+if(in_array($row["amo_id"], $in_orders ?? [])) echo" class=\"bg-danger\"";
 
 
 $summ_all=$row["price"]+$row["price_dostavka"]+$row["price_dostavka_povtor"];
@@ -324,7 +337,7 @@ echo">".$row["id"]."  / ".$row["amo_id"]."";
 
 
 
-if(in_array($row["amo_id"], $in_orders)) { 
+if(in_array($row["amo_id"], $in_orders ?? [])) {
     //echo"ДУБЛЬ!  ".$row["amo_id"].""; echo'<span onclick="ajax_check_remove('.$row["id"].');" class="btn btn-danger">удалить заказ</span>'; 
     
     $_SESSION["order_id_dell"][$row["id"]]=$row["amo_id"];
@@ -541,7 +554,7 @@ echo"</tbody></table>Итого $itog руб. всего $cnt ";
  
 
  } catch (Exception $e) {
-    echo 'Выброшено исключение: ',  $e->getMessage(), "\n";
+    echo 'Выброшено исключение: '.  $e->getMessage() . ', line:' . $e->getLine(). "\n";
 }