From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 18 Apr 2024 15:05:01 +0000 (+0300)
Subject: shipment ajax
X-Git-Tag: 1.1~132^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a92ef8a8b547e50b7df9320267ae665addab9615;p=erp24_rep%2Fyii-erp24%2F.git

shipment ajax
---

diff --git a/erp24/controllers/ShipmentController.php b/erp24/controllers/ShipmentController.php
index 4c41495b..fb9d0692 100755
--- a/erp24/controllers/ShipmentController.php
+++ b/erp24/controllers/ShipmentController.php
@@ -19,4 +19,5 @@ class ShipmentController extends Controller
     public function actionDivisionStore() { return $this->render('division-store'); }
     public function actionDivisionStorePrint() { return $this->render('division-store-print'); }
     public function actionStoreOrderScore() { return $this->render('store-order-score'); }
+    public function actionAjaxDivisionAutoHandStart() { return $this->render('ajax-division-auto-hand-start'); }
 }
\ No newline at end of file
diff --git a/erp24/modul/shipment/ajaxDivisionAutoHandStart.php b/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
index 54478a70..cce72796 100644
--- 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/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index adbeef16..cf5063bd 100644
--- 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
 ;
  
 
diff --git a/erp24/views/shipment/ajax-division-auto-hand-start.php b/erp24/views/shipment/ajax-division-auto-hand-start.php
new file mode 100644
index 00000000..0b9a333d
--- /dev/null
+++ b/erp24/views/shipment/ajax-division-auto-hand-start.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/shipment/ajaxDivisionAutoHandStart.php';
\ No newline at end of file