From: marina Date: Thu, 22 May 2025 09:19:06 +0000 (+0300) Subject: ERP-417 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=2d2d6628a2fac006afd04575e287c72edbe44633;p=erp24_rep%2Fyii-erp24%2F.git ERP-417 --- diff --git a/erp24/controllers/WriteOffsErpController.php b/erp24/controllers/WriteOffsErpController.php index 566a16bd..bcdf521f 100644 --- a/erp24/controllers/WriteOffsErpController.php +++ b/erp24/controllers/WriteOffsErpController.php @@ -177,7 +177,7 @@ class WriteOffsErpController extends Controller $listCauseDict = WriteOffsProductsErp::getCauseList(); $model->listCauseDict = $listCauseDict; - $start = strtotime($model->getSendAt()); + $start = strtotime($model->getSendAt() ?? ''); $startCheck = time() - 300; if ($start > $startCheck) { diff --git a/erp24/views/bouquet/index.php b/erp24/views/bouquet/index.php index a2a14bf5..acaf97ac 100644 --- a/erp24/views/bouquet/index.php +++ b/erp24/views/bouquet/index.php @@ -108,7 +108,7 @@ $this->title = 'Содержание матрицы'; $previewImageUrls = array_slice($allImageUrls, 0, 3); $previewImageUrls += array_fill(0, 3 - count($previewImageUrls), null); - $imageGalleryId = 'gallery-images-' . $model->id; + $imageGaxxlleryId = 'gallery-images-' . $model->id; $videoGalleryId = 'gallery-video-' . $model->id; $hiddenLinks = ""; diff --git a/erp24/views/write_offs_erp/_form.php b/erp24/views/write_offs_erp/_form.php index 41afe87d..0d60d758 100644 --- a/erp24/views/write_offs_erp/_form.php +++ b/erp24/views/write_offs_erp/_form.php @@ -34,6 +34,20 @@ $this->registerJsFile('/js/validate/validateForm.js', ['position' => \yii\web\Vi $this->registerJsFile('/js/heic2any.min.js', ['position' => \yii\web\View::POS_END]); $this->registerJsFile('/js/heic_to_jpg_replace.js', ['position' => \yii\web\View::POS_END]); +$this->registerJs(<< +}); +JS, \yii\web\View::POS_READY); -
+?> + -

title) ?>

+
-

number . ' от '. $model->date;?>

-

+

title) ?>

-
- number . ' от ' . $model->date; ?> +

