Merge branch 'apiaku' into 'master'

fix kelulusan

See merge request online-sistem1/api_arrahn!20

app/Http/Controllers/GadaiController.php

@@ -396,7 +396,7 @@ class GadaiController extends Controller
                 ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
                 ->where('t_gadai','<=',$tarikh)
                 // ->where('sttebus','=','')
-                ->whereYear('t_gadai','=',$current->year)
+                // ->whereYear('t_gadai','=',$current->year)
                 ->orderBy('t_gadai','desc')
                 ->get();
        
@@ -405,7 +405,7 @@ class GadaiController extends Controller
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
         ->where('t_gadai','<=',$tarikh)
         ->where('sttebus','=','T')
-        ->whereYear('t_gadai','=',$current->year)
+        // ->whereYear('t_gadai','=',$current->year)
         ->orderBy('t_gadai','desc')
         ->get();
 
@@ -413,7 +413,7 @@ class GadaiController extends Controller
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
         ->where('t_gadai','<=',$tarikh)
         ->where('sttebus','=','L')
-        ->whereYear('t_gadai','=',$current->year)
+        // ->whereYear('t_gadai','=',$current->year)
         ->orderBy('t_gadai','desc')
         ->get();
 

app/Http/Controllers/KelulusanController.php

@@ -77,8 +77,7 @@ class KelulusanController extends Controller
                      ->where('norujukan','=',$norujukan)
                      ->update(array(
                               'masalulus'=> $harini->toTimeString(),
-                              'khazanah'=> 'khazanah'
-                              
+                              'pelulus'=> 'khazanah'
             ));
       }
       else