fixes on brand search

src/app/Http/Controllers/Api/Cart/ReadController.php

@@ -6,6 +6,7 @@
 
 use Kaleidoscope\Factotum\Cart;
 use Kaleidoscope\Factotum\CartProduct;
+use Kaleidoscope\Factotum\Library\Utility;
 use Kaleidoscope\Factotum\Order;
 use Kaleidoscope\Factotum\Traits\CartUtils;
 
@@ -31,7 +32,7 @@ public function getListPaginated( Request $request )
 			$direction = 'DESC';
 		}
 
-		$query = Cart::query();
+		$query = Cart::withTrashed();
 		$query->selectRaw('carts.*, first_name, last_name, company_name');
 		$query->join('users', 'users.id', '=', 'carts.customer_id');
 		$query->join('profiles', 'profiles.user_id', '=', 'users.id');
@@ -70,7 +71,6 @@ public function getListPaginated( Request $request )
 				$cart->totals = $this->_getCartTotals( $cart );
 			}
 		}
-
         return response()->json( [ 'result' => 'ok', 'carts' => $carts, 'total' => Cart::count() ]);
     }
 

src/app/Http/Controllers/Web/Ecommerce/Brand/ReadController.php

@@ -11,16 +11,20 @@
 
 class ReadController extends Controller
 {
+	protected $_productsPerPage = 48;
 
     public function getProductsByBrand(Request $request, $brandCode)
     {
-    	$itemsPerPage    = $request->input('items_per_page', 12);
+    	$itemsPerPage    = $request->input('items_per_page', $this->_productsPerPage );
 		$brandFilter     = $request->input('brand_filter');
 		$brandsFilter    = $request->input('brands');
 		$brand           = Brand::where( 'code', $brandCode )->first();
+		$brandsFiltered  = null;
 
 		if ( $brandsFilter ) {
 			$brandsFilter = explode(',', $brandsFilter);
+
+			$brandsFiltered = Brand::whereIn('id', $brandsFilter)->get();
 		}
 
         if ( $brand ) {
@@ -49,6 +53,7 @@ public function getProductsByBrand(Request $request, $brandCode)
 						->with([
 							'itemsPerPage'         => $products->perPage(),
 							'brandFilter'          => $brandFilter,
+							'brandsFiltered'       => $brandsFiltered,
 							'brand'                => $brand,
 							'brandsFilter'         => $brandsFilter,
 							'products'             => $products,

src/app/Http/Controllers/Web/Ecommerce/Order/UpdateController.php

@@ -30,6 +30,7 @@ public function setOrderTransaction( SetOrderTransaction $request )
 
 			if ( $order ) {
 				$order->setTransactionId( $transactionId );
+				$cart = $this->_getCart();
 
 				$result = [
 					'result'   => 'ok',

src/app/Http/Controllers/Web/Ecommerce/ProductCategory/ReadController.php

@@ -11,10 +11,11 @@
 
 class ReadController extends Controller
 {
+	protected $_productsPerPage = 48;
 
     public function getProductsByCategory(Request $request, $productCategorySlug)
     {
-    	$itemsPerPage    = $request->input('items_per_page', 12);
+    	$itemsPerPage    = $request->input('items_per_page', $this->_productsPerPage );
 		$brandFilter     = $request->input('brand_filter');
 		$brandsFilter    = $request->input('brands');
 		$productCategory = ProductCategory::where('name', $productCategorySlug)->first();

src/app/Http/Requests/SearchProduct.php

@@ -25,6 +25,7 @@ public function rules()
 
 		if ( isset($data['product_category_id']) && $data['product_category_id'] != '' ) {
 			$rules['product_category_id'] = 'required|exists:product_categories,id';
+			unset($rules['term']);
 		}
 
 		return $rules;

src/app/Traits/CartUtils.php

@@ -295,6 +295,8 @@ protected function _createOrderFromCart( Cart $cart )
 					request()->session()->remove('delivery_address');
 					request()->session()->remove('invoice_address');
 					request()->session()->remove('shipping');
+
+					$cart->delete();
 				}
 
 				return $order;

src/resources/views/ecommerce/product/partials/product-category-filters.blade.php

@@ -35,7 +35,7 @@
 								<select name="brand_filter" id="brand_filter">
 									<option value="">Brand</option>
 									@foreach( $brands as $br )
-										<option value="{{ $br->id }}" @if( $brandFilter == $br->id ) selected @endif>{{ $br->name }}</option>
+										<option value="{{ $br->id }}" @if( !isset($brandsFiltered) && $brandFilter == $br->id ) selected @endif>{{ $br->name }}</option>
 									@endforeach
 								</select>
 							</div>

src/resources/views/ecommerce/product/products_by_brand.blade.php

@@ -20,20 +20,33 @@
 			</div>
 			<div class="col col-xs-12 col-md-9">
 
-				<div class="product-category-cover">
+				@if ( !$brandsFiltered )
+					<div class="product-category-cover">
 
-					<div class="row clearfix">
-						<div class="col col-xs-12">
-							@if( isset($brand->logo) )
-								<img src="{{ $brand->logo }}" alt="{{ $brand->name }}" width="200" />
-							@endif
+						<div class="row clearfix">
+							<div class="col col-xs-12">
+								@if( isset($brand->logo) )
+									<img src="{{ $brand->logo }}" alt="{{ $brand->name }}" width="200" />
+								@endif
+							</div>
 						</div>
-					</div>
 
-				</div>
+					</div>
+				@endif
 
 
-				@include('factotum::ecommerce.product.partials.product-category-filters', [ 'title' => $brand->name ])
+				@if ( !$brandsFiltered )
+					@include('factotum::ecommerce.product.partials.product-category-filters', [ 'title' => $brand->name ])
+				@else
+					@php
+					$title = [];
+					foreach ( $brandsFiltered as $b ) {
+						$title[] = $b->name;
+					}
+					$title = 'Ricerca per : ' . join(', ', $title);
+					@endphp
+					@include('factotum::ecommerce.product.partials.product-category-filters', [ 'title' => $title ])
+				@endif
 
 
 				@if ( $products->count() > 0 )