-

Karnovsky A
1 parent 8724ec1f
Showing 12 changed files with 454 additions and 22 deletions Show diff stats
backend/config/bootstrap.php
common/modules/product/controllers/ManageController.php
common/modules/product/models/Product.php
common/modules/product/models/ProductStock.php
common/modules/product/models/ProductVariant.php
common/modules/product/models/Stock.php
common/modules/product/models/StockQuery.php
common/modules/product/models/import.php
common/modules/product/views/manage/import.php
console/config/bootstrap.php
console/controllers/ImportController.php
frontend/views/catalog/product.php
 <?php
 Yii::setAlias('@uploadDir', dirname(dirname(__DIR__)) . '/storage/sync');
 Yii::setAlias('@uploadFileProducts', 'products.csv');
+Yii::setAlias('@uploadFilePrices', 'prices.csv');
+Yii::setAlias('@uploadFilePricesAway', 'price_product_away.csv');
+Yii::setAlias('@uploadFilePricesDuplicate', 'price_duplicate.csv');
+Yii::setAlias('@uploadFilePricesNoVariant', 'price_no_variant.csv');
 Yii::setAlias('@productsDir', '@frontend/web/images/products');
 \ No newline at end of file
@@ -264,12 +264,15 @@ class ManageController extends Controller
     public function actionImport() {
         $model = new Import();
-        if (Yii::$app->request->isPost) {
+        if ($model->load(Yii::$app->request->post())) {
             $file = UploadedFile::getInstances($model, 'file');
-            if (!empty($file[0]) && $model->validate() && $file[0]->saveAs(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts'))) {
-                $model->go();
+            $method = 'go'. ucfirst($model->type);
+            if (!empty($file) && $model->validate()) {
+                $file[0]->saveAs(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFile'. ucfirst($model->type)));
+                $model->$method();
             }
         }
+
         return $this->render('import', [
             'model' => $model,
         ]);
@@ -188,6 +188,10 @@ class Product extends \yii\db\ActiveRecord
         return $this->getRelations('product_option');
     }
+    public function getStocks() {
+        return $this->hasMany(Stock::className(), ['stock_id' => 'stock_id'])->viaTable(ProductStock::tableName(), ['product_id' => 'product_id']);
+    }
+
     /**
      * @inheritdoc
      * @return ProductQuery the active query used by this AR class.
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "product_stock".
+ *
+ * @property integer $product_id
+ * @property integer $stock_id
+ * @property integer $quantity
+ * @property integer $product_variant_id
+ *
+ * @property Product $product
+ * @property ProductVariant $productVariant
+ * @property Stock $stock
+ */
+class ProductStock extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'product_stock';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['product_id', 'stock_id', 'quantity', 'product_variant_id'], 'integer'],
+            [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']],
+            [['product_variant_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProductVariant::className(), 'targetAttribute' => ['product_variant_id' => 'product_variant_id']],
+            [['stock_id'], 'exist', 'skipOnError' => true, 'targetClass' => Stock::className(), 'targetAttribute' => ['stock_id' => 'stock_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'product_id' => 'Product ID',
+            'stock_id' => 'Stock ID',
+            'quantity' => 'Quantity',
+            'product_variant_id' => 'Product Variant ID',
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProduct()
+    {
+        return $this->hasOne(Product::className(), ['product_id' => 'product_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProductVariant()
+    {
+        return $this->hasOne(ProductVariant::className(), ['product_variant_id' => 'product_variant_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getStock()
+    {
+        return $this->hasOne(Stock::className(), ['stock_id' => 'stock_id']);
+    }
+}
@@ -3,6 +3,7 @@
 namespace common\modules\product\models;
 use Yii;
+use yii\helpers\ArrayHelper;
 /**
  * This is the model class for table "product_variant".
@@ -33,6 +34,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     public $translit;
     public $translit_rubric;
     private $data;
+    public $stocks = [];
     /** @var array $_images */
 //    public $imagesUpload = [];
@@ -106,8 +108,12 @@ class ProductVariant extends \yii\db\ActiveRecord
         return $this->hasOne(Product::className(), ['product_id' => 'product_id']);
     }
-    public function getEnabled() {
-        return $this->stock !== 0;
+    public function getQuantity() {
+        return ProductStock::find()
+            ->where(['product_variant_id' => $this->product_variant_id])
+            ->sum('quantity');
+//        return $this->hasMany(Stock::className(), ['stock_id' => 'stock_id'])->viaTable(ProductStock::tableName(), ['product_id' => 'product_id'])->sum(ProductStock::tableName() .'.quantity') > 0;
+//        return $this->stock !== 0;
     }
     public function getStock_caption() {
@@ -157,7 +163,36 @@ class ProductVariant extends \yii\db\ActiveRecord
         return $this->product_variant_id;
     }
+    public function setStocks($stocks) {
+        $this->stocks = (array) $stocks;
+    }
+
+    /*public function getStocks() {
+        return $this->hasMany(Stock::className(), ['stock_id' => 'stock_id'])->viaTable(ProductStock::tableName(), ['product_variant_id' => 'product_variant_id']);
+    }
+
+    public function getStocksIds() {
+        return ArrayHelper::getColumn($this->hasMany(Stock::className(), ['stock_id' => 'stock_id'])->viaTable(ProductStock::tableName(), ['product_variant_id' => 'product_variant_id'])->all(), 'stock_id');
+    }*/
+
+    public function afterSave($insert, $changedAttributes)
+    {
+        if (!empty($this->stocks)) {
+            ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
+            $values = [];
+            foreach ($this->stocks as $id => $quantity) {
+                $values[] = [$this->product_id, $this->product_variant_id, $id, $quantity];
+            }
+            if ($values) {
+                self::getDb()->createCommand()
+                    ->batchInsert(ProductStock::tableName(), ['product_id', 'product_variant_id', 'stock_id', 'quantity'], $values)->execute();
+            }
+        }
+        parent::afterSave($insert, $changedAttributes);
+    }
+
     public function beforeDelete() {
         ProductImage::deleteAll(['product_variant_id' => $this->product_variant_id]);
+        ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
     }
 }
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "stock".
+ *
+ * @property integer $stock_id
+ * @property string $name
+ *
+ * @property ProductStock[] $productStocks
+ */
+class Stock extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'stock';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'string', 'max' => 150],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'stock_id' => Yii::t('product', 'Stock ID'),
+            'name' => Yii::t('product', 'Name'),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     * @return StockQuery the active query used by this AR class.
+     */
+    public static function find()
+    {
+        return new StockQuery(get_called_class());
+    }
+}
+<?php
+
+namespace common\modules\product\models;
+
+/**
+ * This is the ActiveQuery class for [[Stock]].
+ *
+ * @see Stock
+ */
+class StockQuery extends \yii\db\ActiveQuery
+{
+    /*public function active()
+    {
+        return $this->andWhere('[[status]]=1');
+    }*/
+
+    /**
+     * @inheritdoc
+     * @return Stock[]|array
+     */
+    public function all($db = null)
+    {
+        return parent::all($db);
+    }
+
+    /**
+     * @inheritdoc
+     * @return Stock|array|null
+     */
+    public function one($db = null)
+    {
+        return parent::one($db);
+    }
+}
@@ -18,6 +18,7 @@ use yii\base\Model;
 class Import extends Model {
     public $file;
+    public $type;
     public $errors = [];
     public $output = [];
@@ -28,8 +29,10 @@ class Import extends Model {
     public function rules()
     {
         return [
-//            [['file'], 'safe'],
-            [['file'], 'file'],
+            [['type'], 'required'],
+            [['type'], 'string'],
+            [['file'], 'safe'],
+            [['file'], 'file', 'extensions' => 'csv'],
         ];
     }
@@ -43,13 +46,18 @@ class Import extends Model {
         ];
     }
-    public function go() {
+    public function getType() {
+        if (!$this->type) {
+            $this->type = 'products';
+        }
+        return $this->type;
+    }
+    public function goProducts() {
+        set_time_limit(0);
         $new_products = $linked_products = 0;
-        $db = yii::$app->db;
-
-        if ( !($handle = $this->getProductsFile()) ) {
+        if ( !($handle = $this->getProductsFile('uploadFileProducts')) ) {
             $this->errors[] = 'File not found';
             return FALSE;
         }
@@ -351,12 +359,108 @@ class Import extends Model {
         return TRUE;
     }
-    private function getProductsFile() {
-        $filename = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts');
+    public function goPrices() {
+        set_time_limit(0);
+        $new_products = $linked_products = 0;
+
+        if ( !($handle = $this->getProductsFile('uploadFilePrices')) ) {
+            $this->errors[] = 'File not found';
+            return FALSE;
+        }
+
+        $j = 0;
+
+        while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE) {
+            $j++;
+//            if ($j > 10) {
+//                return TRUE;
+//            }
+
+            foreach ($data as &$value)
+            {
+                //$value = mb_convert_encoding ($value,  "UTF-8", mb_detect_encoding ($value));
+                $value = iconv ('windows-1251', "UTF-8//TRANSLIT//IGNORE", $value);
+                $value = trim ($value);
+            }
+
+            // данные строк
+            $modification_code = @$data[0];
+            $price             = floatval(@$data[1]);
+            $price_promo       = floatval(@$data[2]);
+            $count             = intval(@$data[3]);
+            $city_name         = @$data[4];
+            $product_title     = @$data[5];
+
+            if (empty ($modification_code)) {
+                CONTINUE;
+            }
+            // товары в пути
+            if (empty ($city_name))
+            {
+                $this->saveNotFoundRecord (
+                    [$modification_code, $product_title],
+                    Yii::getAlias('@uploadFilePricesAway')
+                );
+
+                $this->output[] = 'Товар '. $product_title . ' в пути';
+
+                CONTINUE;
+            }
+
+            if ( ($productVariant = ProductVariant::find()->filterWhere(['ilike', 'sku', trim($modification_code)])->one()) === null ) {
+                // 'Нет даной модификации в базе';
+                $this->saveNotFoundRecord (
+                    [$modification_code, $product_title],
+                    Yii::getAlias('@uploadFilePricesNoVariant')
+                );
+
+                $this->output[] = 'Для товара '. $product_title . ' не найдено соотвествия';
+
+                CONTINUE;
+            }
+
+            $quantity = 0;
+
+            // ===== Set stock ====
+            if ( $city_name ) {
+                if ( ($stock = Stock::find()->filterWhere(['ilike', 'name', trim($city_name)])->one()) === null ) {
+                    // Create stock
+                    $stock = new Stock();
+                    $stock->name = trim($city_name);
+                    $stock->save();
+                }
+
+                $productVariant->stocks[$stock->stock_id] = $count;
+                $quantity = $quantity + $count;
+            }
+
+            $productVariant->price = $price;
+            $productVariant->price_old = $price_promo;
+            $productVariant->stock = $quantity;
+
+            $productVariant->save();
+
+            $this->output[] = '<font style="color:blue">Товар '. $product_title .' успешно сохранен</font>';
+        }
+        fclose ($handle);
+    }
+
+    private function getProductsFile($file_type) {
+        $filename = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@'. $file_type);
         if (!is_file($filename)) {
-            $this->stderr("File $filename not found");
+            $this->errors[] = "File $filename not found";
             return FALSE;
         }
         return fopen ($filename, 'r');
     }
+
+    private function saveNotFoundRecord (array $line, $filename)
+    {
+        $str = implode (';', $line)."\n";
+        $str = iconv ("UTF-8//TRANSLIT//IGNORE", "windows-1251", $str);
+
+        $fg = fopen (Yii::getAlias('@uploadDir') .'/'. $filename, 'a+');
+        fputs ($fg, $str);
+        fclose ($fg);
+    }
 }
 \ No newline at end of file
@@ -6,6 +6,7 @@ use yii\widgets\ActiveForm;
 <div class="product-import-form">
     <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
         'options' => ['enctype' => 'multipart/form-data']
     ]); ?>
@@ -16,12 +17,20 @@ use yii\widgets\ActiveForm;
     <?php endif?>
     <?php if($model->output) :?>
-    <div class="success">
+        <h2>Лог операции</h2>
+    <div class="success" style="height: 10em;overflow: auto;border: 1px solid #000">
         <?= implode("<br>\n", $model->output);?>
     </div>
     <?php endif?>
-    <?= $form->field($model, 'file')->widget(\kartik\file\FileInput::classname(), [
+    <?= $form->field($model, 'type')->radioList([
+        'products' => Yii::t('product', 'Load products'),
+        'prices' => Yii::t('product', 'Load prices'),
+    ]);?>
+
+    <?= $form->field($model, 'file')->fileInput(['multiple' => false,])?>
+
+    <?php /*= $form->field($model, 'file')->widget(\kartik\file\FileInput::classname(), [
         'language' => 'ru',
         'options' => [
             'multiple' => false,
@@ -32,7 +41,7 @@ use yii\widgets\ActiveForm;
             'showRemove' => false,
             'showUpload' => false,
         ],
-    ])?>
+    ])*/?>
     <div class="form-group">
         <?= Html::submitButton(Yii::t('product', 'Import'), ['class' => 'btn btn-primary']) ?>
 <?php
 Yii::setAlias('@uploadDir', dirname(dirname(__DIR__)) . '/storage/sync');
 Yii::setAlias('@uploadFileProducts', 'products.csv');
+Yii::setAlias('@uploadFilePrices', 'prices.csv');
+Yii::setAlias('@uploadFilePricesAway', 'price_product_away.csv');
+Yii::setAlias('@uploadFilePricesDuplicate', 'price_duplicate.csv');
+Yii::setAlias('@uploadFilePricesNoVariant', 'price_no_variant.csv');
-Yii::setAlias('@productsDir', '@frontend/web/images/products');
+Yii::setAlias('@productsDir', '@frontend/web/images/products');
 \ No newline at end of file
@@ -6,6 +6,7 @@ use common\modules\product\models\Category;
 use common\modules\product\models\CategoryName;
 use common\modules\product\models\ProductImage;
 use common\modules\product\models\ProductVariantType;
+use common\modules\product\models\Stock;
 use common\modules\rubrication\models\TaxOption;
 use common\modules\rubrication\models\TaxValueString;
 use Yii;
@@ -18,8 +19,8 @@ use yii\console\Controller;
 use yii\helpers\Console;
 class ImportController extends Controller {
-    private function getProductsFile() {
-        $filename = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts');
+    private function getProductsFile($file_type = 'uploadFileProducts') {
+        $filename = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@'. $file_type);
         if (!is_file($filename)) {
             $this->stderr("File $filename not found");
             return FALSE;
@@ -402,4 +403,103 @@ class ImportController extends Controller {
     public function goProducts() {
     }
+
+    public function actionPrices() {
+        $new_products = $linked_products = 0;
+
+        if ( !($handle = $this->getProductsFile('uploadFilePrices')) ) {
+            $this->stdout("File not found\n");
+            return Controller::EXIT_CODE_ERROR;
+        }
+
+        $j = 0;
+
+        while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE) {
+            $j++;
+//            if ($j > 10) {
+//                return TRUE;
+//            }
+
+            foreach ($data as &$value)
+            {
+                //$value = mb_convert_encoding ($value,  "UTF-8", mb_detect_encoding ($value));
+                $value = iconv ('windows-1251', "UTF-8//TRANSLIT//IGNORE", $value);
+                $value = trim ($value);
+            }
+
+            // данные строк
+            $modification_code = @$data[0];
+            $price             = floatval(@$data[1]);
+            $price_promo       = floatval(@$data[2]);
+            $count             = intval(@$data[3]);
+            $city_name         = @$data[4];
+            $product_title     = @$data[5];
+
+            if (empty ($modification_code)) {
+                CONTINUE;
+            }
+            // товары в пути
+            if (empty ($city_name))
+            {
+                $this->saveNotFoundRecord (
+                    [$modification_code, $product_title],
+                    Yii::getAlias('@uploadFilePricesAway')
+                );
+
+//                $this->stdout("Товар $product_title в пути\n");
+
+                CONTINUE;
+            }
+
+            if ( ($productVariant = ProductVariant::find()->filterWhere(['ilike', 'sku', trim($modification_code)])->one()) === null ) {
+                // 'Нет даной модификации в базе';
+                $this->saveNotFoundRecord (
+                    [$modification_code, $product_title],
+                    Yii::getAlias('@uploadFilePricesNoVariant')
+                );
+
+//                $this->stdout("Для товара $product_title (#$modification_code) не найдено соотвествия\n");
+
+                CONTINUE;
+            }
+
+            $quantity = 0;
+
+            // ===== Set stock ====
+            if ( $city_name ) {
+                if ( ($stock = Stock::find()->filterWhere(['ilike', 'name', trim($city_name)])->one()) === null ) {
+                    // Create stock
+                    $stock = new Stock();
+                    $stock->name = trim($city_name);
+                    $stock->save();
+                }
+
+                $productVariant->stocks[$stock->stock_id] = $count;
+                $quantity = $quantity + $count;
+            }
+
+            $productVariant->price = $price;
+            $productVariant->price_old = $price_promo;
+            $productVariant->stock = $quantity;
+
+            $productVariant->save();
+
+//            $this->stdout("Товар $product_title успешно сохранен\n");
+        }
+        fclose ($handle);
+
+        unlink(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'));
+
+        return Controller::EXIT_CODE_NORMAL;
+    }
+
+    private function saveNotFoundRecord (array $line, $filename)
+    {
+        $str = implode (';', $line)."\n";
+        $str = iconv ("UTF-8//TRANSLIT//IGNORE", "windows-1251", $str);
+
+        $fg = fopen (Yii::getAlias('@uploadDir') .'/'. $filename, 'a+');
+        fputs ($fg, $str);
+        fclose ($fg);
+    }
 }
 \ No newline at end of file
@@ -96,8 +96,8 @@ $this-&gt;registerJs (&quot;
         <h1><?= $product->fullname ?></h1>
         <div class="begin">Цветовые решения</div>
         <ul class="product_mod">
-            <?php foreach (array_reverse($product->variants) as $variant): ?>
-                <?php if (!is_null($variant->stock) && empty($variant->stock)) continue;?>
+            <?php foreach ($product->variants as $variant): ?>
+                <?php if ($variant->quantity > 0) continue;?>
                 <li>
                     <a id='m<?= $variant->product_variant_id ?>' href="#<?=$variant->product_variant_id ?>"
                        data-cost="<?= $variant->price ?>"
@@ -107,6 +107,9 @@ $this-&gt;registerJs (&quot;
                        data-imageoriginal="<?= $variant->imageUrl ?>"
                        title="<?= $product->fullname ?>">
                         <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
+                        <?php
+                        var_dump($variant->quantity);
+                        ?>
                     </a>
                 </li>
             <?php endforeach; ?>