Переписывание /shipment/config, /shipment/config-sort, /shipment/fields, /shipment...

diff --git a/erp24/controllers/ShipmentController.php b/erp24/controllers/ShipmentController.php
index b4998cee552f2e7c148e7c5cd1a0f56f4d6e4e59..71a529b9521d4d9d4fab04585c12aaf46255a6fa 100755 (executable)
--- a/erp24/controllers/ShipmentController.php
+++ b/erp24/controllers/ShipmentController.php
@@ -33,4 +33,8 @@ class ShipmentController extends Controller
     public function actionAjaxUpdateStoreZakup() { return $this->renderPartial('ajax-update-store-zakup'); }
     public function actionAjaxUpdateStep() { return $this->renderPartial('ajax-update-step'); }
     public function actionStatusFieldsSort() { return $this->render('status-fields-sort'); }
+    public function actionConfig() { return $this->render('config'); }
+    public function actionConfigSort() { return $this->render('config-sort'); }
+    public function actionFields() { return $this->render('fields'); }
+    public function actionStatusesEdit() { return $this->render('statuses-edit'); }
 }
\ No newline at end of file

diff --git a/erp24/modul/shipment/config.php b/erp24/modul/shipment/config.php
index f7dcce465b68b65be74e4a55be6c4e585233ca73..40de0e5f3a0918692babd12175ba83892dae132a 100644 (file)
--- a/erp24/modul/shipment/config.php
+++ b/erp24/modul/shipment/config.php
@@ -1,10 +1,8 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/design_new.php");
-
-include"templates/top.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");
 
 //if($_SESSION["group_id"]>2) exit("У вас нет дступа");
 
@@ -64,7 +62,7 @@ if(!empty($_POST[$id22][$row["id"]][$id2])) {
   
   
   
- $db::sql("UPDATE store_orders_fields SET dostup=? WHERE id=? LIMIT 1",[json_encode($dsp,JSON_UNESCAPED_UNICODE), $row["id"] ]);
+ $db::sql("UPDATE store_orders_fields SET dostup=? WHERE id=?",[json_encode($dsp,JSON_UNESCAPED_UNICODE), $row["id"] ]);
   
 
   
@@ -117,7 +115,7 @@ $status_json=array();
           }
          }
    }
- $db::sql("UPDATE store_orders_statuses SET dostup=?,groups=?, stores_show=? WHERE id=? LIMIT 1",[json_encode($status_json,JSON_UNESCAPED_UNICODE), $groups_sql, $stores_show, $status_id ]);
+ $db::sql("UPDATE store_orders_statuses SET dostup=?,groups=?, stores_show=? WHERE id=?",[json_encode($status_json,JSON_UNESCAPED_UNICODE), $groups_sql, $stores_show, $status_id ]);
 
 
 //echo"<br> $status_id $status_json";
