Merge remote-tracking branch 'origin/master'

# Conflicts: # composer.json # frontend/web/css/style.css

Merge remote-tracking branch 'origin/master'
# Conflicts: # composer.json # frontend/web/css/style.css
Karnovsky A
2 parents f5e5825e 0cdfad3f
Showing 13 changed files with 142 additions and 62 deletions Show diff stats
common/modules/product/widgets/views/product_smart.php
common/modules/product/widgets/views/products_block.php
frontend/assets/AppAsset.php
frontend/views/basket/_popup.php
frontend/views/basket/ajax_items.php
frontend/views/basket/index.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/views/layouts/main.php
frontend/web/css/style.css
frontend/web/img/arrow_sort_asc_desc.png
frontend/web/js/fix_height.js
frontend/web/js/main.js
@@ -2,7 +2,7 @@
 /** @var \common\modules\product\models\Product $product */
 use yii\helpers\Url;
 ?>
-<li class="item">
+<div class="item">
     <div class="boxitem">
         <div class="pixbox">
             <a href="<?= Url::to([
@@ -53,4 +53,4 @@ use yii\helpers\Url;
             <?php endforeach; ?>
         </ul>
     </div>
-</li>
 \ No newline at end of file
+</div>
 \ No newline at end of file
+<?php
+    use yii\web\View;
+?>
 <div class="_prd_spec-wr">
-    <div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
+    <div class="special-products products<?=
+
+    (!empty($class) ? ' '. $class : '')?>">
         <h3><?= $title?></h3>
-        <ul>
+        <div class="owl-carousel">
             <?php foreach($products as $product) :?>
                 <?= $this->render('product_smart', ['product' => $product]);?>
             <?php endforeach?>
-        </ul>
+        </div>
         <div class="both"></div>
     </div>
-</div>
 \ No newline at end of file
+</div>
+
+<?php $js = '$(".owl-carousel").owlCarousel({
+ // Navigation
+    navigation : true,
+    navigationText : ["prev","next"],
+    rewindNav : true,
+    scrollPerPage : false,
+     pagination : false
+    })';
+$this->registerJs($js, View::POS_READY);
+?>
 \ No newline at end of file
@@ -25,6 +25,7 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\JqueryAsset',
+//        'sersid\owlcarousel\Asset'
         //'yii\web\YiiAsset',
         //'yii\bootstrap\BootstrapAsset',
     ];
@@ -13,14 +13,9 @@ use yii\helpers\Url;
                         Загрузка...
                     </div>
-                <div style="display:table;margin-top:25px;">
-                    <div class="cont_shop_but"><a href="#" class="cont_shop">Продолжить покупки</a></div>
-                    <div style="display:table-cell;padding-left:240px;">
-
-                        <a href="<?=Url::to(['basket/index'])?>" class="submit4 bottom3" style="color:white;">Оформить заказ</a>
-                    </div>
-
-
+                <div class="cont_shop_but-wr">
+                    <a href="#" class="cont_shop">Продолжить покупки</a>
+                    <a href="<?=Url::to(['basket/index'])?>" class="submit4 bottom3" style="color:white;">Оформить заказ</a>
                 </div>
             </div>
         </div>
@@ -9,7 +9,7 @@ use yii\helpers\Html;
 <div class="basket_item">
     <?php echo $form->field($item,'['.$i.']id')->hiddenInput()->label(false); ?>
     <div style="display: table-cell;vertical-align: middle;"><a href="#" data-id="<?=$item->id?>" class="delete_button" style="margin-right:20px;"></a></div>
-    <div style="width:100px;height:100px;display: table-cell;vertical-align: middle; border:1px solid #d2d2d2;text-align:center;margin-left:10px;margin-right:10px;">
+    <div class="img_ajax_basket" style="width:100px;height:100px;display: table-cell;vertical-align: middle; border:1px solid #d2d2d2;text-align:center;margin-left:10px;margin-right:10px;">
         <?= \common\components\artboximage\ArtboxImageHelper::getImage($item->imageUrl, 'product_basket')?>
     </div>
     <div style="display: table-cell;vertical-align: middle; font-size:15px;width:210px; font-weight:normal;padding-left:15px;">
@@ -22,7 +22,7 @@ use yii\helpers\Html;
     <div style="display: table-cell;vertical-align: middle;">
         <a href="#" style="color:#95ba2f" class="minus"></a><?php echo $form->field($item,'['.$i.']count',['template'=>'{input}'])->textInput(['type'=>'number','class' => 'item_num','disabled1'=>true])->label(false); ?><a href="#" style="color:#95ba2f" class="plus"></a>
     </div>
