Merge remote-tracking branch 'origin/master'

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

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/web/css/style.css
Karnovsky A
2 parents 83be3cfb e27b3a51
Showing 10 changed files with 258 additions and 89 deletions Show diff stats
backend/views/articles/view.php
backend/views/event/view.php
common/models/Orders.php
frontend/views/basket/index.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/web/css/style.css
frontend/web/img/radio_new-active.png
frontend/web/img/radio_new.png
frontend/web/js/basket.js
@@ -31,13 +31,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'date',
             'title',
-            'body:ntext',
-            'image',
             'translit',
             'meta_title',
             'meta_keywords',
             'meta_description',
-            'seo_text:ntext',
             'h1',
         ],
     ]) ?>
@@ -31,21 +31,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'event_id',
             'name',
             'alias',
-            'body:ntext',
-            [
-                'format' => 'html',
-                'attribute' => 'imageUrl',
-                'value' => function($data) {
-                    return \common\components\artboximage\ArtboxImageHelper::getImage($data->imageUrl, 'list');
-                },
-            ],
             'meta_title',
             'description',
             'h1',
-            'seo_text:ntext',
-            'created_at',
-            'updated_at',
-            'end_at',
         ],
     ]) ?>
@@ -28,7 +28,7 @@ class Orders extends \yii\db\ActiveRecord
         return [
             'name' => 'Ф.И.О',
             'phone'=>'Телефон',
-            'phone2'=>'Дополнительный телефон',
+            'phone2'=>'Доп. Тел.',
             'body'=>'Сообщение',
             'adress'=>'Адрес',
             'city'=>'Город',
@@ -14,12 +14,12 @@ $this-&gt;registerMetaTag([&#39;name&#39; =&gt; &#39;keywords&#39;, &#39;content&#39; =&gt; &#39;Корзина&#39;]);
 $this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
 $this->registerJs("
-$('#order-phone,#order-phone2').mask('(000) 000-0000');
+$('#orders-phone,#orders-phone2').mask('(000) 000-0000');
 ", View::POS_READY, 'mask');
 $this->registerJs("
-$('#order-delivery input[type=\"radio\"]').click(function(){
+$('#orders-delivery input[type=\"radio\"]').click(function(){
     $('.delivery-data').hide();
     $('#delivery-data-'+$(this).val()).show();
 });
@@ -42,34 +42,93 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
 <div class="ten"></div>
 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?>
-<div class="rightbar">
+<div class="rightbar basket_rightbar">
  <div class="form-order">
-<?php echo $form->field($modelOrder,'name'); ?>
-<?php echo $form->field($modelOrder,'phone'); ?> 
-<?php echo $form->field($modelOrder,'phone2'); ?>
-<?php echo $form->field($modelOrder,'city'); ?>    
-<?php echo $form->field($modelOrder,'adress'); ?>
-<?php echo $form->field($modelOrder,'email'); ?>
-    <?= $form->field($modelOrder, 'delivery')
-        ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>0])->asArray()->all(), 'id', 'title'))
-    ?>
+     <div class="input-blocks-group">
+         <div class="title_groups">контакты</div>
+         <div class="input-blocks-wrapper" style="margin-top: 0">
+             <?php echo $form->field($modelOrder, 'name', [ 'options' => [ 'class' => 'input-blocks basket_input_2' ] ])->textInput([ 'class' => 'custom-input-2' ]); ?>
+         </div>
+         <div class="input-blocks-wrapper">
+             <?php echo $form->field($modelOrder, 'phone', [ 'options' => [ 'class' => 'input-blocks basket_input_2' ] ])->textInput([ 'class' => 'custom-input-2' ]); ?>
+         </div>
+         <div class="input-blocks-wrapper">
+             <?php echo $form->field($modelOrder, 'phone2', [ 'options' => [ 'class' => 'input-blocks basket_input_2' ] ])->textInput([ 'class' => 'custom-input-2' ]); ?>
+         </div>
+         <div class="input-blocks-wrapper">
+             <?php echo $form->field($modelOrder, 'city', [ 'options' => [ 'class' => 'input-blocks basket_input_2' ] ])->textInput([ 'class' => 'custom-input-2' ]); ?>
+         </div>
+         <div class="input-blocks-wrapper">
+             <?php echo $form->field($modelOrder, 'adress', [ 'options' => [ 'class' => 'input-blocks basket_input_2' ] ])->textInput([ 'class' => 'custom-input-2' ]); ?>
+         </div>
+         <div class="input-blocks-wrapper">
+             <?php echo $form->field($modelOrder, 'email', [ 'options' => [ 'class' => 'input-blocks basket_input_2' ] ])->textInput([ 'class' => 'custom-input-2' ]); ?>
+         </div>
+     </div>
+
+     <div class="input-blocks-group radio_grp">
+         <div class="input-blocks-wrapper">
+             <?= $form->field($modelOrder, 'delivery')
+                 ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>0])->asArray()->all(), 'id', 'title'),[
+                     'item' => function($index, $label, $name, $checked, $value) {
+                         $return = '<div class="custom-form-buttons">';
+                         $return .= '<input class="custom-radio" id="custom-radio-' . $value . '" ' . ( $checked ? "checked" : "" ) . ' type="radio" name="' . $name . '" value="' . $value . '" >';
+                         $return .= '<label for="custom-radio-' . $value . '" ><span></span>' . $label . '</label>';
+                         $return .= '</div>';
+                         return $return;
+                     },
+                 ])
+             ?>
+         </div>
+     </div>
+
+
 <div class="both"></div> 
 <?php foreach(Delivery::find()->where(['parent_id'=>0])->all() as $item):?>
 <div class='delivery-data' id='delivery-data-<?=$item->id?>'>
         <?=$item->text?>
     <?= $form->field($modelOrder, 'delivery')
