From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 15 Apr 2024 08:54:27 +0000 (+0300)
Subject: fix orders amo checks
X-Git-Tag: 1.1~149^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a26d5eb9ca4c7b5d3a567e8627814bee3c4358ac;p=erp24_rep%2Fyii-erp24%2F.git

fix orders amo checks
---

diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php
index 5964c3c2..96660602 100644
--- a/erp24/controllers/OrdersController.php
+++ b/erp24/controllers/OrdersController.php
@@ -27,6 +27,10 @@ class OrdersController extends Controller
         return $this->render('delivery');
     }
 
+    public function actionAmo_checks() {
+        return $this->render('amo_checks');
+    }
+
     public function actionDelivery2()
     {
         if (!empty($_REQUEST["umoup"])) {
diff --git a/erp24/modul/orders/amo_checks.php b/erp24/modul/orders/amo_checks.php
index 65bb04f7..83c909c9 100644
--- a/erp24/modul/orders/amo_checks.php
+++ b/erp24/modul/orders/amo_checks.php
@@ -1,38 +1,38 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/design_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");
+include_once(dirname(__DIR__, 2) . "/inc/design_new.php");
 
 
  try {
      
-include"templates/top.php";  
-
+//include"templates/top.php";  
 
+$in_orders = [];
 
 
 echo'<h1>Заказы из amo и чеки в магазинах</h1><p>Крепим чек к заказу</p>';
      
-include_once("inc/db2.php");
+//include_once("inc/db2.php");
 
 $products=array(); $payment_types=array();
     
     
-$data = $db2::getRows("SELECT status_id, color, name FROM orders_status WHERE pipeline_id='4021495'");
+$data = $db::getRows("SELECT status_id, color, name FROM orders_status WHERE pipeline_id='4021495'");
 foreach($data as $row) {
   $status_ar[$row["status_id"]]="<span class=\"tag pe-1 m-1\" style=\"background:".$row["color"]."\">".$row["name"]."</span>"; 
 }  
     
 
-$data = $db2::getRows("SELECT admin_id, name_admin FROM admin WHERE 1 ");
-foreach($data as $row) $users_arr[$row["admin_id"]]=$row["name_admin"];
+$data = $db::getRows("SELECT id, name FROM admin WHERE 1 = 1");
+foreach($data as $row) $users_arr[$row["id"]]=$row["name"];
 
-$data = $db2::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 = $db2::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"];
    
     
@@ -46,8 +46,8 @@ foreach($data as $row) $store_arr[$row["id"]]=$row["name"];
     
 //AND delivery!='Самовывоз'
   
-$data = $db2::getRows("SELECT *,DATE_FORMAT(delivery_date, '%d.%m.%Y') as dated FROM orders_amo WHERE status_id='142'  
-AND delivery_date <= NOW()-INTERVAL 0 day order by delivery_date DESC LIMIT 50"); 
+$data = $db::getRows("SELECT *,TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated FROM orders_amo WHERE status_id='142'  
+AND delivery_date <= NOW() order by delivery_date DESC LIMIT 50");
 echo"<table class=\"table table-hover\">";
 foreach($data as $row) {
 $cheks_txt ="";
@@ -56,8 +56,8 @@ $yes=0;
 $pay_text="";
 $p=0;
 $data_pay= $db::getRows("SELECT summ, status, order_text, date_end, price_vozvrat FROM orders_pays WHERE  status!='Отклонён' AND ( order_id=? 
-or  order_id LIKE '".$row["amo_id"]."-%' 
-or order_text LIKE '%:".$row["id"]."' )",[$row["id"]]); 
+or  order_id LIKE '".$row["amo_id"]."%' 
+or order_text LIKE '%:".$row["id"]."' )",[$row["id"]]);
 foreach($data_pay as $rowpay) {
 
 if($rowpay["summ"]!=$row["price"]) { $pay_text .="<br><font color=red>- ".$rowpay["summ"]." (- ".$rowpay["price_vozvrat"].")   ".$rowpay["status"]." ".$rowpay["date_end"]."  ".$rowpay["order_text"]."</font> "; } 
@@ -146,7 +146,10 @@ echo">".$row["id"]." <a href=\"https://bazacvetov24.amocrm.ru/leads/detail/".$ro
 if($yes==2) echo"<font color=red>Сумма в чеке больше суммы заказ это норм!</font>";
 echo"</td><td>$cheks_txt $pay_text</td><td>
 
-".$status_ar[$row["status_id"]]." <br> ".$store_arr[$row["store_id"]]."</td><td><b>".$users_arr[$row["florist_id"]]."</b> <br><b>".$users_arr[$row["courier_id"]]."</b>  
+".($status_ar[$row["status_id"]] ?? '')." <br> "
+ .($store_arr[$row["store_id"]] ?? ''). "</td><td><b>"
+ .($users_arr[$row["florist_id"]] ?? '')."</b> <br><b>"
+ .($users_arr[$row["courier_id"]] ?? '')."</b>  
  ";
 /*
 
@@ -165,7 +168,7 @@ echo"</tbody></table>";
  
 
  } catch (Exception $e) {
-    echo 'Выброшено исключение: ',  $e->getMessage(), "\n";
+    echo 'Выброшено исключение: ',  $e->getMessage() . ' ' . $e->getLine() . ' ' . $e->getFile(), "\n";
 }
 
 
@@ -256,10 +259,10 @@ $.ajax({
 			</div>
 		</div>
 
-'; 
- 
+';
+
 
- 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/amo_checks.php b/erp24/views/orders/amo_checks.php
new file mode 100644
index 00000000..52f026f0
--- /dev/null
+++ b/erp24/views/orders/amo_checks.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/orders/amo_checks.php';