Merge branch 'master' of gitlab.artweb.com.ua:root/new_rukzachok

Karnovsky A
2 parents 28b5756e 02a42412
Showing 11 changed files with 100 additions and 55 deletions Show diff stats
.htaccess
common/modules/product/models/Import.php
common/modules/product/models/ProductVariant.php
common/widgets/Mailer.php
frontend/config/main.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/views/catalog/products.php
frontend/views/layouts/main.php
frontend/views/products/show.php
frontend/widgets/Seo.php
@@ -14,7 +14,12 @@ AddDefaultCharset utf-8
     # deal with admin first
-
+  Redirect 301 /Kak_vibrat_ryuksak        /
+  Redirect 301 /products/ryukzaki          /catalog/ryukzaki
+  Redirect 301 /products/koshel_ki        /catalog/koshelki
+  Redirect 301 /products/nesessery        /catalog/nesessery
+  Redirect 301 /products/sumki             /catalog/sumki
+  Redirect 301 /products/germochehly       /catalog/germocehly
     RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
@@ -85,7 +90,6 @@ AddDefaultCharset utf-8
-
 #      RewriteCond %{HTTP_HOST} ^([^www].*)$
 #      RewriteRule ^(.*)$  http://www.%1/$1 [R=301]
@@ -137,7 +141,7 @@ RewriteRule ^(.*)$ $1.gz [QSA,L]
 </IfModule>
 # Cache-Control
 <ifModule mod_headers.c>
-    # 30 дней
+# 30 дней
     <filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
     Header set Cache-Control "max-age=2592000, public"
     </filesMatch>
@@ -16,6 +16,7 @@ use common\modules\product\models\Product;
 use common\modules\product\models\ProductVariant;
 use common\modules\product\models\RemoteProducts;
 use yii\base\Model;
