Merge branch 'apiaku' into 'master'

dashboard fix

See merge request online-sistem1/api_arrahn!54

app/Http/Controllers/GadaiController.php

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