added server edited at 12/10/2024

app/Support/OnePercent.php

@@ -70,8 +70,9 @@ class OnePercent extends MasterServices
     }
 
     public function getOnePercent(HttpRequest $request){
+        $margin = (!is_numeric($request->margin)) ? 0 : $request->margin;
         $onePercentServices = new Calculation();
-        $keuntungan = $onePercentServices->kiraanKeuntunganSebenar($request->pembiayaan,$request->nilaimarhun,$request->kadarujrah,$request->margin);
+        $keuntungan = $onePercentServices->kiraanKeuntunganSebenar($request->pembiayaan,$request->nilaimarhun,$request->kadarujrah,$margin);
 
         return $keuntungan;
     }

app/Support/v1/Penebusan.php

@@ -455,6 +455,12 @@ class Penebusan
             $rebet = 0;
         }
 
+        //check duplicate
+        $data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','T')->first();
+        if(!empty($data)){
+            return 'duplicate';
+        }
+
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         if($gadai['hargajualan'] == null){
@@ -592,6 +598,12 @@ class Penebusan
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
+        //check duplicate
+        $data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','AT')->first();
+        if(!empty($data)){
+            return 'duplicate';
+        }
+
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'sttebus' => "T",
             't_update' => $current->toDateString(),

app/Support/v2/GadaiV2.php

@@ -242,6 +242,8 @@ class GadaiV2
             $ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
 
             $onepercentasal = $gadai['pinjaman'] * (1/100);
+            $ujrahasal = $onepercent->getRoundedMethod($ujrahasal);
+            $onepercentasal = $onepercent->getRoundedMethod($onepercentasal);
 
             try {