From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 17 Apr 2024 13:12:35 +0000 (+0300)
Subject: fix shipment division store print
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=6baa40fea4b04f6299c19ec0f90b84cf520c9da6;p=yii-erp24%2F.git

fix shipment division store print
---

diff --git a/erp24/modul/shipment/divisionStorePrint.php b/erp24/modul/shipment/divisionStorePrint.php
index 2223f45..ed4a08e 100644
--- a/erp24/modul/shipment/divisionStorePrint.php
+++ b/erp24/modul/shipment/divisionStorePrint.php
@@ -4,6 +4,8 @@ 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");
 
+global $orderId, $products;
+
 if(!empty($_REQUEST["id"])) {
 $orderId=(int)$_REQUEST["id"];
 
@@ -17,7 +19,7 @@ if(($OrderData["status"] ?? 0)>=6) {
 
 $colors_view=true;
 
-if($_GET["colors"]=="false")  $colors_view=false; 
+if(($_GET["colors"] ?? '')=="false")  $colors_view=false;
 
 $FiledsData=getDataFiledsData($orderId);
 
@@ -69,13 +71,11 @@ echo"
 
 
   foreach($products as $productId=>$nameProduct){
-      
-      
-  if($FiledsData["quantity_warehouseman_fact"][$productId]["NULL"]["NULL"]>0) {      
+  if(($FiledsData["quantity_warehouseman_fact"][$productId]["NULL"]["NULL"] ?? 0)>0) {
   
    echo'<tr id="tr__'.$productId.'" class="trproduct">
     <td class="td_product producted">
-    <span class="fs-6">'.$nameProduct.'</span><td>'.(int)$FiledsData["min_lot"][$productId]["NULL"]["NULL"].'</td>
+    <span class="fs-6">'.$nameProduct.'</span><td>'.(int)($FiledsData["min_lot"][$productId]["NULL"]["NULL"] ?? 0).'</td>
     </td>
   
     
@@ -112,18 +112,18 @@ $divisionCnt=0;
     $colorAllSumm=0;  $colorAllFact=0;
     
   if($colors_view==true){    
-     foreach($productsColorsArray[$productId] as $color) {
+     foreach($productsColorsArray[$productId] ?? [] as $color) {
           $divisionCnt=0;  
           
           
-         if($FiledsData["quantity_warehouseman_fact"][$productId]["NULL"][$color]>0) {
+         if(($FiledsData["quantity_warehouseman_fact"][$productId]["NULL"][$color] ?? 0)>0) {
           $colorsCnt++;
-              $colorAllSumm +=(int)$FiledsData["quantity_zakup_new"][$productId]["NULL"][$color];
+              $colorAllSumm +=(int)($FiledsData["quantity_zakup_new"][$productId]["NULL"][$color] ?? 0);
               $colorAllFact +=(int)$FiledsData["quantity_warehouseman_fact"][$productId]["NULL"][$color];
            echo'<tr id="tr__'.$productId.'_color_'.md5($color).'" class="tr_product">
         <td class="td_color">
        '.$color.'</td>
-       <td class="tdinf">'.intval($FiledsData["min_lot"][$productId]["NULL"]["NULL"]).'</td>
+       <td class="tdinf">'.intval(($FiledsData["min_lot"][$productId]["NULL"]["NULL"] ?? 0)).'</td>
     ';     
         foreach($storeOrderArray as $storeId=>$namestore){
             
@@ -211,7 +211,7 @@ echo"</tbody></table></div>";
 
 
 //.zak> :not(caption)>*>* {    padding: 0.05rem;    background-color: 1px;    box-shadow: none;}
-$_CONFIG["jscss"] .='
+$_CONFIG["jscss"] ='
 
 
 
@@ -253,10 +253,10 @@ input.editColor{width:auto;max-width:70px;}
 
   } else mess("Статус не деление");
  } else mess("Укажите ID закупки");
- 
 
- 
- 
-include"templates/bottom.php";	
+
+
+
+include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';
 
 
diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index 51e4d74..a7362e2 100644
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -7,7 +7,8 @@ $store_id, // GUID магазина
 $storesArray, // массив с магазинами
 $group_id, // ID группы авторизованного сотрудника
 $fieldsRows, // массив с данными по полями - ключ name_eng
-$whereInProductsId, // условие sql запроса по вхождение только определнных продуктов по ID. in ('1',...,'12') 
+$whereInProductsId, // условие sql запроса по вхождение только определнных продуктов по ID. in ('1',...,'12')
+$providersIdInThisOrder,
 $FiledsData, // массив со всеми данными по всем магазинам работаем с ним - в нем все перменные
 $status_order_id, // ID текущего статуса закупаки
 $store_orders_statuses, // массим со статсами закупок
@@ -105,8 +106,10 @@ foreach($data as $row) {
 
 
 // данные по закупке - достаем параметры закупки - дата старта продаж - от нее считаем продажи списания и закупки прошлой недели
-$OrderData=$db::getRow("SELECT *, TO_CHAR(date_start, 'YYYY-MM-DD') as date_start,    TO_CHAR(date_add, 'YYYY-MM-DD') as date_add, 
-TO_CHAR(division_date, 'YYYY-MM-DD') as division_date, extract(epoch from date_update) as date_update FROM store_orders WHERE id=?",[$orderId]);
+$sql = "SELECT *, TO_CHAR(date_start, 'YYYY-MM-DD') as date_start,    TO_CHAR(date_add, 'YYYY-MM-DD') as date_add, 
+TO_CHAR(division_date, 'YYYY-MM-DD') as division_date, extract(epoch from date_update) as date_update FROM store_orders WHERE id=?";
+$OrderData=$db::getRow($sql, [$orderId]);
+//var_dump($OrderData); die;
 if ($OrderData) {
     $providersIdInThisOrder = explode(",", $OrderData["providers_arr"]);
     $status_order_id = $OrderData["status"];
@@ -154,13 +157,11 @@ $k=0;
 foreach($providersIdInThisOrder ?? [] as $pid) { if($k!=0) $whereProvidersId .=","; $whereProvidersId .="'$pid'"; $k++; }
 
 $whereInProductsId=" in (";
-if (!empty($whereProvidersId)) {
-    $z = "SELECT p.id, p.name, o.provider_id, o.price_zakup, p.parent_id, o.shipments_group_id FROM products_1c_options as o INNER JOIN products_1c as p 
-WHERE o.provider_id in($whereProvidersId) AND p.id=o.id order by o.provider_id ASC, p.name ASC";
-    $data2 = $db::getRows($z);
-} else {
-    $data2 = [];
-}
+$z = "SELECT p.id, p.name, o.provider_id, o.price_zakup, p.parent_id, o.shipments_group_id FROM products_1c_options as o INNER JOIN products_1c as p 
+ON o.provider_id in($whereProvidersId) AND p.id=o.id order by o.provider_id ASC, p.name ASC";
+//var_dump($z); die;
+$data2 = $db::getRows($z);
+
 $k=0;
  foreach($data2 as $row) { 
   if($k!=0) $whereInProductsId .=","; $whereInProductsId .="'".$row["id"]."'";
@@ -247,8 +248,10 @@ function returnRowCssClassByFieldValue($fieldName,$value){
 function getDataFiledsData($orderId) {
 global $db;
 // готовим массим со всеми данными по столбцам по каждому товару магазину и цвету Если NULL - то это сумма по магазинам и по цветам
-$dataF=$db::getRows("SELECT field_name,product_id,store_id,(CASE WHEN value_text!='' THEN value_text ELSE value::text END) as value,color FROM store_orders_fields_data
-WHERE order_id=?",[$orderId]);
+$sql = "SELECT field_name,product_id,store_id,(CASE WHEN value_text!='' THEN value_text ELSE value::text END) as value,color FROM store_orders_fields_data
+WHERE order_id=?";
+//var_dump($orderId); die;
+$dataF=$db::getRows($sql,[$orderId]);
 $FiledsData = [];
 foreach($dataF as $row) { 
  if(empty($row["store_id"])) $row["store_id"]="NULL";
@@ -391,9 +394,9 @@ foreach($storesArray as $strid=>$namestore){
 if(in_array($strid,$storesArrayRelation) or empty($orderCityId)) {    
 echo"<a href=\"/shipment/$act/?store_id=$strid&id=$orderId\" class=\"btn btn-sm btn-";
 
-if($store_order_status_value[$strid]) echo'outline-';
+if($store_order_status_value[$strid] ?? false) echo'outline-';
 if($store_id==$strid) { echo"success";     } else echo"info";  echo" m-1\"> ";
-if($store_order_status_value[$strid]==1) echo"<i class=\"fe fe-check me-2\"></i>";
+if($store_order_status_value[$strid]?? 0 ==1) echo"<i class=\"fe fe-check me-2\"></i>";
 echo"$namestore ";
 // массив с группами-ролями тех кто может просматривать заполеннность по магазинам
 if($status_order_id==2 and in_array($_SESSION["group_id"],$group_show_percent_array) and !empty($storeCount2[$strid])) { 
@@ -686,7 +689,7 @@ if(!empty($bgNew)) $bg=$bgNew;
  global $db, $orderCityId,$storesArrayAll;
   $data=$db::getRows("SELECT store_id FROM relationship_city_store WHERE city_id=?",[$orderCityId]);
   $storesArrayRelation=[];
-  foreach($data as $row)   $storesArrayRelation[$row["store_id"]]=$storesArrayAll[$row["store_id"]]; 
+  foreach($data as $row)   $storesArrayRelation[$row["store_id"]]=$storesArrayAll[$row["store_id"]] ?? '';
    return $storesArrayRelation;   
  }
 
diff --git a/erp24/modul/shipment/storeOrderScore.php b/erp24/modul/shipment/storeOrderScore.php
index 3073b59..6b37398 100644
--- a/erp24/modul/shipment/storeOrderScore.php
+++ b/erp24/modul/shipment/storeOrderScore.php
@@ -4,8 +4,8 @@ include_once(dirname(__DIR__, 2) . "/inc/db.php");
 include_once(dirname(__DIR__, 2) . "/inc/base_new.php");
 
 $modul="shipment";
-global $act;
-$act="storeOrderScore";
+global $act, $orderId;
+$act="store-order-score";
 $group_id=(int)$_SESSION["group_id"]; // ID группы сотрудника
 if(!empty($_REQUEST["store_id"])) $store_id=htmlentities($_REQUEST["store_id"]);
 if(!empty($_REQUEST["id"])) { $orderId=(int)$_REQUEST["id"]; } else exit("Укажите ID закупки");
@@ -145,7 +145,7 @@ echo'</tbody></table></div>';
 
 
 
-include"templates/bottom.php";	
+//include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';