20.07.16

Administrator
1 parent a59e31bb
Showing 3 changed files with 18 additions and 15 deletions Show diff stats
common/modules/product/CatalogUrlManager.php
frontend/controllers/BasketController.php
frontend/web/js/basket.js
@@ -29,8 +29,11 @@ class CatalogUrlManager implements UrlRuleInterface {
         $pathInfo = $request->getPathInfo();
         $paths = explode('/', $pathInfo);
  
-        if(strripos($request->url,$pathInfo.'?') && (!strripos($request->url,'?page')) && (!strripos($request->url,'?sort'))){
-            throw new HttpException(404 ,'Page not found');
+        if(isset($paths[1])) {
+            if(strripos($request->url,'catalog/'.$paths[1].'?') && (!strripos($request->url,'?page')) && (!strripos($request->url,'?sort'))){
+                throw new HttpException(404 ,'Page not found');
+            }
+
         }
  
  
@@ -26,7 +26,7 @@ class BasketController extends Controller
                 $modelOrder->deleteBasketMod($_GET['deleteID']);
                 return Yii::$app->response->redirect(['basket/index']);
             }
-            
+
             if(isset($_POST['update']) && isset($_POST['ProductVariant'])){
  
                 foreach ($_POST['ProductVariant'] as $index=>$row) {
@@ -40,7 +40,7 @@ class BasketController extends Controller
                   $body .= "\n\r";
                 }
                 $body .= "\n\r";
-  
+
                     if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save()) {
                         $productV = $_POST['ProductVariant'];
  
@@ -129,8 +129,8 @@ class BasketController extends Controller
                         return $this->redirect(['basket/success',
                         ]);
                     }
-                }            
-            
+                }
+
             $basket_mods = $modelOrder->getBasketMods();
  
             if(!empty(Yii::$app->user->id)){
@@ -141,12 +141,12 @@ class BasketController extends Controller
             }
  
  
-           
+
             return $this->render('index', [
                     'modelMod'=>$modelMod,
                     'basket_mods'=>$basket_mods,
                     'modelOrder'=>$modelOrder,
-            ]);        
+            ]);
     }
  
     public function actionItems(){
@@ -168,7 +168,7 @@ class BasketController extends Controller
             'basket_mods'=>$basket_mods,
         ]);
     }
-    
+
     public function actionInfo()
     {
             $modelMod = new Orders();
@@ -176,8 +176,8 @@ class BasketController extends Controller
             return $this->renderAjax('ajax_info', [
                     'info'=>$info,
             ]);
-    } 
-    
+    }
+
         public function actionAdd(){
 		$modelOrders = new Orders();
                 if(isset($_GET['mod_id'],$_GET['count']) && $_GET['mod_id']>0 && $_GET['count']>0){
@@ -19,11 +19,11 @@
 		var go_product = function(data){
 		    var product_id = data.product_id;
 			$.get("/basket/add/",  data ,
-			function(data){ 
+			function(data){
 				//alert_msg("Товар добавлен<br /> в корзину",product_id);
 				popup(0,'.black');
 				start_basket();
-			});		
+			});
 		}
  
  
@@ -97,8 +97,8 @@
 			//	},
 			//});
 		}
-	
-        var start_basket = function(){ 
+
+        var start_basket = function(){
 			$.get("/basket/info/",
 			function(data){
 				$(basket_id).html(data);