From f90160a2fa0e040630944defad0d9e780d9dfba3 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Mon, 14 Nov 2016 13:18:09 +0200
Subject: [PATCH] full commit

---
 console/ImportController.php |  6 +++++-
 models/Import.php            | 24 ++++++++----------------
 models/TaxGroup.php          |  1 +
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/console/ImportController.php b/console/ImportController.php
index 5355741..faf75d7 100755
--- a/console/ImportController.php
+++ b/console/ImportController.php
@@ -19,7 +19,9 @@ class ImportController extends Controller {
 
 
 
-    public function actionProducts($lang) {
+    public function actionProducts() {
+
+        $lang = 'ru';
 
         Language::setCurrent($lang);
 
@@ -27,11 +29,13 @@ class ImportController extends Controller {
             $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_'.$lang.'.lock'));
+
         return Controller::EXIT_CODE_NORMAL;
     }
 
diff --git a/models/Import.php b/models/Import.php
index af4918e..3199caf 100755
--- a/models/Import.php
+++ b/models/Import.php
@@ -622,23 +622,15 @@
             $connection = Yii::$app->getDb();
 
 
-            $connection->createCommand()->addPrimaryKey('product_variant_option_pkey','product_variant_option',['product_variant_id', 'option_id'])->execute();
-            $connection->createCommand()->addPrimaryKey('product_option_pkey','product_option',['product_id', 'option_id'])->execute();
-            $connection->createCommand()->addForeignKey('product_variant_option_product_variant_product_variant_id_fk','product_variant_option','product_variant_id','product_variant','id')->execute();
-            $connection->createCommand()->addForeignKey('product_variant_option_tax_option_tax_option_id_fk','product_variant_option','option_id','tax_option','id')->execute();
-            $connection->createCommand()->addForeignKey('product_option_product_product_id_fk','product_option','product_id','product','id','CASCADE','CASCADE' )->execute();
-            $connection->createCommand()->addForeignKey('product_option_tax_option_tax_option_id_fk','product_option','option_id', 'tax_option', 'id','CASCADE','CASCADE' )->execute();
 
+            $connection->createCommand()->dropForeignKey('product_option_tax_option_tax_option_id_fk','product_option')->execute();
+            $connection->createCommand()->dropForeignKey('product_option_product_product_id_fk','product_option')->execute();
+            $connection->createCommand()->dropForeignKey('product_variant_option_tax_option_tax_option_id_fk','product_variant_option')->execute();
+            $connection->createCommand()->dropForeignKey('product_variant_option_product_variant_product_variant_id_fk','product_variant_option')->execute();
+            $connection->createCommand()->dropPrimaryKey('product_option_pkey','product_option')->execute();
+            $connection->createCommand()->dropForeignKey('product_variant_option_pkey','product_variant_option')->execute();
 
-//            $connection->createCommand()->dropForeignKey('product_option_tax_option_tax_option_id_fk','product_option')->execute();
-//            $connection->createCommand()->dropForeignKey('product_option_product_product_id_fk','product_option')->execute();
-//            $connection->createCommand()->dropForeignKey('product_variant_option_tax_option_tax_option_id_fk','product_variant_option')->execute();
-//            $connection->createCommand()->dropForeignKey('product_variant_option_product_variant_product_variant_id_fk','product_variant_option')->execute();
-//            $connection->createCommand()->dropPrimaryKey('product_option_pkey','product_option')->execute();
-//            $connection->createCommand()->dropForeignKey('product_variant_option_pkey','product_variant_option')->execute();
 
-
-            sleep(1);
             while (( empty( $limit ) || $j++ < $limit ) && ( $data = fgetcsv($handle, 10000, ";") ) !== false) {
                 try {
                     
@@ -677,7 +669,7 @@
                     
                     // 5  Описание товара
                     $product_body = $data[ 3 ];
-                    
+
                     // 6  Фильтр
                     $filters = explode('*', $data[ 4 ]);
                     
@@ -798,7 +790,7 @@
             $connection->createCommand()->addForeignKey('product_option_tax_option_tax_option_id_fk','product_option','option_id', 'tax_option', 'id','CASCADE','CASCADE' )->execute();
 
 
-            
+
             $result = [
                 'end'       => feof($handle),
                 'from'      => ftell($handle),
diff --git a/models/TaxGroup.php b/models/TaxGroup.php
index 24423ff..575494b 100755
--- a/models/TaxGroup.php
+++ b/models/TaxGroup.php
@@ -115,6 +115,7 @@
                 'sort'      => 'Sort',
                 'display'   => 'Display',
                 'is_menu'   => 'Отображать в меню',
+                'level'   => 'уровень',
             ];
         }
         
--
libgit2 0.21.4