-    <div style="display: table-cell;vertical-align: middle; font-size:16px;color:#f75d50; font-weight:bold; padding-left:54px;"><?=$item->sum_cost?> грн.</div>
+    <div style="display: table-cell;vertical-align: middle; font-size:16px;color:#f75d50; font-weight:bold; padding-left:40px;"><?=$item->sum_cost?> грн.</div>
     <div  style="clear:both;"></div>
 </div>
 <?php endforeach;?>
@@ -20,6 +20,7 @@ $(&#39;#orders-phone,#orders-phone2&#39;).mask(&#39;(000) 000-0000&#39;);
 $this->registerJs("
 $('#orders-delivery input[type=\"radio\"]').click(function(){
+    $('.hidden_box').addClass('activeShow')
     $('.delivery-data').hide();
     $('#delivery-data-'+$(this).val()).show();
 });
@@ -66,7 +67,7 @@ $(&#39;#orders-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
          </div>
      </div>
-     <div class="input-blocks-group radio_grp">
+     <div class="input-blocks-group radio_grp hidden_box">
          <div class="input-blocks-wrapper">
              <?= $form->field($modelOrder, 'delivery')
                  ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>0])->asArray()->all(), 'id', 'title'),[
@@ -117,7 +117,7 @@ $this-&gt;registerJs (&quot;
         </ul>
         <div class="both"></div>
-        <div class="cost_box product_read_ _qqq_">
+        <div class="cost_box product_read_">
             <div class='params'>код: <span id='art'></span><br/> цвет: <span id='color'></span></div>
             <div class="product_read_price">
                 <div class="w">
@@ -170,7 +170,7 @@ $this-&gt;registerJs (&quot;
     <div class="content">
         <div class="pic">
             <center>
-                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product',['id'=>'pic'])?></a>
+                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product_view',['id'=>'pic'])?></a>
             </center>
         </div>
         <ul class="product_colors">
@@ -183,16 +183,19 @@ $this-&gt;registerJs (&quot;
     </div>
     <div class="both"></div>
 </div>
-
 <?php
-//$this->registerJs ("
-//      var productHash = window.location.hash;
-//       productHash = productHash.replace('#','')
-//
-//       var productUl = $('ul.product_mod li')
-//       var productA = productUl.find('a#'+productHash)
-//       productUl.removeClass('active')
-//       productA.parent().addClass('active')
-//       console.log(productA)
-//    ", View::POS_READY, 'new_script');
-//?>
 \ No newline at end of file
+$this->registerJs ("
+      var productHash = window.location.hash;
+            productHash = productHash.replace('#','')
+
+            var productUl = $('ul.product_mod li')
+            var productA = productUl.find('a#'+productHash)
+            productUl.removeClass('active')
+            productA.parent().addClass('active')
+            var dataLink = productA.attr('data-imageoriginal')
+            var dataImg = productA.attr('data-image')
+
+            $('#pic').attr('src',dataImg)
+            $('#pic').parent().attr('href',dataLink)
+    ", View::POS_READY, 'new_script');
+?>
 \ No newline at end of file
@@ -6,7 +6,7 @@ use yii\helpers\Url;
     <div class="boxitem">
         <div class="pixbox">
             <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->variant->product_variant_id]) ?>">
-                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->variant->image->imageUrl, 'list')?>
             </a>
         </div>
         <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
@@ -26,7 +26,8 @@ use yii\helpers\Url;
             'catalog/product',
             'product' => $product,
             '#' => 'm' .$product->variant->product_variant_id])
-        ?>" class="name"><?= $product->fullname ?>
+        ?>"
+           class="name"><?= $product->fullname ?>
         </a>
         <?php
@@ -47,7 +48,8 @@ use yii\helpers\Url;
     </div>
     <a href="<?= Url::to([
         'catalog/product',
-        'product' => $product])
+        'product' => $product,
+        '#' => 'm' .$product->variant->product_variant_id])
     ?>" class="link_buy">Купить</a>
     <div class="mycarousel">
