big commti

Administrator
1 parent 7253a9a0
Showing 15 changed files with 143 additions and 145 deletions Show diff stats
backend/controllers/EventController.php
backend/views/event/_form.php
common/behaviors/SaveImgBehavior.php
common/config/main.php
common/models/Event.php
common/modules/product/models/Import.php
common/modules/product/models/Product.php
common/modules/product/models/ProductVariant.php
frontend/config/main.php
frontend/views/catalog/_product_item.php
frontend/views/catalog/product.php
frontend/views/layouts/main.php
frontend/views/search/_product_search_item.php
frontend/views/search/index.php
frontend/web/css/css_header.css
@@ -159,6 +159,14 @@ class EventController extends Controller
         return $this->redirect(['index']);
     }
+    public function actionDelimg($id,$field){
+        $model = $this->findModel($id);
+        $model->$field = '';
+        $model->save();
+        return true;
+    }
+
+
     /**
      * Finds the Event model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
@@ -51,8 +51,9 @@ use mihaildev\elfinder\ElFinder;
         'pluginOptions' => [
             'allowedFileExtensions' => ['jpg', 'gif', 'png'],
             'initialPreview' => !empty($model->imageUrl) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list') : '',
+            'deleteUrl' => \yii\helpers\Url::to(['/product/manage/delimg', 'id' => $model->primaryKey]),
+            'initialPreviewConfig' => $model->getImagesConfig(),
             'overwriteInitial' => true,
-            'showRemove' => false,
             'showUpload' => false,
             'previewFileType' => 'image',
         ],
@@ -68,8 +69,9 @@ use mihaildev\elfinder\ElFinder;
         'pluginOptions' => [
             'allowedFileExtensions' => ['jpg', 'gif', 'png'],
             'initialPreview' => !empty($model->getImageUrl('banner')) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->getImageUrl('banner'), 'list') : '',
+            'deleteUrl' => \yii\helpers\Url::to(['/product/manage/delimg', 'id' => $model->primaryKey]),
+            'initialPreviewConfig' => $model->getImagesConfig('banner'),
             'overwriteInitial' => true,
-            'showRemove' => false,
             'showUpload' => false,
             'previewFileType' => 'image',
         ],
@@ -52,6 +52,23 @@ class SaveImgBehavior extends Behavior
     }
+    public function getImagesConfig($image = 'image') {
+        $op = [];
+        if ($this->owner->$image) {
+
+                $op[] = [
+                    'caption' => $this->owner->$image,
+                    'url' => \yii\helpers\Url::to(['delimg', 'id' => $this->owner->primaryKey, 'field' =>$image ]),
+                    'key' => $this->owner->primaryKey,
+                    'extra' => [
+                        'id' => $this->owner->primaryKey,
+                    ],
+                ];
+
+        }
+        return $op;
+    }
+
     public function beforeInsert($event)
     {
@@ -157,6 +157,13 @@ return [
                         'master' => null
                     ],
                 ],
+                'banner_list' => [
+                    'resize' => [
+                        'width' => 160,
+                        'height' => 60,
+                        'master' => null
+                    ],
+                ],
                 'large' => [
                     'resize' => [
                         'width' => 600,
@@ -91,10 +91,10 @@ class Event extends \yii\db\ActiveRecord
     {
         return [
             [['body', 'seo_text'], 'string'],
-            [['created_at', 'updated_at','percent','sale','is_event' ], 'integer'],
+            [['created_at', 'updated_at','percent' ], 'integer'],
             [['name', 'alias', 'image', 'meta_title', 'description', 'h1','end_at','banner'], 'string', 'max' => 255],
             [['name','body'], 'required'],
-            [['imageUpload'], 'safe'],
+            [['imageUpload','sale','is_event'], 'safe'],
             [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
             [['products_file'], 'file'],
         ];
@@ -248,9 +248,10 @@ class Import extends Model {
             // 1  Группа (категория)
             $catalog_names = explode(',',$data[0]);
+
             if (empty ($catalog_names))
             {
-                $result_items[] = "Не указана категория (строка $j)";
+                $result_items[] = "Не указана категория (строка $j) ";
                 continue;
             }
@@ -281,7 +282,7 @@ class Import extends Model {
             // 11 Цена акция
             $product_cost_old = floatval($data[7]);
-
+            $product_cost = '';
             // 10 Цена
             if ($product_cost_old) {
                 $product_cost_old = floatval($data[6]);
@@ -315,15 +316,16 @@ class Import extends Model {
             $product_image = explode ('=', $data[14]);
             $product_image = @$product_image[3];
-            if ( ($_product = Product::find()->filterWhere(['ilike', 'name', trim($product_name)])->one()) === null ) {
+            if ( ($_product = Product::find()->filterWhere(['name' => trim($product_name)])->one()) === null ) {
                 $_product = new Product();
             }
             $is_new_product = empty($_product->product_id);
-
+            $category_id = [];
             foreach($catalog_names as $catalog_name){
+
                 // ==== Set category ====
-                if ( ($category = Category::find()->filterWhere(['ilike', 'name', trim($catalog_name)])->one()) === null ) {
+                if ( ($category = Category::find()->filterWhere([ 'name' => trim($catalog_name)])->one()) === null ) {
                     // Create category
                     $category = new Category();
                     $category->name = trim($catalog_name);
@@ -338,7 +340,7 @@ class Import extends Model {
             // ===== Set brand ====
             if ( $brand_name ) {
-                if ( ($brand = Brand::find()->filterWhere(['ilike', 'name', trim($brand_name)])->one()) !== null ) {
+                if ( ($brand = Brand::find()->filterWhere(['name' => trim($brand_name)])->one()) !== null ) {
                     $_product->brand_id = $brand->brand_id;
                 } else {
                     // Create brand
@@ -368,7 +370,7 @@ class Import extends Model {
                     $source_image = Yii::getAlias('@uploadDir') . '/product_images/'. urlencode($foto);
                     if (file_exists($source_image)) {
-                        if (($productImage = ProductImage::find()->andFilterWhere(['ilike', 'image', $foto])->andFilterWhere(['product_id' => $_product->product_id])->one()) === null) {
+                        if (($productImage = ProductImage::find()->andFilterWhere(['image'=> $foto])->andFilterWhere(['product_id' => $_product->product_id])->one()) === null) {
                             copy($source_image, Yii::getAlias('@productsDir') . "/" . $foto);
                             $productImage = new ProductImage();
                             $productImage->product_id = $_product->product_id;
@@ -397,7 +399,7 @@ class Import extends Model {
                     $mod_old_cost = floatval($product_cost_old);
                     // Check product variant
-                    if ( ($_productVariant = ProductVariant::find()->andFilterWhere(['ilike', 'sku', $mod_art])->andFilterWhere(['product_id' => $_product->product_id])->one()) === null ) {
+                    if ( ($_productVariant = ProductVariant::find()->andFilterWhere([ 'sku'=> $mod_art])->andFilterWhere(['product_id' => $_product->product_id])->one()) === null ) {
                         $_productVariant = new ProductVariant();
                         $_productVariant->product_id = $_product->product_id;
                     }
@@ -428,7 +430,7 @@ class Import extends Model {
                     // ===== Set variant type ====
                     if ( $product_variant_type_name ) {
-                        if ( ($product_variant_type = ProductVariantType::find()->filterWhere(['ilike', 'name', $product_variant_type_name])->one()) !== null ) {
+                        if ( ($product_variant_type = ProductVariantType::find()->filterWhere([ 'name'=> $product_variant_type_name])->one()) !== null ) {
                             $_productVariant->product_variant_type_id = $product_variant_type->product_variant_type_id;
                         } else {
                             $product_variant_type = new ProductVariantType();
@@ -443,10 +445,10 @@ class Import extends Model {
                     $MOD_ARRAY[] = $_productVariant->product_variant_id;
                     if ($mod_image) {
-                        $source_image = Yii::getAlias('@uploadDir') . '/product_images/'. urlencode($mod_image);
+                        $source_image = Yii::getAlias('@productsDir') . '/'. urlencode($mod_image);
                         if (file_exists($source_image)) {
-                            if (($variantImage = ProductImage::find()->andFilterWhere(['ilike', 'image', $mod_image])->andFilterWhere(['product_variant_id' => $_productVariant->product_variant_id])->one()) === null) {
-                                copy($source_image, Yii::getAlias('@productsDir') . "/" . $mod_image);
+                            if (($variantImage = ProductImage::find()->andFilterWhere([ 'image' => $mod_image])->andFilterWhere(['product_variant_id' => $_productVariant->product_variant_id])->one()) === null) {
+//                                copy($source_image, Yii::getAlias('@productsDir') . "/" . $mod_image);
                                 $variantImage = new ProductImage();
                                 $variantImage->product_id = $_product->product_id;
                                 $variantImage->product_variant_id = $_productVariant->product_variant_id;
@@ -575,7 +577,7 @@ class Import extends Model {
             $filters_options = explode(',',$filter[2][0]);
             foreach($filters_options as $filter_options){
-                $value = TaxValueString::find()->innerJoinWith('taxOption')->andFilterWhere(['ilike', 'value', $filter_options])->andFilterWhere(['tax_option.tax_group_id' => $taxGroup->tax_group_id])->one();
+                $value = TaxValueString::find()->innerJoinWith('taxOption')->andWhere(['value'=>$filter_options])->andWhere(['tax_option.tax_group_id' => $taxGroup->tax_group_id])->one();
                 if (!$value instanceof TaxValueString) {
                     // Create option
@@ -37,8 +37,9 @@ use common\models\Event;
  */
 class Product extends \yii\db\ActiveRecord
 {
-    /** @var array $_variants */
     public $_variants = [];
+    public $_categories = [];
+    public $_options = [];
     /** @var array $_images */
     public $imagesUpload = '';
@@ -77,6 +78,11 @@ class Product extends \yii\db\ActiveRecord
     {
         return '{{%product}}';
     }
+
+
+    /**
+     * @return  \yii\db\ActiveQuery
+     */
     public function getEvents(){
         return $this->hasMany(Event::className(), ['event_id' => 'event_id'])->viaTable('events_to_products', ['product_id' => 'product_id']);
     }
@@ -159,6 +165,7 @@ class Product extends \yii\db\ActiveRecord
         return $this->hasMany(ProductImage::className(), ['product_id' => 'product_id'])->where(['product_variant_id' => null]);
     }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -313,21 +320,7 @@ class Product extends \yii\db\ActiveRecord
     {
         if(parent::beforeSave($insert)){
-            if(!empty($this->categories)){
-                $categories = Category::findAll($this->categories);
-                $this->unlinkAll('categories', true);
-                foreach($categories as $category){
-                    $this->link('categories', $category);
-                }
-            }
-            if(!empty($this->options)){
-                $options = TaxOption::findAll($this->options);
-                $this->unlinkAll('options',true);
-                foreach($options as $option){
-                    $this->link('options', $option);
-                }
-            }
             return true;
         }
         return false;
@@ -340,6 +333,24 @@ class Product extends \yii\db\ActiveRecord
     {
         parent::afterSave($insert, $changedAttributes);
+
+        if(!empty($this->categories)){
+            $categories = Category::findAll($this->categories);
+            $this->unlinkAll('categories', true);
+            foreach($categories as $category){
+                $this->link('categories', $category);
+            }
+        }
+
+        if(!empty($this->options)){
+            $options = TaxOption::findAll($this->options);
+            $this->unlinkAll('options',true);
+            foreach($options as $option){
+                $this->link('options', $option);
+            }
+        }
+
+
         if (!empty($this->_variants)) {
             $todel = [];
             foreach ($this->variants ?: [] as $_variant) {
@@ -367,13 +378,18 @@ class Product extends \yii\db\ActiveRecord
     }
     public function beforeDelete() {
-        ProductImage::deleteAll(['product_id' => $this->product_id]);
-        ProductCategory::deleteAll(['product_id' => $this->product_id]);
-        ProductVariant::deleteAll(['product_id' => $this->product_id]);
-        ProductOption::deleteAll(['product_id' => $this->product_id]);
-        ProductStock::deleteAll(['product_id' => $this->product_id]);
-        Share::deleteAll(['product_id' => $this->product_id]);
-        return true;
+        if(parent::beforeDelete()){
+            $this->unlinkAll('categories', true);
+            $this->unlinkAll('options', true);
+            ProductImage::deleteAll(['product_id' => $this->product_id]);
+
+            ProductVariant::deleteAll(['product_id' => $this->product_id]);
+            ProductStock::deleteAll(['product_id' => $this->product_id]);
+            Share::deleteAll(['product_id' => $this->product_id]);
+            return true;
+        }
+        return false;
+
     }
     public function imagesUpload()
@@ -38,6 +38,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     public $translit;
     public $translit_rubric;
     private $data;
+    public $_options = [];
     /** @var array $_images */
@@ -255,8 +256,18 @@ class ProductVariant extends \yii\db\ActiveRecord
         return TaxGroup::find()->distinct()->innerJoin('tax_group_to_category', 'tax_group_to_category.tax_group_id = tax_group.tax_group_id')->where(['tax_group_to_category.category_id'  => $categories])->where(['level' => $level]);
     }
-//    public function afterSave($insert, $changedAttributes)
-//    {
+    public function afterSave($insert, $changedAttributes)
+    {
+
+        if(!empty($this->_options)){
+            $options = TaxOption::findAll($this->_options);
+            $this->unlinkAll('options',true);
+            foreach($options as $option){
+                $this->link('options', $option);
+            }
+        }
+
+
 //        if (!is_null($this->stocks)) {
 //            //ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
 //            $values = [];
@@ -266,14 +277,17 @@ class ProductVariant extends \yii\db\ActiveRecord
 //                $productStock->save();
 //            }
 //        }
-//        parent::afterSave($insert, $changedAttributes);
-//    }
+        parent::afterSave($insert, $changedAttributes);
+    }
     public function beforeDelete() {
-        ProductVariantOption::deleteAll(['product_variant_id' => $this->product_variant_id]);
-        ProductImage::deleteAll(['product_variant_id' => $this->product_variant_id]);
-        ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
-        return true;
+        if(parent::beforeDelete()){
+            ProductVariantOption::deleteAll(['product_variant_id' => $this->product_variant_id]);
+            ProductImage::deleteAll(['product_variant_id' => $this->product_variant_id]);
+            ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
+            return true;
+        }
+        return false;
     }
     public function imagesUpload()
@@ -76,6 +76,7 @@ return [
                 'blog'                                                             => 'articles/index',
                 'blog/<translit:[\w\-]+>-<id:\d+>'                                 => 'articles/show',
                 'event'                                                            => 'event/index',
+                'event/sale/<percent:[\d\-]+>'                                   => 'event/sale',
                 'event/<alias:[\w\-]+>'                                   => 'event/show',
             ],
             'class'           => 'common\components\urlManager\LangUrlManager',
@@ -17,6 +17,16 @@ use yii\helpers\Url;
                     'catalog/product',
                     'product' => $model->alias
                 ]) ?>">
