From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 26 Jul 2024 10:31:00 +0000 (+0300)
Subject: Небольшие поправки
X-Git-Tag: 1.4~45^2~19
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=501c78829645c31dd7639be86d14320cfc8ff955;p=erp24_rep%2Fyii-erp24%2F.git

Небольшие поправки
---

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index 595dc725..a6aa1e25 100644
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -17,23 +17,18 @@ class MotivationService
         $errors = [];
         foreach ($spreadsheets->getAllSheets() as $spreadSheet) {
             $rows = [];
-            $finish = false;
             $storeStr = true;
             $error = '';
             $motivation = null;
             foreach ($spreadSheet->getRowIterator() as $ind => $spreadSheetRow) {
+                if (in_array($ind, [1, 3])) {
+                    continue;
+                }
                 $row = [];
                 foreach ($spreadSheetRow->getCellIterator() as $spreadSheetRowCell) {
                     $value = $spreadSheetRowCell->getValue();
-                    if ($value == '###') {
-                        $finish = true;
-                        break;
-                    }
                     $row []= $value;
                 }
-                if ($finish) {
-                    break;
-                }
                 if ($storeStr) {
                     $store = CityStore::find()->where(['id' => $row[0] ?? -1])->one();
                     if (!$store) {
diff --git a/erp24/views/motivation/index.php b/erp24/views/motivation/index.php
index f43c5475..5a91c905 100644
--- a/erp24/views/motivation/index.php
+++ b/erp24/views/motivation/index.php
@@ -57,7 +57,7 @@ $this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::P
                 <div class="mb-3"><?= Html::submitButton('Применить', ['class' => 'btn btn-secondary btn-sm'])?></div>
             </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',
+                <div class="mb-3"><?= Html::button('Загрузка плановых значений', ['class' => 'btn btn-success btn-sm',
                         'onclick' => 'openUploadDictionary();'])?></div>
             </div>
         </div>