diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 6ac9f85..b3db0a6 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -568,6 +568,7 @@ class GadaiController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where('t_gadai','>=',$request->mula) ->where('t_gadai','<=',$request->akhir) + ->orderBy('teller') ->orderBy('t_gadai','asc') ->orderBy('sirig','asc') ->get(); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index e11ada1..db9cdec 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -507,6 +507,7 @@ class TebusController extends Controller $tebus = Tebus::on($cawangan['mysql']) ->where('t_tebus','>=',$request->mula) ->where('t_tebus','<=',$request->akhir) + ->orderBy('teller') ->orderBy('t_tebus','asc') ->orderBy('sirit','asc') ->get(); @@ -740,7 +741,8 @@ class TebusController extends Controller $listadvansur = Advansur::on($cawangan['mysql']) ->where('tarikh','>=',$request->mula) ->where('tarikh','<=',$request->akhir) - ->orderBy('tarikh','desc') + ->orderBy('teller') + ->orderBy('tarikh','asc') ->get(); return response()->json($listadvansur,200);