что это?*
This commit is contained in:
parent
4fafe85639
commit
ec2d478a62
|
@ -489,6 +489,7 @@ class ProfileController extends Controller
|
||||||
$supply = new Supply(yii::$app->request->post('Supply') ?? yii::$app->request->get('Supply'));
|
$supply = new Supply(yii::$app->request->post('Supply') ?? yii::$app->request->get('Supply'));
|
||||||
$supply->scenario = $supply::SCENARIO_IMPORT_EXCEL;
|
$supply->scenario = $supply::SCENARIO_IMPORT_EXCEL;
|
||||||
$panel = yii::$app->request->post('panel') ?? yii::$app->request->get('panel');
|
$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'));
|
$help = (bool) (yii::$app->request->post('help') ?? yii::$app->request->get('help'));
|
||||||
$target = yii::$app->request->post('account') ?? yii::$app->request->get('account');
|
$target = yii::$app->request->post('account') ?? yii::$app->request->get('account');
|
||||||
$number = yii::$app->request->post('number') ?? yii::$app->request->get('number');
|
$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 [
|
return [
|
||||||
'_csrf' => yii::$app->request->getCsrfToken(),
|
'_csrf' => yii::$app->request->getCsrfToken(),
|
||||||
|
@ -532,7 +533,8 @@ class ProfileController extends Controller
|
||||||
if (Account::isMinimalAuthorized()) {
|
if (Account::isMinimalAuthorized()) {
|
||||||
// Авторизован доступ к выполнению этого действия
|
// Авторизован доступ к выполнению этого действия
|
||||||
|
|
||||||
if ($supply->importExcel((int) $warehouse, $target)) {
|
if ($save) $supply->saveExcel((int) $warehouse, $target);
|
||||||
|
else if ($supply->importExcel((int) $warehouse, $target)) {
|
||||||
// Импорт успешно завершён
|
// Импорт успешно завершён
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
@ -558,7 +560,8 @@ class ProfileController extends Controller
|
||||||
} else {
|
} else {
|
||||||
// Не получен аккаунт для которого необходимо загрузить каталог
|
// Не получен аккаунт для которого необходимо загрузить каталог
|
||||||
|
|
||||||
if ($supply->importExcel((int) $warehouse)) {
|
if ($save) $supply->saveExcel((int) $warehouse, $target);
|
||||||
|
else if ($supply->importExcel((int) $warehouse)) {
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'main' => $this->renderPartial('supplies', compact(
|
'main' => $this->renderPartial('supplies', compact(
|
||||||
|
|
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-grid.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-reboot.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap-utilities.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/css/bootstrap/bootstrap.rtl.min.css.map
Executable file → Normal file
0
mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.js
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.js
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.min.js
vendored
Executable file → Normal file
0
mirzaev/skillparts/system/web/js/bootstrap/bootstrap.esm.min.js
vendored
Executable file → Normal file
Reference in New Issue