diff --git a/mirzaev/skillparts/system/controllers/ProfileController.php b/mirzaev/skillparts/system/controllers/ProfileController.php index f566f53..c809bbf 100644 --- a/mirzaev/skillparts/system/controllers/ProfileController.php +++ b/mirzaev/skillparts/system/controllers/ProfileController.php @@ -489,6 +489,7 @@ class ProfileController extends Controller $supply = new Supply(yii::$app->request->post('Supply') ?? yii::$app->request->get('Supply')); $supply->scenario = $supply::SCENARIO_IMPORT_EXCEL; $panel = yii::$app->request->post('panel') ?? yii::$app->request->get('panel'); + $save = yii::$app->request->post('save') ?? yii::$app->request->get('save') ?? true; $help = (bool) (yii::$app->request->post('help') ?? yii::$app->request->get('help')); $target = yii::$app->request->post('account') ?? yii::$app->request->get('account'); $number = yii::$app->request->post('number') ?? yii::$app->request->get('number'); @@ -506,7 +507,7 @@ class ProfileController extends Controller // Запрошена отправка прайса модератору // Отправка письма модераторам - $mail = Supply::sendMailForImport('ЗАГРУЗИТЬ ФАЙЛ НА СЕРВЕР НАДО'); + $mail = Supply::sendMailForImport('НАДО ЗАГРУЗИТЬ ФАЙЛ НА СЕРВЕР (тестирование)'); return [ '_csrf' => yii::$app->request->getCsrfToken(), @@ -532,7 +533,8 @@ class ProfileController extends Controller if (Account::isMinimalAuthorized()) { // Авторизован доступ к выполнению этого действия - if ($supply->importExcel((int) $warehouse, $target)) { + if ($save) $supply->saveExcel((int) $warehouse, $target); + else if ($supply->importExcel((int) $warehouse, $target)) { // Импорт успешно завершён return [ @@ -558,7 +560,8 @@ class ProfileController extends Controller } else { // Не получен аккаунт для которого необходимо загрузить каталог - if ($supply->importExcel((int) $warehouse)) { + if ($save) $supply->saveExcel((int) $warehouse, $target); + else if ($supply->importExcel((int) $warehouse)) { return [ 'main' => $this->renderPartial('supplies', compact( diff --git a/mirzaev/skillparts/system/views/invoice/order/pattern.pdf b/mirzaev/skillparts/system/views/invoice/order/pattern.pdf old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css.map b/mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.js b/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.js old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.js.map b/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.js.map old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.min.js b/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.min.js old mode 100755 new mode 100644 diff --git a/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.min.js.map b/mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.min.js.map old mode 100755 new mode 100644