From c5ee8af6efc4d15d51aa98b2ba2a8ef5002639aa Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Wed, 28 Apr 2021 11:49:44 +0200 Subject: [PATCH] =?UTF-8?q?tri=20de=20la=20liste=20des=20commandes=20comma?= =?UTF-8?q?nde=20=C3=A0=20retirer=20aujourd'hui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Bo/OrdersController.php | 120 ++++++++++++++++++- app/Http/Requests/SortOrders.php | 30 +++++ resources/views/bo/modules/sorter.blade.php | 6 + resources/views/bo/orders/index.blade.php | 31 +++-- resources/views/layouts/bo-layout.blade.php | 1 + routes/web.php | 1 + 6 files changed, 176 insertions(+), 13 deletions(-) create mode 100644 app/Http/Requests/SortOrders.php create mode 100644 resources/views/bo/modules/sorter.blade.php diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index 0ea865e3..64b9905f 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -6,16 +6,14 @@ use App\Http\Controllers\Controller; use App\Models\Order; use App\Models\OrderLine; use App\Models\OrdersProducts; -use App\Models\OrdersStatus; use App\Models\Product; use App\Models\Timeslot; use App\Models\Magasin; +use App\Http\Requests\SortOrders; use Illuminate\Support\Facades\Mail; use App\Mail\OrderStatusMail; use App\Mail\OrderConfirmMail; -use App\Models\CollecteException; use App\Models\Customers; -use App\Models\TimeslotSetting; use App\Models\Setting; use Carbon\Carbon; use Carbon\CarbonImmutable; @@ -31,12 +29,124 @@ class OrdersController extends Controller /** * index of orders (Bo) */ - public function index() + public function index(SortOrders $request) { - $orders = Order::orderBy('date', 'DESC')->get(); + //$orders = Order::orderBy('date', 'DESC')->get(); + + $orders = Order::query(); + + + if ($request->rst) { + Session::remove('orders.sort_col'); + Session::remove('orders.sort_way'); + } + if ($request->sort_col) { + Session::put('orders.sort_col', $request->sort_col); + Session::save(); + } + if ($request->sort_way) { + Session::put('orders.sort_way', $request->sort_way); + Session::save(); + } + + if (Session::has('orders.sort_col') and Session::has('orders.sort_way')) { + switch (Session::get('orders.sort_col')) { + case 'date': + $orders = $orders->orderBy('date', Session::get('orders.sort_way')); + break; + case 'status_id': + $orders = $orders->orderBy('status_id', Session::get('orders.sort_way')); + break; + case 'magasin_id': + $orders = $orders->select('orders.*'); + $orders = $orders->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $orders = $orders->leftJoin('magasins', 'timeslots.magasin_id', '=', 'magasins.id'); + $orders = $orders->orderBy('magasins.id', Session::get('orders.sort_way')); + break; + case 'date_retrait': + $orders = $orders->select('orders.*'); + $orders = $orders->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $orders = $orders->orderBy('timeslots.day', Session::get('orders.sort_way')); + $orders = $orders->orderBy('timeslots.time', Session::get('orders.sort_way')); + break; + case 'customer_id': + $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way')); + break; + } + } + + if ($request->today) { + //filter + $today = CarbonImmutable::now()->startOfDay(); + $orders = $orders->whereHas('timeslot', function($q) use($today) { + $q->where('day', '=', $today->format('d/m/Y')); + }); + } + + $orders = $orders->paginate(10); + return view('bo.orders.index', compact('orders')); } + public function today(SortOrders $request) + { + //$orders = Order::orderBy('date', 'DESC')->get(); + + $orders = Order::query(); + + + if ($request->rst) { + Session::remove('orders.sort_col'); + Session::remove('orders.sort_way'); + } + if ($request->sort_col) { + Session::put('orders.sort_col', $request->sort_col); + Session::save(); + } + if ($request->sort_way) { + Session::put('orders.sort_way', $request->sort_way); + Session::save(); + } + + if (Session::has('orders.sort_col') and Session::has('orders.sort_way')) { + switch (Session::get('orders.sort_col')) { + case 'date': + $orders = $orders->orderBy('date', Session::get('orders.sort_way')); + break; + case 'status_id': + $orders = $orders->orderBy('status_id', Session::get('orders.sort_way')); + break; + case 'magasin_id': + $orders = $orders->select('orders.*'); + $orders = $orders->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $orders = $orders->leftJoin('magasins', 'timeslots.magasin_id', '=', 'magasins.id'); + $orders = $orders->orderBy('magasins.id', Session::get('orders.sort_way')); + break; + case 'date_retrait': + $orders = $orders->select('orders.*'); + $orders = $orders->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $orders = $orders->orderBy('timeslots.day', Session::get('orders.sort_way')); + $orders = $orders->orderBy('timeslots.time', Session::get('orders.sort_way')); + break; + case 'customer_id': + $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way')); + break; + } + } + + + //filter + $today = CarbonImmutable::now()->startOfDay(); + $orders = $orders->whereHas('timeslot', function($q) use($today) { + $q->where('day', '=', $today->format('d/m/Y')); + }); + + + $orders = $orders->get(); //paginate(20); + + return view('bo.orders.index', compact('orders','today')); + } + /** * action de changement de statut vers l'avant * envoi de mails transctionnels diff --git a/app/Http/Requests/SortOrders.php b/app/Http/Requests/SortOrders.php new file mode 100644 index 00000000..1390670e --- /dev/null +++ b/app/Http/Requests/SortOrders.php @@ -0,0 +1,30 @@ + 'sometimes|in:asc,desc', + ]; + } +} diff --git a/resources/views/bo/modules/sorter.blade.php b/resources/views/bo/modules/sorter.blade.php new file mode 100644 index 00000000..bcdad279 --- /dev/null +++ b/resources/views/bo/modules/sorter.blade.php @@ -0,0 +1,6 @@ +@if(!session($list.'.sort_way') or session($list.'.sort_col') !== $colname or (session($list.'.sort_way') === 'desc' and session($list.'.sort_col') === $colname)) + ↓  +@endif +@if(!session($list.'.sort_way') or session($list.'.sort_col') !== $colname or (session($list.'.sort_way') === 'asc' and session($list.'.sort_col') === $colname)) + ↑  +@endif diff --git a/resources/views/bo/orders/index.blade.php b/resources/views/bo/orders/index.blade.php index 53ff3bd6..2bfff8f7 100644 --- a/resources/views/bo/orders/index.blade.php +++ b/resources/views/bo/orders/index.blade.php @@ -2,21 +2,34 @@ @section('content')
-

Commandes

+

Commandes @if (isset($today)) à retirer aujourd'hui @endif

@if (session('success')) {{ session('success') }} @endif
- + - + - - - - + + + + @foreach ($orders as $order) @@ -58,7 +71,9 @@ @endforeach
UtilisateurClient  + @include('bo.modules.sorter', ['colname' => 'customer_id', 'list' => 'orders']) + RéférenceDate + Date  + @include('bo.modules.sorter', ['colname' => 'date', 'list' => 'orders']) + Total en €Date de retraitPoint de retraitStatusDate de retrait  + @include('bo.modules.sorter', ['colname' => 'date_retrait', 'list' => 'orders']) + + Point de retrait  + @include('bo.modules.sorter', ['colname' => 'magasin_id', 'list' => 'orders']) + + Statut  + @include('bo.modules.sorter', ['colname' => 'status_id', 'list' => 'orders']) + Réinitialiser le tri
- + @if($orders instanceof \Illuminate\Pagination\LengthAwarePaginator ) + {{ $orders->appends($_GET)->links() }} + @endif @endsection @section('scripts') diff --git a/resources/views/layouts/bo-layout.blade.php b/resources/views/layouts/bo-layout.blade.php index bc5003ad..1fe3c732 100644 --- a/resources/views/layouts/bo-layout.blade.php +++ b/resources/views/layouts/bo-layout.blade.php @@ -162,6 +162,7 @@ diff --git a/routes/web.php b/routes/web.php index d0d3e38f..3e2c5729 100644 --- a/routes/web.php +++ b/routes/web.php @@ -110,6 +110,7 @@ Route::namespace('App\Http\Controllers\Bo') // Commandes Route::get('/orders', [OrdersController::class, 'index'])->name('orders'); + Route::get('/orders/today', [OrdersController::class, 'today'])->name('orders.today'); Route::get('/orders/{reference}', [OrdersController::class, 'orderDetail'])->name('order-detail'); Route::get('/orders/{reference}/advance', [OrdersController::class, 'changeStatus'])->name('change-order-status'); Route::get('/orders/{reference}/cancel', [OrdersController::class, 'cancelOrder'])->name('cancel-order');