Ограничение на большие файлы

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index a6aa1e254db028178ecc854b30744195f5573b67..4ae4d2847d791541192ffe623e521a8a29ddf404 100644 (file)
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -28,8 +28,18 @@ class MotivationService
                 foreach ($spreadSheetRow->getCellIterator() as $spreadSheetRowCell) {
                     $value = $spreadSheetRowCell->getValue();
                     $row []= $value;
+                    if ($row[0] == '###') {
+                        break;
+                    }
+                }
+                if ($row[0] == '###') {
+                    break;
                 }
                 if ($storeStr) {
+                    if (!is_int($row[0] ?? -1)) {
+                        $error = "Индекс магазина не корректен [0,0] '" . $row[0] . "'";
+                        break;
+                    }
                     $store = CityStore::find()->where(['id' => $row[0] ?? -1])->one();
                     if (!$store) {
                         $error = "Не найден магазин с таким индексом [0,0]";

diff --git a/erp24/web/js/motivation/index.js b/erp24/web/js/motivation/index.js
index 4522c800ad48dd22f3f9edea31e4faefd136bb34..bc37ef85ee47a4cc7bc718a1c6ffaca3e977c580 100644 (file)
--- a/erp24/web/js/motivation/index.js
+++ b/erp24/web/js/motivation/index.js
@@ -18,6 +18,10 @@ function openUploadDictionary(showDownloadLink) {
     const info = $modalBody.find('#infoModal').get(0);
     const form = $modalBody.find('form').get(0);
     async function UploadDict() {
+        if (browse.files[0].size > 200000) {
+            info.innerHTML = '<span style="color:red">Некорректный файл. Загрузите файл, заполненный по шаблону.</span>';
+            return;
+        }
         const formData = new FormData(form);
         formData.append(param10, token10);
         try {