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 f307b0a8 e85a9a94
Showing 7 changed files with 19 additions and 12 deletions Show diff stats
common/config/main.php
common/models/Orders.php
frontend/controllers/BasketController.php
frontend/views/basket/ajax_items.php
frontend/views/basket/index.php
frontend/web/css/style.css
frontend/web/js/basket.js
@@ -85,8 +85,8 @@ return [
                 ],
                 'product_trumb2' => [
                     'resize' => [
-                        'width' => 98,
-                        'height' => 98,
+                        'width' => 88,
+                        'height' => 88,
                         'master' => null
                     ],
                 ],
@@ -100,7 +100,7 @@ return [
                 'product_view' => [
                     'resize' => [
                         'width' => 392,
-                        'height' => null,
+                        'height' => 365,
                         'master' => null
                     ],
                 ],
@@ -7,7 +7,7 @@ use common\modules\product\models\ProductVariant;
 class Orders extends \yii\db\ActiveRecord
 {
-
+ private $data;
     public static function tableName()
     {
         return 'orders';
@@ -25,7 +25,8 @@ class BasketController extends Controller
                 return Yii::$app->response->redirect(['basket/index']);
             }
-            if(isset($_POST['update'])){
+            if(isset($_POST['update']) && isset($_POST['ProductVariant'])){
+
                 foreach ($_POST['ProductVariant'] as $index=>$row) {
                     $modelOrder->updateBasket($row);
                 }
@@ -83,12 +84,14 @@ class BasketController extends Controller
     public function actionItems(){
         $modelMod = new Orders;
+
+
         if(!empty($_GET['deleteID'])){
             $modelMod->deleteBasketMod($_GET['deleteID']);
         }
-        if(isset($_POST['Mod'])){
-            foreach ($_POST['Mod'] as $index=>$row) {
+        if(isset($_POST['ProductVariant'])){
+            foreach ($_POST['ProductVariant'] as $index=>$row) {
                 $modelMod->updateBasket($row);
             }
         }
@@ -2,7 +2,9 @@
 use yii\widgets\ActiveForm;
 use yii\helpers\Html;
 ?>
-<?php $form = ActiveForm::begin(['enableClientScript' => false,'id'=>'basket_form2']); ?>
+<?php $form = ActiveForm::begin(['enableClientScript' => false,  'options' => [
+    'class' => 'basket_form2'
+]]); ?>
 <?php foreach($basket_mods as $i=>$item):?>
 <div class="basket_item">
     <?php echo $form->field($item,'['.$i.']id')->hiddenInput()->label(false); ?>
@@ -38,7 +38,7 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
 <div class="layout">
-    <h1>Корзина</h1>
+    <h1 class="basket_title_">Корзина</h1>
 <div class="ten"></div>
 <?= Html::a('Вернуться в каталог', ['/site/index'], ['class'=>'btn-success']) ?>
 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?>
@@ -1235,7 +1235,7 @@ ul.product-special li.promo:after {
 .irs {height: 49px;}
 .price_filter.first_price_li {margin-top: 8px;}
 .product_read_ .w{
-   width: 110px;overflow: hidden;
+    width: 110px;overflow: hidden;
     float: left;
     margin: 0;
     padding-top: 0;
@@ -1278,7 +1278,6 @@ ul.product-special li.promo:after {
     width: 100%;
     float: left;
 }
-
 .product-thumb-video iframe {
     width: 260px;
     height: auto;
@@ -75,10 +75,13 @@
 		}
 		var sendformitems = function(w,form){
-			data_form = $(form+' #basket_form2').serialize();
+			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);