diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 0f4dbbd..84f2d03 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3286,14 +3286,14 @@ class GadaiController extends Controller if($gadai['t_gadai'] == $current->toDateString()){ $tempoh_gadai = 0.5; } - if($tempoh_gadai >= 6.0){ - if($gadai['t_matang'] >= $current->toDateString()){ - $tempoh_gadai = 6.0; - } - }else if($tempoh_gadai >= 12){ + if($tempoh_gadai >= 12.0){ if($gadai['t_matang1'] >= $current->toDateString()){ $tempoh_gadai = 12.0; } + }else if($tempoh_gadai >= 6.0){ + if($gadai['t_matang'] >= $current->toDateString()){ + $tempoh_gadai = 6.0; + } } $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);