fix upah skit2

2021-06-08 14:17:24 +08:00
parent d78a41adfb
commit 6d9e6fb178
2 changed files with 4 additions and 1 deletions
@@ -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);