From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 2 Jul 2024 12:40:59 +0000 (+0300)
Subject: Добавление куст шеф флориста в список групп с доступом к закупкам
X-Git-Tag: 1.3~28^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=90a6b7958d55224aa0b12a6d87a17d4b5a77cb9c;p=erp24_rep%2Fyii-erp24%2F.git

Добавление куст шеф флориста в список групп с доступом к закупкам
---

diff --git a/erp24/modul/shipment/config.php b/erp24/modul/shipment/config.php
index cd0c99af..a792476b 100644
--- a/erp24/modul/shipment/config.php
+++ b/erp24/modul/shipment/config.php
@@ -6,7 +6,7 @@ include_once(dirname(__DIR__, 2) . "/inc/design_new.php");
 
 //if($_SESSION["group_id"]>2) exit("У вас нет дступа");
 
-$roles=$db::mapping("SELECT id, name FROM admin_group WHERE id in ('1','10','7','51','9','17','70','50')");
+$roles=$db::mapping("SELECT id, name FROM admin_group WHERE id in ('1','10','7','51','9','17', '18', '70','50')");
 
 
 
@@ -76,7 +76,7 @@ $data=$db::getRows("SELECT * FROM store_orders_fields");
 echo'<h1 class="page-title mb-0 text-primary">Настройка полей в заказе товара</h1>
 <p>Настраиваем для каждого статуса доступ к группам и доступ к каждому полю. 
 
-<a href="/shipment/statuses_edit/" class="btn btn-sm btn-warning">настройка изменения статусов по группам</a>
+<a href="/shipment/statuses-edit/" class="btn btn-sm btn-warning">настройка изменения статусов по группам</a>
 
 </p>
 ';
diff --git a/erp24/modul/shipment/shipment.php b/erp24/modul/shipment/shipment.php
index 1df64651..bac52581 100644
--- a/erp24/modul/shipment/shipment.php
+++ b/erp24/modul/shipment/shipment.php
@@ -81,7 +81,7 @@ $sql="SELECT id,name_eng,name,name_full FROM store_orders_fields"; // TODO: ре
 $data=$db::getRows($sql);
  // получаем массив с данными по полям из таблицы store_orders_fields_data
 $FiledsData=getDataFiledsData($orderId);
- 
+
 
 foreach($data as $row) {
 $dostup=$dostup_fields[$row["id"]] ?? '';
diff --git a/erp24/modul/shipment/statuses_edit.php b/erp24/modul/shipment/statuses_edit.php
index 61a5972d..0515431a 100644
--- a/erp24/modul/shipment/statuses_edit.php
+++ b/erp24/modul/shipment/statuses_edit.php
@@ -28,7 +28,7 @@ foreach($store_orders_statuses as $status_id => $status)
 $edits=array();  
 
         foreach($statuses_groups[$status_id] as $gid) {   
-          foreach($_POST["status_edit_arr"][$status_id][$gid] as $id22 => $arrr2) {  
+          foreach($_POST["status_edit_arr"][$status_id][$gid] ?? [] as $id22 => $arrr2) {
               
             if(!empty($arrr2)) $edits[$gid][]=(int)$arrr2;
               
@@ -57,9 +57,9 @@ 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 
+    echo"<h2> <span class=\"btn btn-white\">".($statuses["$status_id"]["number"] ?? '')."</span> $status 
     <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>";
+    <div style=\"display:block;background:#c8fff3;border:1px #e6e6e6 solid\" class=\"p-2\">".($statuses["$status_id"]["description"] ?? '')."</div>";
     
     echo'<table>';
     foreach($statuses_groups[$status_id] as $gid) {