diff --git a/app/Http/Controllers/ProductsController.php b/app/Http/Controllers/ProductsController.php index 1da938bd..3cfc7edd 100644 --- a/app/Http/Controllers/ProductsController.php +++ b/app/Http/Controllers/ProductsController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Http\Requests\ProductsFilterRequest; use App\Http\Resources\ProductResource; use App\Models\Product; +use App\Models\Promotion; use App\Models\Range; use App\Models\Tag; use Illuminate\Http\Request; @@ -99,7 +100,8 @@ class ProductsController extends Controller } else { $ranges = Range::all(); $tags = Tag::where('status', true)->get(); - return view('ranges', compact('products', 'ranges', 'tags', 'sessionFilter', 'filtersMenuIsOpen', 'brands')); + $hasPromotion = Promotion::where('date_start', '<=', now())->where('date_end', '>=', now())->get(); + return view('ranges', compact('products', 'ranges', 'tags', 'sessionFilter', 'filtersMenuIsOpen', 'brands', 'hasPromotion')); } } @@ -116,7 +118,7 @@ class ProductsController extends Controller if (!empty($sessionFilter->search)) { $productsQuery->where('name', 'LIKE', '%' . $sessionFilter->search . '%'); } - if (!empty($sessionFilter->promotion)) { + if (!empty($sessionFilter->promotions)) { $productsQuery->whereHas('promotions'); } if (!empty($sessionFilter->ranges)) { diff --git a/database/migrations/2026_04_09_111244_delete_promotion_tag.php b/database/migrations/2026_04_09_111244_delete_promotion_tag.php new file mode 100644 index 00000000..c61dcfe8 --- /dev/null +++ b/database/migrations/2026_04_09_111244_delete_promotion_tag.php @@ -0,0 +1,36 @@ +where('tag_id', 13) + ->delete(); + + Tag::where('slug', 'promotion')->delete(); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + $promotion = new Tag(); + $promotion->label = "Promotion"; + $promotion->slug = Str::slug($promotion->label); + $promotion->save(); + } +} diff --git a/resources/views/front/sable/js/components/FilterComponent.vue b/resources/views/front/sable/js/components/FilterComponent.vue index d720b3c9..d20ee3dd 100644 --- a/resources/views/front/sable/js/components/FilterComponent.vue +++ b/resources/views/front/sable/js/components/FilterComponent.vue @@ -22,24 +22,6 @@