@@ -28,6 +28,8 @@
     $this->registerJs ("
     $('#call').call({token:'" . Yii::$app->request->getCsrfToken () . "'});
 ", View::POS_READY, 'call');
+
+$this->registerJsFile (Yii::$app->request->baseUrl . '/js/fix_height.js', ['position' => View::POS_HEAD]);
     $this->registerJs ("
     var activeTab = $('.social li:first a').attr('id');
     $('.'+activeTab+'_box').show();
@@ -160,7 +162,9 @@
             <div class="both"></div>
         </div>
-        <?= $content ?>
+        <div class="wrapper_all">
+            <?= $content ?>
+        </div>
     </div>
@@ -73,7 +73,7 @@ nav input[type=&quot;submit&quot;]{width:35px;height:29px;border:none;background:url(&#39;../i
 .menu ul li{float:left;border-left:1px solid #8b9094; height: 43px;}
 .menu ul li:first-child{border-left:none;}
 .menu ul li a{width: 100%; height:100%;line-height:43px;float:left;box-sizing:border-box; padding:0 21px;text-transform: uppercase;color:#ffffff;font-size:15px;text-decoration: none;font-weight: 600;}
-.menu ul li a:hover{color:#e5e4e4;}
+.menu ul li:hover{background: #3e454b;}
 .menu ul li.active a{background:#f5f5f5;color:#596065;}
 .menu ul li.active a:hover{cursor: default;}
@@ -150,10 +150,10 @@ a.link_buy, .checkout_basket button {
     border-right: 0;
     cursor: pointer;
 }
-a.link_buy:hover, .submit4m:hover, .checkout_basket button:hover, .submit4:hover {
+a.link_buy:hover, .submit4m:hover, .checkout_basket button:hover, .submit4:hover, .btn-primary:hover {
     border-bottom: 3px solid #95ba2f;;
 }
-a.link_buy:active, .submit4m:active,.checkout_basket button:active, .submit4:active {
+a.link_buy:active, .submit4m:active,.checkout_basket button:active, .submit4:active, .btn-primary:active {
     background: #799920;
     border-bottom: 3px solid #799920;
@@ -377,8 +377,23 @@ a.del:hover{color:#a52828;text-decoration: underline;}
 .submit4m {font-family: Roboto;border:none;background:#95ba2f;border-radius:4px;color:#ffffff;text-transform: uppercase;font-size:10px;cursor:pointer; width:102px; height: 29px; border-bottom: 3px solid #799920; line-height: 29px;}
 .submit4m:active,.submit4m:focus {outline: none}
-.btn-primary{margin-top:5px;border:none;padding:8px 13px;background:#95ba2f;border-radius:5px;color:#ffffff;text-transform: uppercase;text-decoration:none;font-size:14px;font-weight:bold;cursor:pointer;}
-.btn-primary:hover{background:#f75d50;}
+.btn-primary{
+    border-bottom: 3px solid #799920;
+    border-top:0;border-right: 0;border-left: 0;
+    margin-top:5px;
+    padding:0 15px;
+    background:#95ba2f;
+    border-radius:4px;
+    color:#ffffff;
+    text-transform: uppercase;
+    text-decoration:none;
+    font-size:12px;
+    font-weight:bold;
+    cursor:pointer;
+    height: 29px;
+    line-height: 29px;
+}
+.btn-primary:active, .btn-primary:focus {outline: none;}
 a.logout:visited,a.logout:link{border:none;padding:3px 5px;background:#f75d50;border-radius:5px;color:#ffffff;text-transform: uppercase;text-decoration:none;font-size:11px;font-weight:normal;cursor:pointer;}
 a.logout:hover{background:#95ba2f;}
@@ -544,9 +559,9 @@ ul.social {margin-top: 20px;}
 #order-payment{float:right;width:280px;}
 #order-delivery{float:right;width:280px;}
-.delivery-data{padding:5px;border:1px solid #1bb631;background: #b7f5bf;display:none;border-radius: 5px;float: left;}
+.delivery-data{margin-bottom:27px;position:relative;background: #95ba2f;display:none;border-radius: 5px;float: left;box-sizing: border-box; padding: 14px 20px; color: #fff; font-size: 13px;}
-.jcarousel-next-disabled, .jcarousel-prev-disabled {display: none !important;}
+.jcarousel-next-disabled, .jcarousel-prev-disabled {opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";}
 .content2 br {display: none;}
 .pixbox a {
     width: 160px;
@@ -986,19 +1001,22 @@ a.active{font-weight:bold;text-decoration: underline;}
     margin: 0 0.5em;
     list-style: none;
 }
-.sort_block ul li a:after {
-    display: inline-block;
-    /*font-family: 'Glyphicons Halflings';*/
-    font-style: normal;
-    font-weight: normal;
-    line-height: 1;
-    -webkit-font-smoothing: antialiased;
+.sort_block ul li a.asc:after, .sort_block ul li a.desc:after {
+    display: block;
+    width: 5px;
+    height: 3px;
+    position: absolute;
+    top: 50%;
+    margin-top: -1px;
+    right: -10px;
+    content: '';
+    background: url("../img/arrow_sort_asc_desc.png") no-repeat;
 }
 .sort_block ul li a.asc:after {
-    content: "â†“";
+    background-position: 0 0;
 }
 .sort_block ul li a.desc:after {
-    content: "â†‘";
+    background-position: 0 -3px;
 }
 /*************/
 .home_banner_up {margin-top: 20px;}
@@ -1075,6 +1093,15 @@ a.active{font-weight:bold;text-decoration: underline;}
 .jcarousel-skin-tango .jcarousel-next-vertical {
     bottom: -13px;
 }
+.jcarousel-skin-tango .jcarousel-prev-vertical, .jcarousel-skin-tango .jcarousel-next-vertical {
+    left: 0;
+    width: 42px;
+    background-position: 14px 0;
+}
+.jcarousel-skin-tango .jcarousel-prev-vertical:hover, .jcarousel-skin-tango .jcarousel-next-vertical:hover {
+    background-position: 14px 0;
+    left: 0;
+}
 ul.product-special {
     position: absolute;
     top: 0;
@@ -1100,7 +1127,7 @@ ul.product-special li.top {
 ul.product-special li.top:after {
     content: '';
     position: absolute;
-    left: 52px;
+    right: -19px;
     top: 3px;
     border: 11px solid transparent;
     border-top: 5px solid #fbc665;
@@ -1125,7 +1152,7 @@ ul.product-special li.promo {
 ul.product-special li.promo:after {
     content: '';
     position: absolute;
-    left: 52px;
+    right: -19px;
     top: 3px;
     border: 11px solid transparent;
     border-top: 5px solid #f75d50;
@@ -1173,6 +1200,7 @@ ul.product-special li.promo:after {
 }
 .sort_block ul li a {
     color: #8fa951;
+    position: relative;
 }
 .sort_block ul li a:hover {
     color: #333;
@@ -1253,17 +1281,19 @@ ul.product-special li.promo:after {
 .irs {height: 49px;}
 .price_filter.first_price_li {margin-top: 8px;}
 .product_read_ .w{
-    width: 110px;overflow: hidden;
-    float: left;
+    width: 110px;
+    overflow: hidden;
     margin: 0;
     padding-top: 0;
-    white-space: nowrap;
-    min-height: 32px;
+    display: table-cell;
+    vertical-align: middle;
+    height: 32px;
+    float: none;
 }
 .product_read_ .w strike, .product_read_ .w .cost {
     width: 100%;
     float: left;
-    line-height: 15px;
+    /*line-height: 15px;*/
 }
 .product_read_price .link_buy {
@@ -1289,8 +1319,6 @@ ul.product-special li.promo:after {
     padding-bottom: 15px;
 }
 #login-form .btn-primary {
-    padding: 0 13px;
-    height: 28px;
 }
 .field-orders-delivery .control-label, .field-orders-payment .control-label, .field-orders-body .control-label, .textareagroup .control-label {
     width: 100%;
@@ -1435,12 +1463,43 @@ input.custom-radio + label:hover {
 }
 .input-blocks-wrapper .help-block {
     padding-left: 71px;
-    padding-top: 5px;
+    padding-top: 4px;
     width: 100%;
     float: left;
     box-sizing: border-box;
     margin-bottom: 0;
 }
+.cont_shop_but-wr {
+    height: 33px;
+    margin-top: 35px;
+    padding-bottom: 29px;
+}
+.cont_shop_but-wr .cont_shop {
+    margin-top: 8px;
+    float: left;
+}
+.cont_shop_but-wr .submit4.bottom3 {float: right;}
+._qqq_ .params {font-size: 12px;}
+.activeShow {border-bottom: 0 !important;}
+.delivery-data:after {
+    width: 100%;
+    border-bottom: 1px solid #d2d2d2;
+    position: absolute;
+    content: '';
+    bottom: -27px;
+    left: 0;
+}
+.img_ajax_basket img {
+    margin-right: 0!important;
+    max-width: 90px;
+    max-height: 90px;
+    vertical-align: middle;
+}
+.jcarousel-skin-tango>li{display: none;}
+#login-form {
+    margin: 50px auto 0 auto;
+}
+.wrapper_all {}
 .product-thumb-video iframe {
     width: 260px;
     height: auto;
 /* more_hide */
-
 $(function(){
 	$(".more").click(function(){
 		if($(this).hasClass("hideico")){