big commti

Administrator
1 parent 9a1e54af
Showing 6 changed files with 86 additions and 65 deletions Show diff stats
backend/controllers/ArticlesController.php
common/modules/product/models/Stock.php
frontend/views/catalog/product.php
frontend/views/layouts/main.php
frontend/web/css/css_header.css
frontend/widgets/Seo.php
@@ -79,9 +79,7 @@ class ArticlesController extends Controller
     {
         $model = new Articles();
  
-        if ($model->load(Yii::$app->request->post())) {
-
-            $model->save();
+        if ($model->load(Yii::$app->request->post()) &&   $model->save()) {
  
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
@@ -101,9 +99,7 @@ class ArticlesController extends Controller
     {
         $model = $this->findModel($id);
  
-        if ($model->load(Yii::$app->request->post())) {
-            $model->save();
-
+        if ($model->load(Yii::$app->request->post()) && $model->save() ) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [
@@ -14,6 +14,7 @@ use Yii;
  */
 class Stock extends \yii\db\ActiveRecord
 {
+
     /**
      * @inheritdoc
      */
@@ -33,6 +34,30 @@ class Stock extends \yii\db\ActiveRecord
         ];
     }
  
+
+    public function getSiteName(){
+        switch(mb_strtolower($this->name)){
+            case "харьков свет":
+                return 'МАГАЗИН ХАРЬКОВ';
+                break;
+            case "осокорки":
+                return 'МАГАЗИН "ОСОКОРКИ"';
+                break;
+            case "олимп":
+                return 'ТЦ "ОЛИМПИЙСКИЙ"';
+                break;
+            case "магазин":
+                return "МАГАЗИН ГЛУБОЧЕЦКАЯ";
+                break;
+            default:
+                return "На складе";
+                break;
+        }
+    }
+
+
+
+
     /**
      * @inheritdoc
      */
@@ -308,13 +308,14 @@ FlipclockAsset::register($this);
                                     <?php if($product->variant->stock > 0){?>
                                         <a href="#" class="btn btn-large buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="5892">Купить</a>
                                     <?php } else {?>
-                                        <a href="#"  style="background-color:dimgrey" class="btn btn-large btn-default "  data-id="<?php echo $product->variant->product_variant_id; ?>" >Нет в наличии</a>
+                                        <a href="#"  style="background-color:dimgrey; background-image:linear-gradient(to bottom, #9d9fa0, #abafb2)" class="btn btn-large btn-default "  data-id="<?php echo $product->variant->product_variant_id; ?>" >Нет в наличии</a>
                                     <?php }?>
  
  
  
                                     <div class="clearfix"></div>
                                 </div>
+
                                 <div>
                                     <div class="payment_visa">
                                         Оплатить
@@ -324,14 +325,8 @@ FlipclockAsset::register($this);
                                     </div>
                                     <div class="clearfix"></div>
                                 </div>
-
                                 <div class="follow_price">
-                                    <?php
-                                        /* Where buy
-                                        ?>
-                                        <a href="#" data-toggle="modal" data-target="#where_buy">где купить?</a>
-                                        */
-                                    ?>
+                                    <a href="#" data-toggle="modal" data-target="#where_buy">где купить?</a>
                                 </div>
  
                                 <div class="follow_price">
@@ -626,4 +621,31 @@ FlipclockAsset::register($this);
     </div>
 </div>
 <div class="clearfix"></div>
-<br/>
 \ No newline at end of file
+<div class="modal fade" id="where_buy" tabindex="-1" role="dialog" aria-labelledby="myModalLabel44">
+    <div class="modal-dialog text-dialog" role="document">
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span></button>
+                <span class="modal-title" id="myModalLabel4">Где купить?</span>
+            </div>
+
+            <div class="modal-body" style="text-transform:uppercase">
+                <p>Данный товар есть в наличии в наших розничных магазинах</p>
+                <br/>
+                <div class="shopsList">
+                    <ul>
+                        <?php foreach($product->variant->stocks as $stock){?>
+                            <li><?= Html::a($stock->siteName, Url::to (['text/index', 'translit' => 'magaziny', '#'=>$stock->stock_id])) ?></li>
+                        <?php } ?>
+                    </ul>
+
+                </div>
+
+                <div class="clearfix"></div>
+            </div>
+
+        </div>
+    </div>
+</div>
 \ No newline at end of file
@@ -480,28 +480,7 @@ use common\models\Event;
  
  
  
-    <div class="modal fade" id="where_buy" tabindex="-1" role="dialog" aria-labelledby="myModalLabel44">
-        <div class="modal-dialog text-dialog" role="document">
-            <div class="modal-content">
-                
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span></button>
-                    <span class="modal-title" id="myModalLabel4">Где купить?</span>
-                </div>
-                
-                <div class="modal-body" style="text-transform:uppercase">
-                    <p>Данный товар есть в наличии в наших розничных магазинах</p>
-                    <br/>
-                    <div class="shopsList">
-                    </div>
-                    
-                    <div class="clearfix"></div>
-                </div>
-            
-            </div>
-        </div>
-    </div>
+
  
     <div class="modal fade" id="returnСonditions" tabindex="-1" role="dialog" aria-labelledby="myModalLabel4">
         <div class="modal-dialog text-dialog" role="document">
@@ -14565,3 +14565,19 @@ ul.product-special li.promo div{
     max-width: 1140px;
     overflow: hidden;
 }
+.shopsList ul{
+    list-style: none;
+}
+
+#link-B:before {
+    display: block;
+    content: "";
+    height: 55px;
+    margin: -55px 0 0;
+}
+.anchor:before {
+    display: block;
+    content: "";
+    height: 55px;
+    margin: -55px 0 0;
+}
@@ -103,35 +103,18 @@ class Seo extends Widget
  
                 $filter = \Yii::$app->request->get('filters', []);
  
+                $default = $this->selectSeoData(self::H1);
  
+                if ($default != $this->{self::H1}) {
+                    return $default;
  
-                if (isset($filter['brands']) && count($filter['brands']) == 1) {
-
-                    $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
-                    if(!$model instanceof Brand){
-
-                        \Yii::$app->response->redirect(['/site/error'],404);
-                    } else {
-                        if($this->selectSeoData(self::H1) == $this->category_name) {
-
-                            return $this->selectSeoData(self::H1) . ' ' . $model->name;
-                        }else {
-
-                            return $this->selectSeoData(self::H1);
-
-                        }
-                    }
-
-
-
-                } else  if ($this->checkFilter($filter)) {
  
+                } else if($this->checkFilter($filter)){
                     $array = $this->arrayBuilder($filter);
                     return $this->getNameString($array);
-
-
-                } else {
-                    return $this->selectSeoData(self::H1);
+                }
+                else {
+                    return $default;
                 }
                     break;
             case self::TITLE:
@@ -343,7 +326,7 @@ class Seo extends Widget
  
  
         }
-        $row = substr($row, 0,-1 );
+        $row = substr($row, 0,-2 );
         $row .= " - купить в Киеве, Украине - интернет магазин Лінія Світла";
         return $row;
 //        $template = SeoDynamic::find()->select('title')->where(['param' =>'filters'])->one();
@@ -374,7 +357,7 @@ class Seo extends Widget
  
  
         }
-        $row = substr($row, 0,-1 );
+        $row = substr($row, 0,-2 );
         $row .= ". Лінія Світла";
         return $row;
  
@@ -395,7 +378,7 @@ class Seo extends Widget
  
  
         }
-        $row = substr($row, 0,-1 );
+        $row = substr($row, 0,-2 );
         return $row;
  
     }
@@ -451,7 +434,7 @@ class Seo extends Widget
     protected function checkFilter($filter){
         foreach(self::$optionsList as $optionList){
  
-            if(isset($filter[$optionList]) && count($filter[$optionList])  > 1){
+            if(isset($filter[$optionList]) && count($filter[$optionList])  == 1){
                 return true;
             }