merge with server fixed

app/Http/Controllers/GadaiController.php

@@ -2364,6 +2364,9 @@ class GadaiController extends Controller
             case '011229':
                 $tarikhtawarruq = '2021-06-22';
             break;
+            case '011230':
+                $tarikhtawarruq = '2021-06-23';
+            break;
             case '011013':
                 $tarikhtawarruq = '2021-06-23';
             break;

app/Http/Controllers/LaporanController.php

@@ -390,7 +390,7 @@ class LaporanController extends Controller
                             ->where('glcode','=','3000/120')
                             ->sum('amaun');	
 
-        if($kodcaw == '011229')
+       if($kodcaw == '011229')
         {
             $peruntukanhapuskira = GlCode::on($cawangan['mysql'])
             ->where('glcode','=','1000/015')
@@ -398,7 +398,6 @@ class LaporanController extends Controller
         }else{
             $peruntukanhapuskira = 0;
         }
-       
 
         $arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
 

app/Http/Controllers/LelongController.php

@@ -201,7 +201,7 @@ class LelongController extends Controller
         if($kodcaw == 'APM')
             $bakilelong += 4498.1;
 
-        if($kodcaw == '010617')
+       if($kodcaw == '010617')
             $rugitotal -= 6.1;
 
         if($kodcaw == '011229'){
@@ -496,4 +496,4 @@ class LelongController extends Controller
         return response()->json($cajperkhidmatan,200);
     }
 
-}
+}

app/Http/Controllers/TebusController.php

@@ -61,7 +61,13 @@ class TebusController extends Controller
         $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
+	if(strpos($upah_semasa_round,',')){
+            $upah_semasa_round = str_replace(',','',$upah_semasa_round);
+        }
         $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+	if(strpos($upah_semasa,',')){
+            $upah_semasa = str_replace(',','',$upah_semasa);
+        }
 
         return $upah_semasa;
     }
@@ -80,7 +86,13 @@ class TebusController extends Controller
         $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
 
         $upah_rebet_round = number_format($upahrebet_raw,2);
+	if(strpos($upah_rebet_round,',')){
+            $upah_rebet_round = str_replace(',','',$upah_rebet_round);
+        }
         $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
+	if(strpos($upah_rebet,',')){                        
+            $upah_rebet = str_replace(',','',$upah_rebet);
+        }
 
         return $upah_rebet;
     }