From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Fri, 19 Apr 2024 13:26:57 +0000 (+0300)
Subject: правки по картинкам в списании в erp
X-Git-Tag: 1.1~123^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=3c46c155fd86bae513270b570f9a4a0af21ad436;p=erp24_rep%2Fyii-erp24%2F.git

правки по картинкам в списании в erp
скрытие пункта в Автозаказе
---

diff --git a/erp24/helpers/File.php b/erp24/helpers/File.php
index 90fbee36..aa45c5e0 100644
--- a/erp24/helpers/File.php
+++ b/erp24/helpers/File.php
@@ -115,7 +115,8 @@ class File extends FileHelper
 		$substr = substr($filename, 0, 2);
 		$imagePath = self::filepath($filename, 'images');
         $uploadDir = \Yii::getAlias('@uploads');
-		$resizePath = $uploadDir . "/images/resize/{$substr}/{$w}_{$h}_{$quality}";
+        $uploadPathDir = 'uploads';
+		$resizePath = $uploadPathDir . "/images/resize/{$substr}/{$w}_{$h}_{$quality}";
 		$resizedUrl = "{$resizePath}/{$filename}";
 		$resizedPath = $uploadDir . "/images/resize/{$substr}/{$w}_{$h}_{$quality}";
 		$resizedFile = "{$resizedPath}/{$filename}";
diff --git a/erp24/modul/shipment/index.php b/erp24/modul/shipment/index.php
index 94446441..536017dd 100644
--- a/erp24/modul/shipment/index.php
+++ b/erp24/modul/shipment/index.php
@@ -98,7 +98,7 @@ if($row["status"]>=6) echo'<a class="dropdown-item" href=/shipment/division-stor
 ';
 
 if(in_array($_SESSION["group_id"],[1,70,10])) {
-    echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$row["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';  
+//    echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$row["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';
 }
 
 
@@ -224,7 +224,7 @@ echo'<a class="dropdown-item" href=/shipment/division-store/?id='.$rows["id"].'>
 ';
 
 if(in_array($_SESSION["group_id"],[1,70,10])) {
-    echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$rows["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';  
+//    echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$rows["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';
 }
 if($rows["status"]>=6) echo'
 <a class="dropdown-item" href=/shipment/store-order-score/?id='.$rows["id"].'>Оценка качества цветка в поставке <sup class="btn btn-sm btn-success">new</sup></a>';
diff --git a/erp24/services/TimetableService.php b/erp24/services/TimetableService.php
index 7fee6eb0..5ec5ed78 100755
--- a/erp24/services/TimetableService.php
+++ b/erp24/services/TimetableService.php
@@ -50,8 +50,8 @@ class TimetableService
     {
         $storeIds = [];
 
-        $parentAdmin = Admin::find()->select(['store_id', 'store_arr', 'org_id', 'group_id', 'id'])->andWhere(['id' => $adminId])->asArray()->one();
-        $storeIdsString = ArrayHelper::getValue($parentAdmin, 'store_arr');
+        $admin = Admin::find()->select(['store_id', 'store_arr', 'org_id', 'group_id', 'id'])->andWhere(['id' => $adminId])->asArray()->one();
+        $storeIdsString = ArrayHelper::getValue($admin, 'store_arr');
         if (!empty($storeIdsString)) {
 
 
@@ -82,7 +82,7 @@ class TimetableService
             }
         }
         if (empty($storeIds)) {
-            $storeIds[] = ArrayHelper::getValue($parentAdmin, 'store_id');
+            $storeIds[] = ArrayHelper::getValue($admin, 'store_id');
         }
         return $storeIds;
     }