+ +
+ $model, - 'attributes' => [ + echo DetailView::widget([ + 'model' => $model, + 'attributes' => [ // 'id', - 'guid', - 'date', - 'number', - [ - 'attribute' => 'created_admin_id', - 'value' => function ($model) { - return $model->createdAdmin ? $model->createdAdmin->name : ''; - } - ], - [ - 'attribute' => 'confirm_admin_id', - 'value' => function ($model) { - return $model->confirmAdmin ? $model->confirmAdmin->name : ''; - } - ], + 'guid', + 'date', + 'number', + [ + 'attribute' => 'created_admin_id', + 'value' => function ($model) { + return $model->createdAdmin ? $model->createdAdmin->name : ''; + } + ], + [ + 'attribute' => 'confirm_admin_id', + 'value' => function ($model) { + return $model->confirmAdmin ? $model->confirmAdmin->name : ''; + } + ], // 'updated_admin_id', // 'store_id', - [ - 'attribute' => 'cityStoreName', - 'label' => 'Магазин', - 'value'=>function ($data) { + [ + 'attribute' => 'cityStoreName', + 'label' => 'Магазин', + 'value' => function ($data) { // $cityStore = \yii\helpers\ArrayHelper::getValue($data->getRelatedRecords(),'cityStore'); // return $cityStore ? $cityStore->name_full : $data->store_id; // $cityStore = \yii\helpers\ArrayHelper::getValue($data->getRelatedRecords(),'cityStore'); - return $data->cityStoreList ? $data->cityStoreList->name_full : $data->store_id; - } - ], + return $data->cityStoreList ? $data->cityStoreList->name_full : $data->store_id; + } + ], // 'store_guid', // 'based_on:ntext', - 'write_offs_type', - 'quantity', - 'summ', - 'comment:ntext', - 'error_text:ntext', - [ - 'attribute' => 'status', - 'filter' => WriteOffsErp::getStatusDict(), - 'value' => function ($data) { - return \yii\helpers\ArrayHelper::getValue(WriteOffsErp::getStatusDict(), $data->status); - } - ], - [ - 'attribute' => 'number_1c', - 'value' => function ($data) { - return $data->number_1c ?? ''; - } - ], + 'write_offs_type', + 'quantity', + 'summ', + 'comment:ntext', + 'error_text:ntext', + [ + 'attribute' => 'status', + 'filter' => WriteOffsErp::getStatusDict(), + 'value' => function ($data) { + return \yii\helpers\ArrayHelper::getValue(WriteOffsErp::getStatusDict(), $data->status); + } + ], + [ + 'attribute' => 'number_1c', + 'value' => function ($data) { + return $data->number_1c ?? ''; + } + ], // 'summ_retail', // 'created_at', // 'send_at', - [ - 'attribute' => 'send_at', - 'value' => function ($data) { - return $data->send_at ?? 'не отправлен'; - } - ], -// 'updated_at', - [ - 'attribute' => 'productsList', - 'label' => 'Товары', - 'format' => 'raw', - 'value' => function ($model) { - $dataTable = ''; - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; - if (!$model->isShowSum) { - $dataTable .= ''; - $dataTable .= ''; - } - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; - foreach ($model->writeOffsProductsErps as $key => $product) { - $causeName = $product['cause_id']; - if (!empty($model->listCauseDict)) { - $causeName = ArrayHelper::getValue($model->listCauseDict, $product['cause_id']); + [ + 'attribute' => 'send_at', + 'value' => function ($data) { + return $data->send_at ?? 'не отправлен'; } - $forWidget = false; - $images = WriteOffsErp::getImagesList($product->imagesWriteOffsErp, $forWidget); - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; + ], +// 'updated_at', + [ + 'attribute' => 'productsList', + 'label' => 'Товары', + 'format' => 'raw', + 'value' => function ($model) { + $dataTable = '
НазваниеКоличествоЦенаСуммаПричина списанияКоментарийИзображения
' . $product['name'] . '' . $product['quantity'] . '
'; + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; if (!$model->isShowSum) { - $dataTable .= ''; - $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; } - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; + foreach ($model->writeOffsProductsErps as $key => $product) { + $causeName = $product['cause_id']; + if (!empty($model->listCauseDict)) { + $causeName = ArrayHelper::getValue($model->listCauseDict, $product['cause_id']); } - } + $forWidget = false; + $images = WriteOffsErp::getImagesList($product->imagesWriteOffsErp, $forWidget); + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; + if (!$model->isShowSum) { + $dataTable .= ''; + $dataTable .= ''; + } + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; - $dataTable .= ''; - } - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; - if (!$model->isShowSum) { + + $dataTable .= ''; + $dataTable .= ''; + } + $dataTable .= ''; $dataTable .= ''; - $dataTable .= ''; - } - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= ''; - $dataTable .= '
НазваниеКоличество' . $product['price'] . '' . $product['summ'] . 'ЦенаСумма' . $causeName . '' . $product['comment'] . ''; - - if (!empty($images)) { - if ($forWidget) { - $dataTable .= ''; - } else { - $dataTable .= implode('', $images); + $dataTable .= 'Причина списанияКоментарийИзображенияВидео
' . $product['name'] . '' . $product['quantity'] . '' . $product['price'] . '' . $product['summ'] . '' . $causeName . '' . $product['comment'] . ''; ?> + imagesWriteOffsErp; ?> + + + + + '; + $dataTable .= ''; + + if (!empty($videos)) { + if ($forWidget) { + $dataTable .= ''; + } else { + $dataTable .= implode('', $videos); + } + } - $dataTable .= '
' . $model->summ . '
'; - return $dataTable; - }, - ] - ], - ]) ?> -
+ $dataTable .= ''; + if (!$model->isShowSum) { + $dataTable .= ''; + $dataTable .= '' . $model->summ . ''; + } + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; + $dataTable .= ''; + return $dataTable; + }, + ] + ], + ]) ?> +
-
-

+

+

-

-
-

- 'btn btn-primary']) ?> +

+
+

+ 'btn btn-primary']) ?> status === \yii_app\records\WriteOffsErp::STATUS_CREATED) { echo Html::a('Изменить', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']); @@ -187,20 +231,20 @@ $this->registerCssFile('/css/write-offs-erp.css', ['position' => \yii\web\View:: ], ]); - ?>

- -

+ + + ]); ?> - + - 'btn btn-success btn-lg', - 'onclick' => " + 'btn btn-success btn-lg', + 'onclick' => " if (confirm('Вы уверены, что хотите согласовать этот документ?')) { $('.error-text').text(''); $.ajax ({ @@ -225,12 +269,12 @@ $this->registerCssFile('/css/write-offs-erp.css', ['position' => \yii\web\View:: } " - ]); - ?> - - + +

registerCssFile('/css/write-offs-erp.css', ['position' => \yii\web\View:: ]); ?> - + registerCssFile('/css/write-offs-erp.css', ['position' => \yii\web\View:: -

+

-
+