diff --git a/app/Datatables/Shop/OffersDataTable.php b/app/Datatables/Shop/OffersDataTable.php index 3a9f5af9..148bb308 100644 --- a/app/Datatables/Shop/OffersDataTable.php +++ b/app/Datatables/Shop/OffersDataTable.php @@ -40,6 +40,7 @@ class OffersDataTable extends DataTable }) ->editColumn('status_id', function (Offer $offer) { return view("components.form.toggle", [ + 'name' => 'status_id', 'value' => $offer->status_id, 'on' => __('active'), 'off' => __('inactive'), diff --git a/app/Http/Controllers/Admin/Shop/OfferController.php b/app/Http/Controllers/Admin/Shop/OfferController.php index 440fb6e6..85452d81 100644 --- a/app/Http/Controllers/Admin/Shop/OfferController.php +++ b/app/Http/Controllers/Admin/Shop/OfferController.php @@ -77,7 +77,7 @@ class OfferController extends Controller public function toggleActive(Request $request) { - $data = Offers::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0); + $data = Offers::toggle_active($request->input('id'), ($request->input('status_id') == 'true') ? 1 : 0); return response()->json(['error' => 0]); } diff --git a/app/Models/Shop/Article.php b/app/Models/Shop/Article.php index 99118e7d..d9c778ca 100644 --- a/app/Models/Shop/Article.php +++ b/app/Models/Shop/Article.php @@ -115,7 +115,7 @@ class Article extends Model implements HasMedia public function scopeWithAvailableOffers($query) { return $query->whereHas('offers', function ($query) { - $query->where('status_id', 1); + $query->byStatus(1); }); } diff --git a/app/Repositories/Shop/Offers.php b/app/Repositories/Shop/Offers.php index a06e359e..1f27997c 100644 --- a/app/Repositories/Shop/Offers.php +++ b/app/Repositories/Shop/Offers.php @@ -44,7 +44,7 @@ class Offers public static function getAll() { - return Offer::orderBy('value', 'asc')->get(); + return Offer::get(); } public static function get($id) @@ -77,9 +77,9 @@ class Offers return Offer::destroy($id); } - public static function toggle_active($id, $active) + public static function toggle_active($id, $status_id) { - return self::update(['status_id' => $active], $id); + return self::update(['status_id' => $status_id], $id); } } diff --git a/build/img/visuel-non-disponible.jpg b/build/img/visuel-non-disponible.jpg new file mode 100644 index 00000000..4d458be6 Binary files /dev/null and b/build/img/visuel-non-disponible.jpg differ diff --git a/resources/views/Shop/Articles/partials/article.blade.php b/resources/views/Shop/Articles/partials/article.blade.php index d7dc1232..7e61c112 100644 --- a/resources/views/Shop/Articles/partials/article.blade.php +++ b/resources/views/Shop/Articles/partials/article.blade.php @@ -1,6 +1,10 @@
- ... + @if ($article['image'] !== null) + {{ $article['product_name'] }} + @else + + @endif