+                    <?php
+                        foreach($model->events as $event){
+                            if($event->banner){
+                               echo \common\components\artboximage\ArtboxImageHelper::getImage($event->getImageUrl('banner'), 'banner_list',[
+                               'class' => 'banner-in-list'
+                               ]);
+                            }
+                        }
+
+                    ?>
                     <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->enabledVariants[ 0 ]->imageUrl, 'list', [
                         'alt'   => $model->category->name . ' ' . $model->fullname,
                         'title' => $model->category->name . ' ' . $model->fullname,
@@ -37,6 +47,15 @@ use yii\helpers\Url;
                 </div>
             </div>
             <div class="price">
+
+              <?php if($model->variant->price_old){?>
+                <div class="dlexfduinxipi">
+                    <span class="main">
+                        <s><?= $model->variant->price_old  ?>
+                        <span class="currency">грн</span><s>
+                    </span>
+                </div>
+              <?php }?>
                 <div class="dlexfduinxipi">
                     Цена:
                     <span class="main">
@@ -207,7 +207,7 @@ FlipclockAsset::register($this);
                                                             — Самовывоз Новая Почта - 55 грн.<br>
                                                             — Курьер Новая Почта - 88 грн.<br>
                                                             — Курьер «ИнТайм» - 60 грн.</p>
-                                                        <?php if($product->variant->price > 1000){?>
+                                                        <?php if($product->variant->price >= 1000){?>
                                                         <p>
                                                             <span class="strong black">Киев</span>:<br>
                                                             — Курьер - <s>50 грн.</s>
@@ -23,10 +23,9 @@ use common\models\Event;
     <meta charset="<?= Yii::$app->charset ?>"/>
     <?= Html::csrfMetaTags () ?>
-    <meta name="robots" content="noindex,nofollow">
-    <?php /*?><title><?= Seo::widget([ 'row'=>'title'])?></title>
+    <title><?= Seo::widget([ 'row'=>'title'])?></title>
     <?= Seo::widget([ 'row'=>'description'])?>
-    <?= Seo::widget([ 'row'=>'meta'])?> */?>
+    <?= Seo::widget([ 'row'=>'meta'])?>
         <link rel="icon" type="image/vnd.microsoft.icon" href="/images/icon.ico"/>
         <link type="image/ico" href="http://www.linija-svitla.ua/images/icon.ico" rel="SHORTCUT ICON"/>
         <link rel="icon" href="http://www.linija-svitla.ua/images/icon.ico" type="image/x-icon"/>
-<?php
-    /**
-     * @var $model  common\modules\product\models\Product
-     */
-use yii\helpers\Html;
-use yii\helpers\Url;
-?>
-<div class="catalog_item">
-    <div class="wrapper">
-        <div class="item_container" >
-            <input class="prodInfo" type="hidden" value="[]">
-            <div class="title">
-                <?= Html::a( $model->name, Url::to(['catalog/product', 'product' => $model->alias]), ['class'=>'btn-product-details'] )?>
-            </div>
-            <div class="img">
-                <a class="btn-product-details" href="<?= Url::to([
-                    'catalog/product',
-                    'product' => $model->alias
-                ]) ?>">
-                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->enabledVariants[ 0 ]->imageUrl, 'list', [
-                        'alt'   => $model->category->name . ' ' . $model->fullname,
-                        'title' => $model->category->name . ' ' . $model->fullname,
-                        'class' => 'selected'
-                    ]) ?>
-                </a>
-                <div class="info_icons">
-                    <a href="#" class="btn buy_button" data-toggle="modal" data-target="#buyForm" data-id="<?=$model->variant->product_variant_id; ?>" lang="145">Купить</a>
-                    <ul class="ul wishlike_block hidden">
-                        <li class="compare  hidden">
-                            <a onclick="add2compare(); return false;" class="compare compare_text_link_3631483" href="#">К сравнению</a>
-                            <span class="icon"></span>
-                        </li>
-                        <li class="like hidden">
-                            <a class="like like_text_link_3631483" href="#">В избранное</a><span class="icon"></span>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="price">
-                <div class="dlexfduinxipi">
-                    Цена:
-                    <span class="main">
-                        <?= $model->variant->price ?>
-                        <span class="currency">грн</span>
-                    </span>
-                </div>
-            </div>
-            <div class="additional_info params">
-                <div class="block_title">Особенности</div>
-                <div class="descr">
-                    <div class="info">
-                        <ul class="sv">
-
-                            <li><span>Бренд:</span> <?= $model->brand->name ?></li>
-
-                            <?php foreach($model->getActiveProperties($model->category->category_id) as $group): ?>
-                                <li><span><?= $group->name ?> <?php foreach($group->_options as $option) : ?>&nbsp;</span><?= $option->ValueRenderHTML ?><?php endforeach ?></li>
-                            <?php endforeach; ?>
-
-
-                        </ul>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <div class="price" style="display: none;">
-                    <div class="dlexfduinxipi">
-                        Цена:
-                        <span class="main">
-                            <?php
-
-                            echo '<div class="cost-block" itemprop="offers" itemscope itemtype="http://schema.org/Offer">';
-
-                            // есть скидка
-                            echo '<p  class="cost">';
-                            if($model->enabledVariants[ 0 ]->price_old != 0 && $model->enabledVariants[ 0 ]->price_old != $model->enabledVariants[ 0 ]->price) {
-                                echo '<strike><span id=\'old_cost\' itemprop="price">' . $model->enabledVariants[0]->price_old . '</span> грн.</strike>&nbsp;';
-                                echo $model->enabledVariants[0]->price . ' <span>грн.</span></p>';
-                            } else {
-                                echo '<span  itemprop="price">'.$model->enabledVariants[0]->price . ' </span><span>грн.</span></p>';
-                            }
-                            echo '<meta itemprop="priceCurrency" content = "UAH">';
-                            echo '</div>';
-
-                            ?>
-                        </span>
-                    </div>
-                </div>
-            </div>
-            <div class="opacity_bg"></div>
-        </div>
-    </div>
-</div>
 \ No newline at end of file
@@ -84,8 +84,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = &#39;Поиск&#39;;
             <?= ListView::widget([
                 'dataProvider' => $productProvider,
                 'itemView' => function ($model, $key, $index, $widget)  {
-                    return $this->render('_product_search_item',[
-                        'model' => $model
+                    return $this->render('../catalog/_product_item',[
+                        'model' => $model,
+                        'category' => $model->category
                     ]);
                 },
                 'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
@@ -14544,4 +14544,8 @@ ul.product-special li.promo div{
     -ms-filter: grayscale(0%);
     -o-filter: grayscale(0%);
     -moz-filter: grayscale(0%);
+}
+
+.banner-in-list{
+    margin: 0 !important;
 }
 \ No newline at end of file