From 28df4299814f6e83bd055a4cff30abc1b52eb857 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 23 May 2025 16:48:40 +0300 Subject: [PATCH] ERP-417 --- erp24/controllers/WriteOffsErpController.php | 22 ++++++++++++++------ erp24/records/WriteOffsProductsErp.php | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/erp24/controllers/WriteOffsErpController.php b/erp24/controllers/WriteOffsErpController.php index d774b136..e986c295 100644 --- a/erp24/controllers/WriteOffsErpController.php +++ b/erp24/controllers/WriteOffsErpController.php @@ -14,6 +14,7 @@ use yii_app\helpers\DataHelper; use yii_app\helpers\LoadFileHelper; use yii_app\records\Admin; use yii_app\records\CityStore; +use yii_app\records\Files; use yii_app\records\ImageDocumentLink; use yii_app\records\Images; use yii_app\records\MultipleModel; @@ -25,6 +26,7 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii_app\records\WriteOffsProductsErp; +use yii_app\services\FileService; use yii_app\services\TimetableService; /** @@ -805,7 +807,6 @@ class WriteOffsErpController extends Controller $writeOffsErpFiles = LoadFileHelper::getInstancesByName('WriteOffsErp', true); - var_dump($writeOffsErpFiles);die(); if (!empty($writeOffsErpFiles)) { $modelsProductsFiles = ArrayHelper::getValue($writeOffsErpFiles, 'modelsProducts'); } @@ -822,7 +823,7 @@ class WriteOffsErpController extends Controller $transaction->rollBack(); break; } - // save files to product write off proof + if (!empty($modelsProductsFiles)) { if (array_key_exists($keyModelProduct, $modelsProductsFiles)) { $modelProductId = $modelProduct->id; @@ -831,8 +832,9 @@ class WriteOffsErpController extends Controller ImageDocumentLink::deleteCurrentLinkImage($writeOffsErpId, $modelProductId, $documentGroupId, $adminId); } - $imageFilesArray = ArrayHelper::getValue($modelsProductsFiles, $keyModelProduct); - $imageFiles = ArrayHelper::getValue($imageFilesArray, 'imageFiles'); + $productFilesArray = ArrayHelper::getValue($modelsProductsFiles, $keyModelProduct); + + $imageFiles = ArrayHelper::getValue($productFilesArray, 'imageFiles', []); foreach ($imageFiles as $imageFile) { if (Images::isImageFile($imageFile)) { $image = new Images(); @@ -845,16 +847,24 @@ class WriteOffsErpController extends Controller ->setDocumentId($writeOffsErpId) ->setDocumentItemId($modelProductId) ->setImageId($imageId); - $validate = $imageDocumentLink->validate(); - if ($validate) { + if ($imageDocumentLink->validate()) { $imageDocumentLink->save(); } } } + + $videoFile = ArrayHelper::getValue($productFilesArray, 'videoFiles'); + if ($videoFile) { + Files::findAll(['entity_id' => $writeOffsErpId, 'entity' => WriteOffsProductsErp::WRITE_OFFS_VIDEO]); + FileService::saveUploadedFile($videoFile, WriteOffsProductsErp::WRITE_OFFS_VIDEO, $modelProductId); + } } } } } + if ($flag) { + $transaction->commit(); + } if ($flag) { $transaction->commit(); return $this->redirect(['/write-offs-erp/view', 'id' => $model->id]); diff --git a/erp24/records/WriteOffsProductsErp.php b/erp24/records/WriteOffsProductsErp.php index b2add008..a327a650 100644 --- a/erp24/records/WriteOffsProductsErp.php +++ b/erp24/records/WriteOffsProductsErp.php @@ -33,6 +33,8 @@ use yii\helpers\ArrayHelper; */ class WriteOffsProductsErp extends \yii\db\ActiveRecord { + + public const WRITE_OFFS_VIDEO = 'write_offs_products_erp_video'; /** * {@inheritdoc} */ -- 2.39.5