Merge remote-tracking branch 'origin/master'

Yarik
2 parents 7f5c3aa1 f90160a2
Showing 3 changed files with 14 additions and 17 deletions Show diff stats
console/ImportController.php
models/Import.php
models/TaxGroup.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;
     }
  
@@ -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),
@@ -115,6 +115,7 @@
                 'sort'      => 'Sort',
                 'display'   => 'Display',
                 'is_menu'   => 'Отображать в меню',
+                'level'   => 'уровень',
             ];
         }