Merge branch 'apiaku' into 'master'
Apiaku See merge request online-sistem1/api_arrahn!51
This commit is contained in:
@@ -580,7 +580,7 @@ class GadaiController extends Controller
|
|||||||
->sum('pinjaman');
|
->sum('pinjaman');
|
||||||
|
|
||||||
//Tebus Terkumpul
|
//Tebus Terkumpul
|
||||||
$tebus = Gadai::on($cawangan['mysql'])
|
$tebus = Tebus::on($cawangan['mysql'])
|
||||||
->where('sttebus','=','T')
|
->where('sttebus','=','T')
|
||||||
->whereYear('t_gadai','=',$current->year)
|
->whereYear('t_gadai','=',$current->year)
|
||||||
->orderBy('t_gadai','desc')
|
->orderBy('t_gadai','desc')
|
||||||
@@ -595,7 +595,7 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
//Outstanding
|
//Outstanding
|
||||||
$outstanding = Gadai::on($cawangan['mysql'])
|
$outstanding = Gadai::on($cawangan['mysql'])
|
||||||
// ->where('sttebus','=','')
|
->where('sttebus','=','')
|
||||||
->orderBy('t_gadai','desc')
|
->orderBy('t_gadai','desc')
|
||||||
->sum('pinjaman');
|
->sum('pinjaman');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user