diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index d77037e3..45ab191f 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -16,6 +16,7 @@ use App\Models\TaxRate; use App\Models\XmlInco; use App\Traits\Controllers\ChangesModelOrder; use App\Traits\Controllers\UpdateModelStatus; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Illuminate\Support\Str; use Illuminate\Support\Facades\File; @@ -35,12 +36,18 @@ class ProductsController extends Controller { $ranges = Range::all(); - $filter_range = $request->query('filter_range'); - $filter_brand = $request->query('filter_brand'); - $filter_name = $request->query('filter_name'); + $filter_range = $request->query('filter_range'); + $filter_brand = $request->query('filter_brand'); + $filter_name = $request->query('filter_name'); + $filter_code_product = $request->query('filter_code_product'); - $products = new Product(); + $products = (new Product())::query(); + if (!empty($filter_code_product)) { + $products = $products->whereHas('foodProduct', function (Builder $q) use ($filter_code_product) { + $q->where('no_art', 'like', $filter_code_product); + }); + } if (!empty($filter_name)) { $products = $products->where('name', 'like', '%' . $filter_name . '%'); } @@ -65,7 +72,14 @@ class ProductsController extends Controller } } unset($product); - return view('bo.products.index', compact('products', 'ranges', 'filter_name', 'filter_range', 'filter_brand')); + return view('bo.products.index', compact( + 'products', + 'ranges', + 'filter_name', + 'filter_range', + 'filter_brand', + 'filter_code_product' + )); } /** diff --git a/app/Models/Product.php b/app/Models/Product.php index e8ed80a2..a8a92fdd 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -29,8 +29,8 @@ class Product extends Model implements Buyable */ protected $casts = [ 'orderable_start' => 'datetime', - 'orderable_end' => 'datetime', - 'price' => 'float' + 'orderable_end' => 'datetime', + 'price' => 'float' ]; /** @@ -155,12 +155,12 @@ class Product extends Model implements Buyable public function getCalcPrices() { $prices = array( - 'priceHt' => $this->priceHt, - 'priceKgTtc' => $this->priceKgTtc, - 'discountAmount' => $this->discountAmount, - 'discountRate' => $this->discountRate, - 'discountedPriceHt' => $this->discountedPriceHt, - 'priceTtc' => $this->priceTtc, + 'priceHt' => $this->priceHt, + 'priceKgTtc' => $this->priceKgTtc, + 'discountAmount' => $this->discountAmount, + 'discountRate' => $this->discountRate, + 'discountedPriceHt' => $this->discountedPriceHt, + 'priceTtc' => $this->priceTtc, 'discountedPriceTtc' => $this->discountedPriceTtc, ); return $prices; diff --git a/resources/views/bo/products/index.blade.php b/resources/views/bo/products/index.blade.php index e8a64a4c..f203a417 100644 --- a/resources/views/bo/products/index.blade.php +++ b/resources/views/bo/products/index.blade.php @@ -1,65 +1,70 @@ @extends('layouts.bo-layout') @section('content') -