-

Karnovsky A
1 parent 34b5f15a
Showing 5 changed files with 56 additions and 17 deletions Show diff stats
common/config/main.php
common/modules/product/controllers/ManageController.php
common/modules/product/models/Product.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
@@ -165,6 +165,11 @@ return [
                         'master' => null
                     ],
                 ],
+                'admin_thumb' => [
+                    'resize' => [
+                        'width' => 256,
+                    ],
+                ],
             ]
         ],
     ],
@@ -157,12 +157,17 @@ class ManageController extends Controller
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post())) {
             $model->imagesUpload = UploadedFile::getInstances($model, 'imagesUpload');
-
+            $variantImagesUpload = UploadedFile::getInstances($model, 'variants');
+            $model->variantImagesUpload = [];
+            foreach ($_POST['Product']['variants'] as $i => $variant) {
+                if (!empty($variant['product_variant_id'])) {
+                    $model->variantImagesUpload[$variant['product_variant_id']] = $variantImagesUpload[$i];
+                }
+            }
             if ($model->save()) {
 //                foreach ($model->images as $image) {
 //                    $image->delete();
 //                }
-
                 if ( ($images = $model->imagesUpload()) !== FALSE) {
                     foreach ($images as $image) {
                         $imageModel = new ProductImage();
@@ -172,6 +177,16 @@ class ManageController extends Controller
                     }
                 }
  
+                if ( ($images = $model->variantImagesUpload()) !== FALSE) {
+                    foreach ($images as $product_variant_id => $image) {
+                        $imageModel = new ProductImage();
+                        $imageModel->product_id = $model->product_id;
+                        $imageModel->product_variant_id = $product_variant_id;
+                        $imageModel->image = $image;
+                        $imageModel->save();
+                    }
+                }
+
                 return $this->redirect(['view', 'id' => $model->product_id]);
             }
         } else {
@@ -34,6 +34,7 @@ class Product extends \yii\db\ActiveRecord
  
     /** @var array $_images */
     public $imagesUpload = [];
+    public $variantImagesUpload = [];
     /**
      * @inheritdoc
      */
@@ -154,7 +155,7 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getVariants()
     {
-        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->orderBy('product_variant_id');
+        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->orderBy('product_variant.product_variant_id', SORT_ASC);
     }
  
     public function setVariants($variants) {
@@ -233,9 +234,9 @@ class Product extends \yii\db\ActiveRecord
             $model->product_id = $this->product_id;
             $model->save();
         }
-        if (!empty($todel)) {
-            ProductVariant::deleteAll(['product_variant_id' => $todel]);
-        }
+//        if (!empty($todel)) {
+//            ProductVariant::deleteAll(['product_variant_id' => $todel]);
+//        }
     }
  
     public function beforeDelete() {
@@ -244,6 +245,27 @@ class Product extends \yii\db\ActiveRecord
         ProductVariant::deleteAll(['product_id' => $this->product_id]);
     }
  
+    public function variantImagesUpload()
+    {
+        if ($this->validate()) {
+            $images = [];
+            foreach ($this->variantImagesUpload as $product_variant_id => $image) {
+                $imageName = $image->baseName .'.'. $image->extension;
+                $i = 0;
+                while(file_exists(Yii::getAlias('@imagesDir/products/' . $imageName))) {
+                    $i++;
+                    $imageName = $image->baseName .'_'. $i .'.'. $image->extension;
+                }
+
+                $image->saveAs(Yii::getAlias('@imagesDir/products/' .$imageName));
+                $images[$product_variant_id] = $imageName;
+            }
+            return $images;
+        } else {
+            return false;
+        }
+    }
+
     public function imagesUpload()
     {
         if ($this->validate()) {
@@ -251,12 +273,12 @@ class Product extends \yii\db\ActiveRecord
             foreach ($this->imagesUpload as $image) {
                 $imageName = $image->baseName .'.'. $image->extension;
                 $i = 0;
-                while(file_exists(Yii::getAlias('@frontend/web/images/products/' . $imageName))) {
+                while(file_exists(Yii::getAlias('@imagesDir/products/' . $imageName))) {
                     $i++;
                     $imageName = $image->baseName .'_'. $i .'.'. $image->extension;
                 }
  
-                $image->saveAs(Yii::getAlias('@frontend/web/images/products/' .$imageName));
+                $image->saveAs(Yii::getAlias('@imagesDir/products/' .$imageName));
                 $images[] = $imageName;
             }
             return $images;
@@ -269,7 +291,7 @@ class Product extends \yii\db\ActiveRecord
         $op = [];
         if ($this->images) {
             foreach ($this->images as $image) {
-                $op[] = Html::img($image->imageUrl);
+                $op[] = \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'admin_thumb');
             }
         }
         return $op;
@@ -99,10 +99,10 @@ $this-&gt;registerJs (&quot;
         <h1><?= $product->fullname ?></h1>
         <div class="begin">Цветовые решения</div>
         <ul class="product_mod">
-            <?php foreach ($product->variants as $variant): ?>
+            <?php foreach (array_reverse($product->variants) as $variant): ?>
                 <?php if (!is_null($variant->stock) && empty($variant->stock)) continue;?>
                 <li>
-                    <a id='m<?= $variant->product_variant_id ?>' href="#"
+                    <a id='m<?= $variant->product_variant_id ?>' href="#<?=$variant->product_variant_id ?>"
                        data-cost="<?= $variant->price ?>"
                        data-old_cost="<?= $variant->price_old ?>" data-id="<?= $variant->product_variant_id ?>" data-art="<?= $variant->sku ?>"
                        data-color="<?= $variant->name ?>"
@@ -51,15 +51,12 @@ use yii\helpers\Url;
  
     <div class="mycarousel">
         <ul class="jcarousel jcarousel-skin-tango">
-            <?php foreach ($product->variants as $variant) : ?>
+            <?php foreach (array_reverse($product->variants) as $variant) : ?>
                 <?php if (!is_null($variant->stock) && empty($variant->stock)) continue;?>
                 <?php if (!empty($variant->image)) :?>
                 <li>
-                    <a href="<?= Url::to([
-                        'catalog/product',
-                        'product' => $product,
-                        '#' => 'm' . $variant->product_variant_id]) ?>">
-                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->image->imageUrl, 'product_variant')?>
+                    <a href="<?= Url::to(['catalog/product', 'product' => $product, '#' => 'm' . $variant->product_variant_id]) ?>">
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
                     </a>
                 </li>
                 <?php endif; ?>