]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
ERP-417
authormarina <m.zozirova@gmail.com>
Wed, 28 May 2025 11:53:00 +0000 (14:53 +0300)
committermarina <m.zozirova@gmail.com>
Wed, 28 May 2025 11:53:00 +0000 (14:53 +0300)
erp24/controllers/WriteOffsErpController.php

index 6a9df064417a303aea966aaf66ca42bb9f6d903a..3a3348c50ba8d13ea3bde60085f96d298b00d00c 100644 (file)
@@ -835,16 +835,18 @@ class WriteOffsErpController extends Controller
                             $imageFiles = ArrayHelper::getValue($productFilesArray, 'imageFiles', []);
                             $videoFile = ArrayHelper::getValue($productFilesArray, 'videoFiles');
                             $hasNewPhotos = !empty(array_filter($imageFiles));
-                            $hasVideo = !empty($videoFile);
 
-                            if ((int)$modelProduct->add_image !== 1 && !$hasNewPhotos && !$hasVideo) {
-                                ImageDocumentLink::deleteCurrentLinkImage($writeOffsErpId, $modelProductId, $documentGroupId, $adminId);
+                            $flagAddImage = (int)$modelProduct->add_image;
+
+                            if (!$flagAddImage) {
+                                if ($hasNewPhotos) {
+                                    ImageDocumentLink::deleteCurrentLinkImage($writeOffsErpId, $modelProductId, $documentGroupId, $adminId);
+                                }
                             }
-                            
+
                             if ($hasNewPhotos) {
-                                foreach ($imageFiles as $index => $imageFile) {
+                                foreach ($imageFiles as $imageFile) {
                                     if (Images::isImageFile($imageFile)) {
-                                        Yii::info("Загружаем фото #$index: " . ($imageFile->name ?? 'нет имени'), __METHOD__);
                                         $image = new Images();
                                         $imageId = $image->loadImage($imageFile);
                                         if ($imageId) {
@@ -856,14 +858,10 @@ class WriteOffsErpController extends Controller
                                                 ->setDocumentId($writeOffsErpId)
                                                 ->setDocumentItemId($modelProductId)
                                                 ->setImageId($imageId);
-                                            if (!$imageDocumentLink->validate() || !$imageDocumentLink->save()) {
-                                                Yii::warning("Ошибки валидации/saving ImageDocumentLink для фото #$index", __METHOD__);
+                                            if ($imageDocumentLink->validate()) {
+                                                $imageDocumentLink->save();
                                             }
-                                        } else {
-                                            Yii::warning("Не удалось загрузить фото #$index", __METHOD__);
                                         }
-                                    } else {
-                                        Yii::info("Файл #$index не является изображением", __METHOD__);
                                     }
                                 }
                             }