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

diff --git a/erp24/modul/shipment/ajaxDivisionAutoHandStart.php b/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
index 54478a70863944377ecf3f72491d7312bf6dbfeb..cce7279638f08f447b5f0f2e5428d014cf722e11 100644 (file)
--- a/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
+++ b/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
@@ -1,13 +1,15 @@
-<?
-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 $orderId, $products, $productsColorsArray;
 
 if(!empty($_REQUEST["id"])) { 
-$orderId=(int)$_REQUEST["id"]; 
+$orderId=(int)$_REQUEST["id"];
 
 
-include"modul/shipment/functionsShipment.php";
+include_once(__DIR__. "/functionsShipment.php");
 $FiledsData=getDataFiledsData($orderId);
 $storeOrderArray=getRelationshipCityStore();
 

diff --git a/erp24/modul/shipment/fields/division_store.php b/erp24/modul/shipment/fields/division_store.php
index b7cfad351ad7a450a7014517608609b222cdcc5a..2b363bacf1ac6bb257883ce87bb795a3f4ccb6cf 100644 (file)
--- a/erp24/modul/shipment/fields/division_store.php
+++ b/erp24/modul/shipment/fields/division_store.php
@@ -1,4 +1,12 @@
-<?
+<?php
+global $orderId,
+       $orderStoresArrayRelation_in,
+       $orderStoresArrayRelation,
+       $products,
+       $productsColorsArray
+
+       ;
+
 $FiledsDataArray=[];
 
 
@@ -7,7 +15,7 @@ FROM store_orders_fields_data WHERE
 order_id=? 
 AND store_id=''
 AND field_name IN ('division_store_ratio','min_lot')
-AND value!=0 group by field_name, product_id ",[$orderId]);
+AND value!=0 group by field_name, product_id, store_id, value,color ",[$orderId]);
 foreach($dataF as $row) { 
   if(empty($row["color"])) $row["color"]=0;   
   $FiledsDataArray[$row["field_name"]][$row["product_id"]][0][$row["color"]]=$row["value"];

diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index adbeef16c430c27838ced421fa5ac6fbc805d3a8..cf5063bd5ce35789805dd0141d09ef173b985141 100644 (file)
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -22,8 +22,8 @@ $orderStoresArrayRelation, // массив с гуидами магазинов
 $orderStoresArrayRelation_in //  SQL условие для выборки по магазинам IN('store_id')
 , $productGroupArray // массив с ID подгруппы группы товаров для автозакупки Короткие розы
 ,$related_order_id
-,$date_start_division
-
+,$date_start_division,
+$param
 ;