@@ -154,19 +152,19 @@ if(!empty($_REQUEST["status_id"])) $statusId=(int)$_REQUEST["status_id"];
 foreach($store_orders_statuses as $status_id => $status) 
 {
     
-    echo'<form method=post action="/shipment/config/">
-    
-    <input type=hidden name=status_role value='.$status_id.'>';
+    echo'<form method=post action="/shipment/config/">';
+    echo '<input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />';
+    echo '<input type=hidden name=status_role value='.$status_id.'>';
     $status_id=intval($status_id);
     echo"<div onclick=\"$('#st__$status_id').toggle()\" class=\"btn btn-lg btn-info fs-6 m-1\">+ $status</div>
     
     
     
-    <a href=\"/shipment/statusFieldsSort/?status_id=$status_id\" class=\"btn btn-sm me-2 btn-warning\">сортировка столбцов</a>
+    <a href=\"/shipment/status-fields-sort/?status_id=$status_id\" class=\"btn btn-sm me-2 btn-warning\">сортировка столбцов</a>
     
     <div id=\"st__$status_id\" "; 
     
-    if($statusId==$status_id or (!empty($status_id_on) and $status_id_on==$status_id))  {}
+    if(($statusId ?? -1) ==$status_id or (!empty($status_id_on) and $status_id_on==$status_id))  {}
     else echo" style=\"display:none;\"";
     
     
@@ -192,7 +190,7 @@ foreach($store_orders_statuses as $status_id => $status)
     
 $fields_hide=$fieldHide[$status_id]=$fields_hide;
 if(!empty($fieldSort[$status_id])) $sort=$fieldSort[$status_id];
-$data=$db::getRows("SELECT * FROM store_orders_fields $sort"); 
+$data=$db::getRows("SELECT * FROM store_orders_fields "); // $sort ; TODO: переписать $sort на postgresql
 
     foreach($statuses_groups[$status_id] as $gid) {
         
@@ -235,13 +233,13 @@ foreach($fields_n as $id22 => $arrr2) {
   echo'<td ';
   
   if(isset($arrr2["array"])) {  
-    foreach($arrr2["array"] as $bg)   if(in_array($bg,$dostup[$id22]))  echo' class="'.$bg.'"';
+    foreach($arrr2["array"] as $bg)   if(in_array($bg,$dostup[$id22] ?? []))  echo' class="'.$bg.'"';
   }
   
   echo'>';  
   
 if(isset($arrr2["array"])) { 
-     $value_def=$statuses_dostup[$status_id][$gid][$row["id"]][$id22];  
+     $value_def=$statuses_dostup[$status_id][$gid][$row["id"]][$id22] ?? 0;
    //'.$value_def.'
     echo'<div class="'.$value_def.'"><select class="form-control '.$value_def.'" name=field_edit['.$status_id.']['.$row["id"].']['.$gid.']['.$id22.']>';
    foreach($arrr2["array"] as $bg0 =>$bg) {
@@ -651,7 +649,4 @@ function up(e) {
 
 */
 
-include"templates/bottom.php"; 
-       
-
-
+//include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';

diff --git a/erp24/modul/shipment/config_sort.php b/erp24/modul/shipment/config_sort.php
index 606787cde4a171c0b8aa9a34807db0b83b0f3b57..4f0d0a3f2d2baa44fadd0daaf2c1275982f34cb3 100644 (file)
--- a/erp24/modul/shipment/config_sort.php
+++ b/erp24/modul/shipment/config_sort.php
@@ -1,10 +1,8 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/design_new.php");
-
-include"templates/top.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");
 
 //if($_SESSION["group_id"]>2) exit("У вас нет доступа");
 
@@ -16,7 +14,7 @@ $data=$db::getRows("SELECT * FROM store_orders_fields");
 if(!empty($_POST["save_config"])) {
 foreach($data as $row) {
 $dsp=array();    
-foreach($fields as $id22 => $arrr2) {
+foreach($fields ?? [] as $id22 => $arrr2) {
 
 foreach($roles as $id2 => $name) {
 if(!empty($_POST[$id22][$row["id"]][$id2])) {
@@ -38,7 +36,7 @@ if(!empty($_POST[$id22][$row["id"]][$id2])) {
   
   }
  // echo '<br><br>'.$row["id"].'  '. json_encode($dsp,JSON_UNESCAPED_UNICODE);
- $db::sql("UPDATE store_orders_fields SET dostup=? WHERE id=? LIMIT 1",[json_encode($dsp,JSON_UNESCAPED_UNICODE), $row["id"] ]);
+ $db::sql("UPDATE store_orders_fields SET dostup=? WHERE id=?",[json_encode($dsp,JSON_UNESCAPED_UNICODE), $row["id"] ]);
   
 
   
@@ -53,7 +51,7 @@ echo'<h1 class="page-title mb-0 text-primary">Сортировка полей в
 
 $id=(int)$_REQUEST["id"];
 foreach($roles as $id2 => $name) {
- echo'<a href="/shipment/config_sort/?id='.$id2.'" class="btn btn-';
+ echo'<a href="/shipment/config-sort/?id='.$id2.'" class="btn btn-';
 if($id2==$id) echo'success'; else echo'info';
  
  echo' m-1">'.$name.'</a>';
@@ -61,9 +59,9 @@ if($id2==$id) echo'success'; else echo'info';
 
 }
 
-echo'<form method=post action="/shipment/config_sort/?id='.$id.'">
-
-<div class="table-responsive">
+echo'<form method=post action="/shipment/config-sort/?id='.$id.'">';
+echo '<input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />';
+echo '<div class="table-responsive">
 <table class="table" id="recipeTable"><tbody id=draganddropTable>';
 
 
@@ -76,7 +74,7 @@ $fields .="$v";
 $i++;  
 }
 
-$db::sql("INSERT IGNORE INTO  store_orders_fields_sort SET group_id=?, fields_sort=?  ON DUPLICATE KEY UPDATE fields_sort=?",[$id, $fields,$fields]);
+$db::sql("INSERT INTO  store_orders_fields_sort (group_id, fields_sort) VALUES (?, ?)  ON CONFLICT (group_id) DO UPDATE SET fields_sort=?",[$id, $fields,$fields]);
 
 
 
@@ -92,8 +90,9 @@ $sort=$db::getValue("SELECT fields_sort FROM store_orders_fields_sort WHERE grou
 
 
 
-if(!empty($sort)) $data3=$db::getRows("SELECT * FROM store_orders_fields ORDER BY      FIELD(`id`, $sort)  ");
-else $data3=$data;
+//if(!empty($sort)) $data3=$db::getRows("SELECT * FROM store_orders_fields ORDER BY    FIELD(`id`, $sort)  ");
+//else
+$data3=$data;
 
 
 foreach($data3 as $row) {
@@ -235,7 +234,7 @@ $(document).ready(function () {
 ';
 
 
-include"templates/bottom.php"; 
+include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';
        
 
 

diff --git a/erp24/modul/shipment/fields.php b/erp24/modul/shipment/fields.php
index 3ded713b754588fc7424f141fcda991db72d6f3b..c470854d35565224e7e0cbe159e229d27f3b5ed3 100644 (file)
--- a/erp24/modul/shipment/fields.php
+++ b/erp24/modul/shipment/fields.php
@@ -1,10 +1,8 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/design_new.php");
-
-include"templates/top.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");
 
 //if($_SESSION["group_id"]>2) exit("У вас нет доступа");
 
@@ -24,7 +22,7 @@ $db::sql("UPDATE store_orders_fields SET description=? WHERE id=?",[$val,$idr]);
     
 }
 
-$data=$db::getRows("SELECT id, dostup FROM `store_orders_statuses` WHERE 1");
+$data=$db::getRows("SELECT id, dostup FROM store_orders_statuses WHERE 1 = 1");
 foreach($data as $row) {
 $dostup[$row["id"]] = json_decode($row["dostup"], true);    
     
@@ -32,7 +30,7 @@ $dostup[$row["id"]] = json_decode($row["dostup"], true);
 
 
 echo'<form method=post action="/shipment/fields/">';
-
+echo '<input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />';
 
 $data=$db::getRows("SELECT * FROM store_orders_fields");
 echo'<table class="table table-hover"><thead><th width=100>название кратко</th>
@@ -90,9 +88,5 @@ echo'</tbody></table><button class="btn btn-success" name="save" value=1>сох
 
 
 
-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 6c29d82f69ec6ec520ec85c515721feb640f056f..856662171281ff50b8195814f46edf58817003be 100644 (file)
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -579,7 +579,7 @@ global $fieldsRows,$FiledsData ;
           if(!empty($storeId)) { 
               if($fieldsRows[$fieldName]["store_save"]==1 and $fieldsRows[$fieldName]["colors_save"]==1) $show=1;  else $show=0; 
               
-             if(in_array($fieldName,["quantity_warehouseman_fact","quantity_zakup","quantity_zakup_info","quantity_zakup_fact"]))  $show=1; 
+             if(in_array($fieldName,[/*"quantity_warehouseman_fact",*/"quantity_zakup","quantity_zakup_info","quantity_zakup_fact"]))  $show=1;
               
               
           }
@@ -681,7 +681,7 @@ if(!empty($bgNew)) $bg=$bgNew;
    if($dostup=="edit" and $edit==1) {
        
     //  if($color!="NULL" and $fieldName=="quantity_warehouseman_fact")   echo"11$dostup  $edit field_edit=".$fieldsRows[$fieldName]["field_edit"]." ";   
-       printFieldType($valueArray,$fieldName,$productId,$storeId,$color);   
+       printFieldType($valueArray,$fieldName,$productId,$storeId,$color);
        
    }
    else {

diff --git a/erp24/modul/shipment/shipment.php b/erp24/modul/shipment/shipment.php
index 9d80f9eed5aedf08fc6e9c71e7300ac00a13d193..34fff22b7f71b4cb0b82f0e4ab100a22ff47cee1 100644 (file)
--- a/erp24/modul/shipment/shipment.php
+++ b/erp24/modul/shipment/shipment.php
@@ -4,7 +4,7 @@ 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, $act, $store_id;
+global $orderId, $act, $store_id, $ProductsOptions;
 
 $act = 'shipment';
 
@@ -154,7 +154,7 @@ if(count($productsColorsArray[$pid] ?? [])>0) echo'<span onclick="$(\'.trcolors_
 echo'<input type=hidden name=provider_id['.$pid.'] value="'.($prov[$pid]??'').'">';
 echo'</td>';
 
-foreach($data as $row)   printFieldTd($row["name_eng"],$pid,$store_id); 
+foreach($data as $row)   printFieldTd($row["name_eng"],$pid,$store_id);
 
 echo'</tr>';
 

diff --git a/erp24/modul/shipment/statuses_edit.php b/erp24/modul/shipment/statuses_edit.php
index c85939e1a08034eac8c032574124c93f88d460c0..61a5972d11ccf768345f8da9f23bf2943aa85291 100644 (file)
--- a/erp24/modul/shipment/statuses_edit.php
+++ b/erp24/modul/shipment/statuses_edit.php
@@ -1,10 +1,8 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/design_new.php");
-
-include"templates/top.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");
 
 //if($_SESSION["group_id"]>2) exit("У вас нет доступа");  id=7 or id=30 or id=17 or id=70 or id=71  or id=9  or id=51 or id=1 or id=10
 
@@ -40,7 +38,7 @@ $edits=array();
    
  $edits=json_encode($edits,JSON_UNESCAPED_UNICODE);
 // echo"<br>$status_id $edits";
- $db::sql("UPDATE store_orders_statuses SET status_edit_dostup=? WHERE id=? LIMIT 1",[$edits, $status_id ]);
+ $db::sql("UPDATE store_orders_statuses SET status_edit_dostup=? WHERE id=?",[$edits, $status_id ]);
  }    
  
  
@@ -55,11 +53,12 @@ $statuses_dostup[$row["id"]]=json_decode($row["status_edit_dostup"],true,512,JSO
 }
 
 
-echo'<form method=post action="/shipment/statuses_edit/">';
+echo'<form method=post action="/shipment/statuses-edit/">';
+echo '<input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />';
 foreach($store_orders_statuses as $status_id => $status) 
 {
     echo"<h2> <span class=\"btn btn-white\">".$statuses["$status_id"]["number"]."</span> $status 
-    <a href=\"/shipment/statusFieldsSort/?status_id=$status_id\" class=\"btn btn-warning btn-sm\">сортировка полей на статусе</a></h2>
+    <a href=\"/shipment/status-fields-sort/?status_id=$status_id\" class=\"btn btn-warning btn-sm\">сортировка полей на статусе</a></h2>
     <div style=\"display:block;background:#c8fff3;border:1px #e6e6e6 solid\" class=\"p-2\">".$statuses["$status_id"]["description"]."</div>";
     
     echo'<table>';
@@ -74,7 +73,7 @@ foreach($store_orders_statuses as $status_id => $status)
             
            
         echo'<option value="'.$status_id2.'"'; 
-        if(in_array($status_id2,$statuses_dostup[$status_id][$gid])) echo' selected';
+        if(in_array($status_id2,$statuses_dostup[$status_id][$gid] ?? [])) echo' selected';
         
         echo'>'.$status2.' '.$status_id2.'</option>';
         
@@ -92,7 +91,5 @@ echo'<button class="btn btn-success btn-lg m-4" name="save" value=1>сохран
 
 
 
-include"templates/bottom.php"; 
-       
-
+//include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';
 

diff --git a/erp24/views/shipment/config-sort.php b/erp24/views/shipment/config-sort.php
new file mode 100644 (file)
index 0000000..6dd3420
--- /dev/null
+++ b/erp24/views/shipment/config-sort.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/shipment/config_sort.php';
\ No newline at end of file

diff --git a/erp24/views/shipment/config.php b/erp24/views/shipment/config.php
new file mode 100644 (file)
index 0000000..2f6e6a9
--- /dev/null
+++ b/erp24/views/shipment/config.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/shipment/config.php';
\ No newline at end of file

diff --git a/erp24/views/shipment/fields.php b/erp24/views/shipment/fields.php
new file mode 100644 (file)
index 0000000..8731b2e
--- /dev/null
+++ b/erp24/views/shipment/fields.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/shipment/fields.php';
\ No newline at end of file

diff --git a/erp24/views/shipment/statuses-edit.php b/erp24/views/shipment/statuses-edit.php
new file mode 100644 (file)
index 0000000..44c693a
--- /dev/null
+++ b/erp24/views/shipment/statuses-edit.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/shipment/statuses_edit.php';
\ No newline at end of file