+use yii\helpers\ArrayHelper;
 class Import extends Model {
     public $file;
@@ -119,7 +120,7 @@ class Import extends Model {
             }
-            $quantity = 0;
+
             // ===== Set stock ====
             if ( $city_name ) {
@@ -130,10 +131,29 @@ class Import extends Model {
                     $stock->save();
                 }
-                $productVariant->stocks[$stock->stock_id] = $count;
-                print_r($productVariant);
-                die();
-                $quantity = $quantity + $count;
+                $productStock = ProductStock::find()->where(['product_variant_id' => $productVariant->product_variant_id, 'stock_id' => $stock->stock_id])->one();
+                if(!$productStock instanceof ProductStock) {
+                    $productStock = new ProductStock;
+                    $productStock->product_variant_id = $productVariant->product_variant_id;
+                    $productStock->stock_id = $stock->stock_id;
+                    $productStock->product_id = $productVariant->product_id;
+                }
+                $productStock->quantity = $count;
+                $productStock->save();
+
+                $productStocks = ProductStock::find()->where(['product_variant_id' => $productVariant->product_variant_id])->andWhere(['<>', 'stock_id', $stock->stock_id])->all();
+
+                $quantity = array_sum(ArrayHelper::getColumn($productStocks, 'quantity')) + $count;
+            } else {
+
+                $productStocks = ProductStock::find()->where(['product_variant_id' => $productVariant->product_variant_id])->all();
+
+                if($productStocks instanceof  ProductStock){
+                    $quantity = array_sum(ArrayHelper::getColumn($productStocks, 'quantity')) + $count;
+                } else {
+                    $quantity = 0;
+                }
+
             }
             if ($price_promo) {
@@ -172,14 +172,12 @@ class ProductVariant extends \yii\db\ActiveRecord
     public function afterSave($insert, $changedAttributes)
     {
         if (!is_null($this->stocks)) {
-            ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
+            //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();
+                $productStock = ProductStock::find()->where(['product_variant_id' => $this->product_variant_id, 'stock_id' => $id])->one();
+                $productStock->quantity = $quantity;
+                $productStock->save();
             }
         }
         parent::afterSave($insert, $changedAttributes);
@@ -24,14 +24,24 @@ class Mailer extends Widget{
         $mail = new \PHPMailer();
         $mail->IsSMTP();
-
+        $mail->SMTPOptions = array(
+            'ssl' => array(
+                'verify_peer' => false,
+                'verify_peer_name' => false,
+                'allow_self_signed' => true
+            )
+        );
+        $mail->Host       = "195.248.225.139";
+        $mail->SMTPDebug  = true;
+        $mail->SMTPAuth   = 0;
+        $mail->Port       = 25;
         $mail->CharSet = 'UTF-8';
-        $mail->Username = "adwords@artweb.ua";
-        $mail->Password = "eks,ybcm5hfp";
-        $mail->SetFrom('dockdep@gmail.com');
+        $mail->Username = "";
+        $mail->Password = "";
+        $mail->SetFrom('Rukzachok.com.ua@gmail.com');
         $mail->Subject = $this->subject;
         $mail->MsgHTML($this->render($this->type, ['params' => $this->params]));
-        $address = "dockdep@gmail.com";
+        $address = "Rukzachok.com.ua@gmail.com";
         $mail->AddAddress($address);
         $mail->AddAddress($this->email);
         if(!$mail->send()) {
@@ -111,6 +111,7 @@ return [
                 'admin/catalog/save'   => 'admin/catalog/save',
                 'admin/catalog/delete' => 'admin/catalog/delete',
+
                 'thumbs/<path:.*>' => 'site/thumb',
             ],
             'class'           => 'common\components\urlManager\LangUrlManager',
@@ -113,7 +113,9 @@ $this-&gt;registerJs (&quot;
                        data-image="<?= \common\components\artboximage\ArtboxImageHelper::getImageSrc($variant->imageUrl, 'product_view') ?>"
                        data-imageoriginal="<?= $variant->imageUrl ?>"
                        title="<?= $product->fullname ?>">
-                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant', ['alt' => $product->category->categoryName->value . ' ' .
+                            $product->fullname, 'title' => $product->category->categoryName->value . ' ' .
+                            $product->fullname])?>
                     </a>
                 </li>
             <?php endforeach; ?>
@@ -129,7 +131,7 @@ $this-&gt;registerJs (&quot;
                     <span class="cost"><span id='cost'>0</span> <span class="valute">грн.</span></span>
                 </div>
                 <input type='hidden' id='product_id'/>
-                <a href="#" rel='product' class="link_buy fl">В Корзину</a>
+                <a href="#" rel='product' class="link_buy fl">Купить</a>
                 <div class="both"></div>
             </div>
@@ -146,7 +148,8 @@ $this-&gt;registerJs (&quot;
                 <?php endif?>
                 </ul>
             </div>
-
+            <br>
+            <div class="ya-share2" data-services="vkontakte,facebook,odnoklassniki,gplus,twitter" data-size="s"></div>
         </div>
         <?php /*
         <div class="product_service">
@@ -193,13 +196,17 @@ $this-&gt;registerJs (&quot;
     <div class="content">
         <div class="pic">
             <center>
-                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[0]->imageUrl, 'product_view',['id'=>'pic'])?></a>
+                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[0]->imageUrl, 'product_view',['id'=>'pic', 'alt' => $product->category->categoryName->value . ' ' .
+                        $product->fullname, 'title' => $product->category->categoryName->value . ' ' .
+                        $product->fullname])?></a>
             </center>
         </div>
         <ul class="product_colors">
             <?php foreach ($product->images as $image): ?>
                 <li><a href="<?= $image->imageUrl ?>" rel="shadowbox[gal]">
-                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb2')?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb2',['alt' => $product->category->categoryName->value . ' ' .
+                            $product->fullname, 'title' => $product->category->categoryName->value . ' ' .
+                            $product->fullname])?>
                     </a></li>
             <?php endforeach; ?>
         </ul>
@@ -6,7 +6,9 @@ use yii\helpers\Url;
     <div class="boxitem">
         <div class="pixbox">
             <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->enabledVariants[0]->product_variant_id]) ?>">
-                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[0]->imageUrl, 'list')?>
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[0]->imageUrl, 'list',['alt' => $product->category->categoryName->value . ' ' .
+                    $product->fullname, 'title' => $product->category->categoryName->value . ' ' .
+                    $product->fullname])?>
             </a>
         </div>
         <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
@@ -61,7 +63,9 @@ use yii\helpers\Url;
                         'catalog/product',
                         'product' => $product,
                         '#' => 'm' . $variant->product_variant_id]) ?>">
-                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant',['alt' => $product->category->categoryName->value . ' ' .
+                            $product->fullname, 'title' => $product->category->categoryName->value . ' ' .
+                            $product->fullname])?>
                     </a>
                 </li>
                 <?php endif; ?>
@@ -9,7 +9,7 @@ use yii\web\View;
 use common\modules\product\helpers\ProductHelper;
 use frontend\widgets\Seo;
 //$this->title =  $category->categoryName->value;
-//$this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : "Купить " . substr($category->name, 0, -2) . " в Украине недорого |" . $category->name . " доставка в Киев, Харьков, Днепропетровск, Одесса - Rukzachok.com.ua";
+$this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : '';
 $this->params['seo']['h1'] = !empty($category->h1) ? $category->h1 : $category->name;
 $this->params['seo']['seo_text'] = $category->seo_text;
 $this->params['seo']['description'] = $category->meta_desc;
@@ -95,6 +95,7 @@ $this-&gt;registerJsFile (Yii::$app-&gt;request-&gt;baseUrl . &#39;/js/fix_height.js&#39;, [&#39;posi
             ga('create', 'UA-75674711-1', 'auto');
             ga('send', 'pageview');
         </script>
+        <meta name="google-site-verification" content="niSpd01ftupUt3pFCfQkh2zoezuPuUGblNOSGs-iRWo" />
     </head>
     <body>
     <!-- Google Tag Manager -->
@@ -115,7 +115,7 @@ use yii\widgets\Breadcrumbs;
                 <span class="cost"><span id='cost'>0</span> <span class="valute">грн.</span></span>
             </div>
             <input type='hidden' id='product_id'/>
-            <a href="#" rel='product' class="link_buy fl">В Корзину</a>
+            <a href="#" rel='product' class="link_buy fl">Купить</a>
             <div class="both"></div>
         </div>
@@ -81,47 +81,47 @@ class Seo extends Widget
 //                    return $filter_row;
 //                }
-                if (!empty($title)) {
-                    return $title;
-                }
+                if(!empty($filter)) {
-                $array = [
-                    'category' => $this->category_name
-                ];
+                    $array = [
+                        'category' => $this->category_name
+                    ];
-                if (isset($filter['brands']) && count($filter['brands']) == 1 )
-                {
-                    $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
+                    if (isset($filter['brands']) && count($filter['brands']) == 1) {
+                        $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
-                    $array['brand'] = $model->name;
-                }
+                        $array['brand'] = $model->name;
+                    }
-                if ( isset($filter['options']["pol"]) && count($filter['options']["pol"]) == 1)
-                {
+                    if (isset($filter['options']["pol"]) && count($filter['options']["pol"]) == 1) {
-                    $model = TaxOption::find()->where(['alias' => $filter['options']["pol"]])->one();
-                    $array['sex'] = $model->value->value;
+                        $model = TaxOption::find()->where(['alias' => $filter['options']["pol"]])->one();
+                        $array['sex'] = $model->value->value;
-                }
+                    }
-                if (isset($filter['options']["naznacenie"]) && count($filter['options']["naznacenie"]) == 1){
+                    if (isset($filter['options']["naznacenie"]) && count($filter['options']["naznacenie"]) == 1) {
-                    $model = TaxOption::find()->where(['alias' => $filter['options']["naznacenie"]])->one();
-                    $array['naz'] = $model->value->value;
+                        $model = TaxOption::find()->where(['alias' => $filter['options']["naznacenie"]])->one();
+                        $array['naz'] = $model->value->value;
-                }
+                    }
-                if (isset($filter['options']["god"]) && count($filter['options']["god"]) == 1){
-                    $model = TaxOption::find()->where(['alias' => $filter['options']["god"]])->one();
-                    $array['year'] = $model->value->value;
+                    if (isset($filter['options']["god"]) && count($filter['options']["god"]) == 1) {
+                        $model = TaxOption::find()->where(['alias' => $filter['options']["god"]])->one();
+                        $array['year'] = $model->value->value;
+
+                    }
+                    return $this->getTitleString($array);
+
+                } else if (!empty($title)) {
+                    return $title;
+                } else  {
+                    return $this->project_name;
                 }
-                return $this->getTitleString($array);
-//                else  {
-//                    return $this->project_name;
-//                }
                 break;
             case self::DESCRIPTION: