Merge branch 'apiaku' into 'master'

dashboard fix See merge request online-sistem1/api_arrahn!54
2021-02-28 06:16:40 +00:00
parent 0210feb42b 270ad96f08
commit c149c67a8f
1 changed files with 3 additions and 3 deletions
@@ -581,9 +581,9 @@ class GadaiController extends Controller

        //Tebus Terkumpul
        $tebus = Tebus::on($cawangan['mysql'])
-        ->where('sttebus','=','T')
-        ->whereYear('t_gadai','=',$current->year)
-        ->orderBy('t_gadai','desc')
+        ->where('jenistebus','=','T')
+        ->whereYear('t_tebus','=',$current->year)
+        ->orderBy('t_tebus','desc')
        ->sum('pinjaman');

        //Upah Terkumpul