Some fixes

Karnovsky A
1 parent cf07505d
Showing 10 changed files with 29 additions and 13 deletions Show diff stats
backend/views/brand/_form.php
common/modules/product/controllers/ManageController.php
common/modules/product/models/Brand.php
common/modules/product/models/Product.php
common/translation/ru/product.php
console/controllers/ImportController.php
frontend/config/main.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/web/css/concat_all.css
@@ -39,6 +39,8 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
+    <?= $form->field($model, 'remote_id')->textInput(['maxlength' => 25]) ?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
         <?php if ($model->isNewRecord) :?>
@@ -210,7 +210,8 @@ class ManageController extends Controller
             $image->delete();
         }
-        return $this->redirect(['index']);
+        print '1';
+        exit;
     }
     public function actionImport() {
@@ -10,6 +10,7 @@ use Yii;
  * This is the model class for table "brand".
  *
  * @property integer $brand_id
+ * @property string $remote_id
  * @property integer $brand_name_id
  * @property string $alias
  * @property string $image
@@ -66,6 +67,7 @@ class Brand extends \yii\db\ActiveRecord
             [['alias', 'name'], 'string', 'max' => 250],
             [['image', 'meta_title'], 'string', 'max' => 255],
             [['meta_robots'], 'string', 'max' => 50],
+            [['remote_id'], 'string', 'max' => 25],
             [['imageUpload'], 'safe'],
             [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
 //            [['brand_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => BrandName::className(), 'targetAttribute' => ['brand_name_id' => 'brand_name_id']],
@@ -88,6 +90,7 @@ class Brand extends \yii\db\ActiveRecord
             'meta_desc' => Yii::t('product', 'Meta Desc'),
             'meta_robots' => Yii::t('product', 'Meta Robots'),
             'seo_text' => Yii::t('product', 'Seo Text'),
+            'remote_id' => Yii::t('product', '1C brand name'),
         ];
     }
@@ -264,7 +264,11 @@ class Product extends \yii\db\ActiveRecord
                 $op[] = [
                     'caption' => $image->image,
                     'width' => '120px',
-                    'url' => \yii\helpers\Url::to(['/product/manage/delimg', 'id' => $image->product_image_id])
+                    'url' => \yii\helpers\Url::to(['/product/manage/delimg', 'id' => $image->product_image_id]),
+                    'key' => $image->product_image_id,
+                    'extra' => [
+                        'id' => $image->product_image_id,
+                    ],
                 ];
             }
         }
@@ -34,6 +34,7 @@ return [
     'Name of the brand' => 'Имя бренда',
     'Brand' => 'Бренд',
     'Brands' => 'Бренды',
+    '1C brand name' => 'Название бренда в 1С',
     'Select brand' => 'Выберите бренд',
     'Create Brand' => 'Создать бренд',
     'Category Name' => 'Имя категории',
@@ -27,26 +27,30 @@ class ImportController extends Controller {
     public function goGo() {
         $new_products = $linked_products = 0;
         foreach(RemoteProducts::find()->all() as $product) {
+            $product->Brand = trim($product->Brand);
             if (!empty($product->product->product_id)) {
                 $linked_products++;
-                $_productVariant = ProductVariant::findOne($product->product->product_id);
-                $_product = Product::findOne($_productVariant->product_id);
+                $_productVariant = ProductVariant::findOne($product->product->product_variant_id);
+                $_product = Product::findOne($product->product->product_id);
+
+                $brand = Brand::find()->filterWhere(['ilike', 'remote_id', trim($product->Brand)])->one();
                 if (
                 $_product->name != $product->Name ||
-                $_product->categories != [$product->remoteCategory->category->category_id] ||
-                ($product->Brand && ($brand = BrandName::find()->filterWhere(['like', 'value', trim($product->Brand)])->one()) !== null && $_product->brand_id != $brand->brand_id)
+                $_product->categories[0]->category_id != [$product->remoteCategory->category->category_id] ||
+                ($product->Brand && $brand !== null && $_product->brand_id != $brand->brand_id)
                 ) {
                     $_product->name = $product->Name;
                     $_product->categories = [$product->remoteCategory->category->category_id];
                     if ( $product->Brand ) {
-                        if ( ($brand = BrandName::find()->filterWhere(['like', 'value', trim($product->Brand)])->one()) !== null ) {
+                        if ( $brand !== null ) {
                             $_product->brand_id = $brand->brand_id;
                         } else {
                             // Create brand
                             $brand = new Brand();
-                            $brand->name = trim($product->Brand);
+                            $brand->name = $product->Brand;
+                            $brand->remote_id = $product->Brand;
                             $brand->save();
                             $_product->brand_id = $brand->brand_id;
                         }
@@ -76,7 +80,7 @@ class ImportController extends Controller {
                 $_product->categories = [$product->remoteCategory->category->category_id];
                 if ( $product->Brand ) {
-                    if ( ($brand = BrandName::find()->filterWhere(['like', 'value', trim($product->Brand)])->one()) !== null ) {
+                    if ( ($brand = Brand::find()->filterWhere(['ilike', 'remote_id', trim($product->Brand)])->one()) !== null ) {
                         $_product->brand_id = $brand->brand_id;
                     } else {
                         // Create brand
@@ -47,7 +47,8 @@ return [
             'sourceUrl' => '@web/images',
             'sizes' => [
                 'brandlist' => [130, 70],
-                'product' => [128, 128],
+                'product' => [300, 300],
+                'product_trumb' => [80, 80],
                 'product_list' => [130, 70],
                 'product_list2' => [130, 70],
                 'mainmenu' => [160, 170],
@@ -34,7 +34,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         <div class="main_img_slide">
             <?php foreach($product->images as $image) :?>
             <div class="small_img_block active">
-                <img src="/images/<?= $image->image?>" alt="<?= $image->alt ? $image->alt : $product->name?>">
+                <?= Yii::$app->imageCache->thumb($image->imageUrl, 'product_trumb')?>
             </div>
             <?php endforeach?>
@@ -10,7 +10,7 @@
         <?php if (empty($product->image)) :?>
             <img src="/images/no_photo.png">
         <?php else :?>
-            <img src="/images/<?= $product->image->image?>" alt="<?= $product->image->alt ? $product->image->alt : $product->name?>">
+            <?= Yii::$app->imageCache->thumb($product->image->imageUrl, 'product_list')?>
         <?php endif?>
         </div>
         <div class="title_item"><?= $product->name?></div></a>
@@ -735,7 +735,7 @@ hr {
 }
 .item_3_blocks_wrap .item_img_block .main_img img {
-  height: 100%;
+  max-height: 100%;
 }
 .item_3_blocks_wrap .item_img_block .main_img .new {