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

fix merge

Browse Source
This commit is contained in:
hafifierahman
2023-06-17 22:57:49 +08:00
parent 840c202e04 f001ce6ffe
commit 5c1f179176
2 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+3 -1
View File
@@ -3630,8 +3630,10 @@ class AdminPageController extends Controller
if($request->jenisgenerate == 'daily'){ if($request->jenisgenerate == 'daily'){
$date = $request->tarikh; $date = $request->tarikh;
$res = $ringkasan->StoreRingkasanHarian($date,$date,$request->zone); $res = $ringkasan->StoreRingkasanHarian($date,$date,$request->zone);
}else{ }else if($request->jenisgenerate == 'monthly'){
$res = $ringkasan->StoreRingkasanHarian($request->mula,$request->hingga,$request->zone); $res = $ringkasan->StoreRingkasanHarian($request->mula,$request->hingga,$request->zone);
}else{
return response('error',400);
} }
return response($res); return response($res);
} }
app/Services/RingkasanHarianServices.php
-2
View File
@@ -454,8 +454,6 @@ class RingkasanHarianServices
$lelong->caj_lelong = ($getLelong['cas_lelong']) ? $getLelong['cas_lelong'] : 0; $lelong->caj_lelong = ($getLelong['cas_lelong']) ? $getLelong['cas_lelong'] : 0;
$lelong->bil_lelong = ($getLelong['bilangan']) ? $getLelong['bilangan'] : 0; $lelong->bil_lelong = ($getLelong['bilangan']) ? $getLelong['bilangan'] : 0;
if(!$condition){ if(!$condition){
$main->gadai()->save($gadai); $main->gadai()->save($gadai);
$main->ansuran()->save($ansuran); $main->ansuran()->save($ansuran);