forge-joniko/ldc-boutique-cnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sort date bug (review feedback)

Browse source
This commit is contained in:
S. Hattry 2022-11-28 11:04:22 +01:00
parent 1cca69c933
commit 30e53b81b3
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/Bo/OrdersController.php
View file

@ -21,6 +21,7 @@ use App\Models\Setting;
use Carbon\Carbon; use Carbon\Carbon;
use Carbon\CarbonImmutable; use Carbon\CarbonImmutable;
use Carbon\CarbonInterval; use Carbon\CarbonInterval;
use Doctrine\DBAL\Query\QueryBuilder;
use Gloudemans\Shoppingcart\Facades\Cart; use Gloudemans\Shoppingcart\Facades\Cart;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -52,6 +53,13 @@ class OrdersController extends Controller
$orders = $orders->select('orders.*'); $orders = $orders->select('orders.*');
$orders = $orders->join('timeslots', 'timeslots.order_id', '=', 'orders.id'); $orders = $orders->join('timeslots', 'timeslots.order_id', '=', 'orders.id');
$orders = $orders->where('timeslots.magasin_id', $filter_magasin); $orders = $orders->where('timeslots.magasin_id', $filter_magasin);
// $orders = $orders->whereHas(
// 'timeslots',
// function (QueryBuilder $q, $filter_magasin) {
// $q->where('timeslots.magasin_id', $filter_magasin);
// }
// );
} }
if (!empty($filter_reference)) { if (!empty($filter_reference)) {
$orders = $orders->where('reference', 'like', '%' . $filter_reference . '%'); $orders = $orders->where('reference', 'like', '%' . $filter_reference . '%');
@ -93,7 +101,8 @@ class OrdersController extends Controller
*/ */
protected function filterOrders(Request $request) protected function filterOrders(Request $request)
{ {
$orders = Order::query()->orderByDesc('date'); // $orders = Order::query()->orderByDesc('date');
$orders = Order::query();
if ($request->rst) { if ($request->rst) {
Session::remove('orders.sort_col'); Session::remove('orders.sort_col');
@ -131,7 +140,9 @@ class OrdersController extends Controller
case 'customer_id': case 'customer_id':
$orders = $orders->orderBy('customer_id', Session::get('orders.sort_way')); $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way'));
break; break;
}//end switch } //end switch
} else {
$orders->orderByDesc('date');
}//end if }//end if
return $orders; return $orders;