Merge branch 'apiaku' into 'master'

Apiaku See merge request online-sistem1/api_arrahn!51
2021-02-27 06:16:01 +00:00
parent 2cdb58dbda 33d043b9ce
commit c4e8cd9c05
1 changed files with 2 additions and 2 deletions
@@ -580,7 +580,7 @@ class GadaiController extends Controller
        ->sum('pinjaman');

        //Tebus Terkumpul
-        $tebus = Gadai::on($cawangan['mysql'])
+        $tebus = Tebus::on($cawangan['mysql'])
        ->where('sttebus','=','T')
        ->whereYear('t_gadai','=',$current->year)
        ->orderBy('t_gadai','desc')
@@ -595,7 +595,7 @@ class GadaiController extends Controller

        //Outstanding
        $outstanding = Gadai::on($cawangan['mysql'])
-        // ->where('sttebus','=','')
+        ->where('sttebus','=','')
        ->orderBy('t_gadai','desc')
        ->sum('pinjaman');