fix upah skit2
This commit is contained in:
@@ -568,6 +568,7 @@ class GadaiController extends Controller
|
|||||||
$gadai = Gadai::on($cawangan['mysql'])
|
$gadai = Gadai::on($cawangan['mysql'])
|
||||||
->where('t_gadai','>=',$request->mula)
|
->where('t_gadai','>=',$request->mula)
|
||||||
->where('t_gadai','<=',$request->akhir)
|
->where('t_gadai','<=',$request->akhir)
|
||||||
|
->orderBy('teller')
|
||||||
->orderBy('t_gadai','asc')
|
->orderBy('t_gadai','asc')
|
||||||
->orderBy('sirig','asc')
|
->orderBy('sirig','asc')
|
||||||
->get();
|
->get();
|
||||||
|
|||||||
@@ -507,6 +507,7 @@ class TebusController extends Controller
|
|||||||
$tebus = Tebus::on($cawangan['mysql'])
|
$tebus = Tebus::on($cawangan['mysql'])
|
||||||
->where('t_tebus','>=',$request->mula)
|
->where('t_tebus','>=',$request->mula)
|
||||||
->where('t_tebus','<=',$request->akhir)
|
->where('t_tebus','<=',$request->akhir)
|
||||||
|
->orderBy('teller')
|
||||||
->orderBy('t_tebus','asc')
|
->orderBy('t_tebus','asc')
|
||||||
->orderBy('sirit','asc')
|
->orderBy('sirit','asc')
|
||||||
->get();
|
->get();
|
||||||
@@ -740,7 +741,8 @@ class TebusController extends Controller
|
|||||||
$listadvansur = Advansur::on($cawangan['mysql'])
|
$listadvansur = Advansur::on($cawangan['mysql'])
|
||||||
->where('tarikh','>=',$request->mula)
|
->where('tarikh','>=',$request->mula)
|
||||||
->where('tarikh','<=',$request->akhir)
|
->where('tarikh','<=',$request->akhir)
|
||||||
->orderBy('tarikh','desc')
|
->orderBy('teller')
|
||||||
|
->orderBy('tarikh','asc')
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
return response()->json($listadvansur,200);
|
return response()->json($listadvansur,200);
|
||||||
|
|||||||
Reference in New Issue
Block a user