From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 26 Jul 2024 14:48:06 +0000 (+0300)
Subject: Поправили композер
X-Git-Tag: 1.4~45^2~13
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=9bc6fffb5475f6866cf8a356abef6b4d86ba5cb0;p=erp24_rep%2Fyii-erp24%2F.git

Поправили композер
---

diff --git a/erp24/composer.json b/erp24/composer.json
index 46fe76d7..b3251528 100644
--- a/erp24/composer.json
+++ b/erp24/composer.json
@@ -27,7 +27,7 @@
         "kartik-v/yii2-widget-fileinput": "dev-master",
         "yiisoft/yii2-imagine": "^2.3",
         "kartik-v/yii2-builder": "dev-master",
-        "phpoffice/phpspreadsheet": "^1.12"
+        "phpoffice/phpspreadsheet": "^2.2"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",
diff --git a/erp24/views/motivation/index.php b/erp24/views/motivation/index.php
index 626d1f19..5a91c905 100644
--- a/erp24/views/motivation/index.php
+++ b/erp24/views/motivation/index.php
@@ -58,7 +58,7 @@ $this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::P
             </div>
             <div class="d-flex justify-content-around align-items-center gap-2">
                 <div class="mb-3"><?= Html::button('Загрузка плановых значений', ['class' => 'btn btn-success btn-sm',
-                        'onclick' => 'openUploadDictionary(' . (file_exists(Yii::getAlias('@uploads') . '/template_plan.xlsx') ? 'true' : 'false'). ');'])?></div>
+                        'onclick' => 'openUploadDictionary();'])?></div>
             </div>
         </div>
     </div>
diff --git a/erp24/web/js/motivation/index.js b/erp24/web/js/motivation/index.js
index bc37ef85..568d8827 100644
--- a/erp24/web/js/motivation/index.js
+++ b/erp24/web/js/motivation/index.js
@@ -4,7 +4,7 @@ const param10 = $("meta[name=csrf-param]").attr("content");
 const token10 = $("meta[name=csrf-token]").attr("content");
 
 /* jshint unused: false */
-function openUploadDictionary(showDownloadLink) {
+function openUploadDictionary() {
     'use strict'
     const $mainModal = $('#mainModal');
     const $modalBody = $mainModal.find('.modal-body');
@@ -12,7 +12,7 @@ function openUploadDictionary(showDownloadLink) {
     $mainModal.find('.close').on('click', () => { $mainModal.modal('hide'); });
     $mainModal.find('.modal-title').html('Загрузка плановых значений');
     $modalFooter.html('');
-    $modalBody.html('<div class="row"><div class="col-12"><form class="d-flex justify-content-left align-items-center" enctype="multipart/form-data"><div class="d-none"><input type="file" name="myfile" accept=".xlsx"/></div><div><input class="btn btn-success btn-sm" type="submit" value="Загрузить" /></div>' + (!showDownloadLink ? '' :  '<div><a href="/files/download?url=/uploads/template_plan.xlsx" class="btn btn-link" target="_blank">Скачать</a></div>') + '</form></div></div><div class="row"><div class="col-12" id="infoModal"</div>');
+    $modalBody.html('<div class="row"><div class="col-12"><form class="d-flex justify-content-left align-items-center" enctype="multipart/form-data"><div class="d-none"><input type="file" name="myfile" accept=".xlsx"/></div><div><input class="btn btn-success btn-sm" type="submit" value="Загрузить" /></div></form></div></div><div class="row"><div class="col-12" id="infoModal"></div></div> <div class="row mt-5"><div class="col-12 display-6">Скачать шаблон</div></div><div class="row"><div class="col-12"><a href="/files/download?url=/uploads/template_plan.xlsx" style="font-size: 1.5rem; color: #23389c; text-decoration: underline; " target="_blank">Шаблон. Загрузка плановых значений</a></div></div>');
     const browse = $modalBody.find('input[type=file]').get(0);
     const btn = $modalBody.find('input[type=submit]').get(0);
     const info = $modalBody.find('#infoModal').get(0);