-        ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>$item->id])->asArray()->all(), 'id', 'title'),['id' => 'order-delivery-childs'])->label(false)
-    ?>    
-</div>    
+        ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>$item->id])->asArray()->all(), 'id', 'title'), [
+            'id'=> 'order-delivery-childs',
+            'item' => function($index, $label, $name, $checked, $value) {
+                $return = '<div class="custom-form-buttons">';
+                $return .= '<input class="custom-radio" id="custom-radio-' . $value . '" ' . ( $checked ? "checked" : "" ) . ' type="radio" name="' . $name . '" value="' . $value . '" >';
+                $return .= '<label for="custom-radio-' . $value . '" ><span></span>' . $label . '</label>';
+                $return .= '</div>';
+                return $return;
+            },
+        ]);?>
+</div>
+
 <?php endforeach;?>
+     <div class="input-blocks-group radio_grp">
+         <div class="input-blocks-wrapper">
+             <?php echo $form->field($modelOrder, 'payment')->radioList(['Оплатить наличными'=>'Оплатить наличными','Оплатить на карту Приват Банка'=>'Оплатить на карту Приват Банка','Оплатить по безналичному расчету'=>'Оплатить по безналичному расчету','Оплатить Правекс-телеграф'=>'Оплатить Правекс-телеграф','Наложенным платежом'=>'Наложенным платежом'],[
+                 'item' => function($index, $label, $name, $checked, $value) {
+                     $return = '<div class="custom-form-buttons">';
+                     $return .= '<input class="custom-radio" id="custom-radio-' . $value . '" ' . ( $checked ? "checked" : "" ) . ' type="radio" name="' . $name . '" value="' . $value . '" >';
+                     $return .= '<label for="custom-radio-' . $value . '" ><span></span>' . $label . '</label>';
+                     $return .= '</div>';
+                     return $return;
+                 },
+             ]); ?>
+         </div>
+     </div>
+
-<?php echo $form->field($modelOrder, 'payment')->radioList(['Оплатить наличными'=>'Оплатить наличными','Оплатить на карту Приват Банка'=>'Оплатить на карту Приват Банка','Оплатить по безналичному расчету'=>'Оплатить по безналичному расчету','Оплатить Правекс-телеграф'=>'Оплатить Правекс-телеграф','Наложенным платежом'=>'Наложенным платежом']); ?>    
-<div class="both"></div>
-<?php echo $form->field($modelOrder,'body')->textarea(['rows'=>7]); ?>     
-<?php echo Html::submitButton(' Оформить заказ ',array('class'=>'submit4')); ?>
+
+
+<div class="input-blocks-group textareagroup" style="border-bottom: none;">
+    <?php echo $form->field($modelOrder,'body')->textarea(['rows'=>7]); ?>
+
+    <?php echo Html::submitButton(' Оформить заказ ',array('class'=>'submit4')); ?>
+</div>
+
+     <div class="both"></div>
+
  </div>   
 </div>
 			<div class="content">
@@ -77,11 +136,11 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
 <?php foreach($basket_mods as $i=>$item):?>
 			<div class="basket_item">
-				<a href="<?=Url::to(['products/show','translit_rubric'=>$item->translit_rubric,'translit'=>$item->translit,'id'=>$item->product_id])?>">
+				<a href="<?= Url::to(['catalog/product', 'product' => $item->product,'#' => 'm' .$item->product_variant_id]) ?>">
                     <?= \common\components\artboximage\ArtboxImageHelper::getImage($item->imageUrl, 'product_basket')?>
                 </a>
 				<div class="info">
