KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'apiaku' into 'master'

Browse Source 
fix kelulusan

See merge request online-sistem1/api_arrahn!20
This commit is contained in:
hafifie rahman
2021-01-17 00:57:07 +00:00
parent f092d40b78 58cab5f448
commit 761d88f180
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+3 -3
View File
@@ -396,7 +396,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
->where('t_gadai','<=',$tarikh) ->where('t_gadai','<=',$tarikh)
// ->where('sttebus','=','') // ->where('sttebus','=','')
->whereYear('t_gadai','=',$current->year) // ->whereYear('t_gadai','=',$current->year)
->orderBy('t_gadai','desc') ->orderBy('t_gadai','desc')
->get(); ->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') ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
->where('t_gadai','<=',$tarikh) ->where('t_gadai','<=',$tarikh)
->where('sttebus','=','T') ->where('sttebus','=','T')
->whereYear('t_gadai','=',$current->year) // ->whereYear('t_gadai','=',$current->year)
->orderBy('t_gadai','desc') ->orderBy('t_gadai','desc')
->get(); ->get();
@@ -413,7 +413,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
->where('t_gadai','<=',$tarikh) ->where('t_gadai','<=',$tarikh)
->where('sttebus','=','L') ->where('sttebus','=','L')
->whereYear('t_gadai','=',$current->year) // ->whereYear('t_gadai','=',$current->year)
->orderBy('t_gadai','desc') ->orderBy('t_gadai','desc')
->get(); ->get();
app/Http/Controllers/KelulusanController.php
+1 -2
View File
@@ -77,8 +77,7 @@ class KelulusanController extends Controller
->where('norujukan','=',$norujukan) ->where('norujukan','=',$norujukan)
->update(array( ->update(array(
'masalulus'=> $harini->toTimeString(), 'masalulus'=> $harini->toTimeString(),
'khazanah'=> 'khazanah' 'pelulus'=> 'khazanah'
)); ));
} }
else else