Импорт = $method == 'prices' ? 'цен' : 'данных'?> товаров
diff --git a/common/modules/product/views/manage/import.php b/common/modules/product/views/manage/import.php
index 81f9a31..7a7a339 100755
--- a/common/modules/product/views/manage/import.php
+++ b/common/modules/product/views/manage/import.php
@@ -1,35 +1,47 @@
false,
- 'options' => ['enctype' => 'multipart/form-data']
+ 'options' => [ 'enctype' => 'multipart/form-data' ],
]); ?>
-
- errors) :?>
-
- = implode("
\n", $model->errors);?>
-
-
-
- output) :?>
+
+ errors) : ?>
+
+ = implode("
\n", $model->errors); ?>
+
+
+
+ output) : ?>
Лог операции
-
- = implode("
\n", $model->output);?>
-
-
-
- = $form->field($model, 'type')->radioList([
- 'products' => Yii::t('product', 'Load products'),
- 'prices' => Yii::t('product', 'Load prices'),
- ]);?>
-
- = $form->field($model, 'file')->fileInput(['multiple' => false,])?>
-
+
+ = implode("
\n", $model->output); ?>
+
+
+
+ = $form->field($model, 'type')
+ ->radioList([
+ 'products' => Yii::t('product', 'Load products'),
+ 'prices' => Yii::t('product', 'Load prices'),
+ ]); ?>
+
+ = $form->field($model, 'lang')
+ ->dropDownList($languages); ?>
+
+ = $form->field($model, 'file')
+ ->fileInput([ 'multiple' => false, ]) ?>
+
field($model, 'file')->widget(\kartik\file\FileInput::classname(), [
'language' => 'ru',
'options' => [
@@ -41,11 +53,11 @@ use yii\widgets\ActiveForm;
'showRemove' => false,
'showUpload' => false,
],
- ])*/?>
-
+ ])*/ ?>
+
- = Html::submitButton(Yii::t('product', 'Import'), ['class' => 'btn btn-primary']) ?>
+ = Html::submitButton(Yii::t('product', 'Import'), [ 'class' => 'btn btn-primary' ]) ?>
-
+
diff --git a/common/modules/rubrication/models/TaxOption.php b/common/modules/rubrication/models/TaxOption.php
index b3e7126..b3291e8 100755
--- a/common/modules/rubrication/models/TaxOption.php
+++ b/common/modules/rubrication/models/TaxOption.php
@@ -63,10 +63,10 @@
],
],
],
- 'artboxtree' => [
- 'class' => ArtboxTreeBehavior::className(),
- 'keyNameGroup' => 'tax_group_id',
- ],
+// 'artboxtree' => [
+// 'class' => ArtboxTreeBehavior::className(),
+// 'keyNameGroup' => 'tax_group_id',
+// ],
'language' => [
'class' => LanguageBehavior::className(),
],
diff --git a/console/controllers/ImportController.php b/console/controllers/ImportController.php
index 886a64b..445a60c 100755
--- a/console/controllers/ImportController.php
+++ b/console/controllers/ImportController.php
@@ -20,15 +20,15 @@ class ImportController extends Controller {
}
public function actionProducts() {
- if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
- $this->errors[] = 'Task already executed';
- return Controller::EXIT_CODE_ERROR;
- }
- $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
- fclose($ff);
+// if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
+// $this->errors[] = 'Task already executed';
+// return Controller::EXIT_CODE_ERROR;
+// }
+// $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
+// fclose($ff);
$model = new Import();
$model->goProducts(0, null);
- unlink(Yii::getAlias('@uploadDir/goProducts.lock'));
+// unlink(Yii::getAlias('@uploadDir/goProducts.lock'));
return Controller::EXIT_CODE_NORMAL;
}
diff --git a/console/migrations/m161011_104931_create_stock_lang_table.php b/console/migrations/m161011_104931_create_stock_lang_table.php
new file mode 100644
index 0000000..f47a7da
--- /dev/null
+++ b/console/migrations/m161011_104931_create_stock_lang_table.php
@@ -0,0 +1,39 @@
+createTable('stock_lang', [
+ 'stock_id' => $this->integer()
+ ->notNull(),
+ 'language_id' => $this->integer()
+ ->notNull(),
+ 'name' => $this->string()
+ ->notNull(),
+ ]);
+ $this->createIndex('stock_lang_stock_language_key', 'stock_lang', [
+ 'stock_id',
+ 'language_id',
+ ], true);
+
+ $this->addForeignKey('stock_fk', 'stock_lang', 'stock_id', 'stock', 'stock_id', 'CASCADE', 'CASCADE');
+ $this->addForeignKey('language_fk', 'stock_lang', 'language_id', 'language', 'language_id', 'RESTRICT', 'CASCADE');
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function down()
+ {
+ $this->dropTable('stock_lang');
+ }
+}
--
libgit2 0.21.4