-				<a href="<?=Url::to(['products/show','translit_rubric'=>$item->translit_rubric,'translit'=>$item->translit,'id'=>$item->product_id])?>" class="link2"><?=$item->product_name?></a>
+				<a href="<?= Url::to(['catalog/product', 'product' => $item->product,'#' => 'm' .$item->product_variant_id]) ?>" class="link2"><?=$item->product_name?></a>
 				<p>Код: <?=$item->sku?>, цвет: <?=$item->name?></p>
                                 <?php echo $form->field($item,'['.$i.']id')->hiddenInput()->label(false); ?>
                                 <?php echo $form->field($item,'['.$i.']product_name')->hiddenInput()->label(false); ?>
@@ -183,3 +183,16 @@ $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
@@ -5,7 +5,7 @@ use yii\helpers\Url;
 <li class="item">
     <div class="boxitem">
         <div class="pixbox">
-            <a href="<?= Url::to(['catalog/product', 'product' => $product]) ?>">
+            <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->variant->product_variant_id]) ?>">
                 <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
             </a>
         </div>
@@ -24,7 +24,8 @@ use yii\helpers\Url;
         <?php endif?>
         <a href="<?= Url::to([
             'catalog/product',
-            'product' => $product])
+            'product' => $product,
+            '#' => 'm' .$product->variant->product_variant_id])
         ?>" class="name"><?= $product->fullname ?>
         </a>
@@ -196,7 +196,8 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
 .loyout{padding:20px 0px;}
 .leftbar{float:left;width:172px;margin-right: 20px; }
-.rightbar{float:right;width:380px;margin-left:35px;}
+.rightbar{float:right;width:380px;margin-left:40px;}
+.rightbar.basket_rightbar{margin-right: 20px;}
 .rightbar2{float:right;width:320px;}
 .content {overflow:hidden;min-height:500px;}
 * html .content{height:1%;}
@@ -522,11 +523,11 @@ ul.social {margin-top: 20px;}
 .pixbox{width:160px;margin:0 auto;height:200px;overflow: hidden;text-align: center;}
-.form-order{background:#f5f5f5;padding:10px;border:1px solid #d2d2d2;}
+.form-order{background:#f5f5f5;padding:0 20px 20px 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;}
+.delivery-data{padding:5px;border:1px solid #1bb631;background: #b7f5bf;display:none;border-radius: 5px;float: left;}
 .jcarousel-next-disabled, .jcarousel-prev-disabled {display: none !important;}
 .content2 br {display: none;}
@@ -1274,13 +1275,116 @@ ul.product-special li.promo:after {
     padding: 0 13px;
     height: 28px;
 }
-.field-orders-delivery .control-label, .field-orders-payment .control-label, .field-orders-body .control-label {
+.field-orders-delivery .control-label, .field-orders-payment .control-label, .field-orders-body .control-label, .control-label {
     width: 100%;
     float: left;
 }
 .basket_title_ {
     text-align: center;
 }
+.cont_shopping {
+    display: block !important;
+    border-top: 0!important;
+    border-left: 0!important;
+    border-right: 0!important;
+    border-bottom: 1px dashed #799920!important;
+    color: #799920!important;
+    margin: 0!important;
+    padding: 0!important;
+    font-size: 12px!important;
+    float: left;
+    border-radius: 0 !important;
+}
+.info.product-thumb-video {
+    width: 100%;
+    height: 100%;
+}
+.info.product-thumb-video iframe {
+    width: 100% !important;
+    height: 100% !important;
+}
+.input-blocks-wrapper, .input-blocks {
+    width: 100%;
+    float: left;
+}
+.form-order .input-blocks-wrapper {
+    margin-top: 6px;
+}
+.input-blocks label {
+    font-size: 13px;
+    color: #333;
+}
+.basket_input_2 label {
+    height: 30px;
+    line-height: 30px;
+    float: left;
+    width: 70px !important;
+    padding-top: 0 !important;
+}
+
+.custom-input-2 {
+    width: 100%;
+    height: 30px;
+    border: 1px solid #d2d2d2;
+    box-sizing: border-box;
+    outline: none;
+    color: #636363;
+    font-size: 13px;
+    line-height: 30px;
+    padding-left: 8px;
+    margin-top: 5px;
+    background: #fff;
+    border-radius: 4px;
+}
+.basket_input_2 .custom-input-2 {
+    width: 270px;
+    float: right;
+    margin-top: 0;
+}
+.custom-input-2:focus, .custom-area-3:focus{box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s}
+.title_groups, .radio_grp label.control-label {
+    font-size: 12px;
+    font-weight: bold;
+    text-transform: uppercase;
+    margin-bottom: 12px;
+}
+.input-blocks-group {
+    width: 100%;
+    float: left;
+    border-bottom: 1px solid #d2d2d2;
+    padding-bottom: 20px;
+    margin-top: 18px;
+}
+.custom-form-buttons {
+    width: 100%;
+    float: left;
+}
+input.custom-radio + label, input.custom-check + label {
+    font-size: 13px;
+    cursor: pointer;
+    margin-left: 6px;
+}
+/***radio***/
+input.custom-radio,  input.custom-check {display: none}
+input.custom-radio + label span{
+    width: 16px;
+    height: 16px;
+    background: url('../img/radio_new.png') no-repeat;
+    float: left;
+    transition: .2s;
+    margin-top: 1px;
+}
+input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span {
+    background: url('../img/radio_new-active.png') no-repeat;
+}
+
+input.custom-radio + label:hover {
+    text-decoration: underline;
+}
+.custom-form-buttons {
+    margin-top: 7px;
+}
+.custom-form-buttons:first-child {margin-top: 0}
 .product-thumb-video iframe {
     width: 260px;
     height: auto;
@@ -26,42 +26,48 @@
 			});		
 		}
-		var popup = function(w,form){
-			$.get("/basket/items/", {} ,function(data){
-				$('.basket_items').html(data);
-				$('.basket_items .delete_button').click(function(){
-					var id =$(this).data('id');
-					$.get("/basket/items/",  {deleteID : id},function(data){
-						popup(w,form);
-						start_basket(w,form);
-					});
-					return false;
+
+		var update = function(data,form,w){
+			console.log(data);
+			$('.basket_items').html(data);
+			$('.basket_items .delete_button').click(function(){
+				var id =$(this).data('id');
+				$.get("/basket/items/",  {deleteID : id},function(data){
+					popup(w,form);
+					start_basket(w,form);
 				});
-				$(".item_num").bind('input',function(){
+				return false;
+			});
+			$(".item_num").bind('input',function(){
+				sendformitems(w,form);
+			});
+			$(".minus").click(function(){
+				var a = $(this).parent().find(".item_num").attr("value");
+				if (a == 1) {
+					/* минимум 1 элемент */
+				}
+				else{
+					a--;
+					$(this).parent().find('.item_num').val(a);
 					sendformitems(w,form);
-				});
-				$(".minus").click(function(){
-					var a = $(this).parent().find(".item_num").attr("value");
-					if (a == 1) {
-						/* минимум 1 элемент */
-					}
-					else{
-						a--;
-						$(this).parent().find('.item_num').val(a);
-						sendformitems(w,form);
-					}
-				});
-				$(".plus").click(function(){
-					var a = $(this).parent().find(".item_num").attr("value");
-					if (a == 10) {
-						/* минимум 1 элемент */
-					}
-					else{
-						a++;
-						$(this).parent().find('.item_num').val(a);
-						sendformitems(w,form);
-					}
-				});
+				}
+			});
+			$(".plus").click(function(){
+				var a = $(this).parent().find(".item_num").attr("value");
+				if (a == 10) {
+					/* минимум 1 элемент */
+				}
+				else{
+					a++;
+					$(this).parent().find('.item_num').val(a);
+					sendformitems(w,form);
+				}
+			});
+		};
+
+		var popup = function(w,form){
+			$.get("/basket/items/", {} ,function(data){
+				update(data,form,w);
 			});
 			if(w==0) {
 				$(".black").removeClass("hidden");
@@ -75,19 +81,20 @@
 		}
 		var sendformitems = function(w,form){
-			var data_form = $(form+' .basket_form2').serialize();
-			console.log(data_form);
-
-			$.ajax({
-				type: 'POST',
-				url: "/basket/items/",
-				dataType: "json",
-				data: data_form,
-				success: function(data) {
-					popup(w,form);
-					start_basket();
-				},
+			//var data_form = $(form+' .basket_form2').serialize();
+			$.post('/basket/items/', $.param($(form+' .basket_form2').serializeArray()), function(data) {
+				update(data,form,w);
+				start_basket();
 			});
+			//$.ajax({
+			//	type: 'POST',
+			//	url: "/basket/items/",
+			//	dataType: "json",
+			//	data: data_form,
+			//	done: function(data) {
+            //
+			//	},
+			//});
 		}
         var start_basket = function(){