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

merge with server fixed

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-08 12:30:24 +08:00
parent 32563f1d76 efcff2e4a1
commit 027c453fec
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+3
View File
@@ -2364,6 +2364,9 @@ class GadaiController extends Controller
case '011229': case '011229':
$tarikhtawarruq = '2021-06-22'; $tarikhtawarruq = '2021-06-22';
break; break;
case '011230':
$tarikhtawarruq = '2021-06-23';
break;
case '011013': case '011013':
$tarikhtawarruq = '2021-06-23'; $tarikhtawarruq = '2021-06-23';
break; break;
app/Http/Controllers/LaporanController.php
+1 -2
View File
@@ -390,7 +390,7 @@ class LaporanController extends Controller
->where('glcode','=','3000/120') ->where('glcode','=','3000/120')
->sum('amaun'); ->sum('amaun');
if($kodcaw == '011229') if($kodcaw == '011229')
{ {
$peruntukanhapuskira = GlCode::on($cawangan['mysql']) $peruntukanhapuskira = GlCode::on($cawangan['mysql'])
->where('glcode','=','1000/015') ->where('glcode','=','1000/015')
@@ -398,7 +398,6 @@ class LaporanController extends Controller
}else{ }else{
$peruntukanhapuskira = 0; $peruntukanhapuskira = 0;
} }
$arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; $arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
app/Http/Controllers/LelongController.php
+2 -2
View File
@@ -201,7 +201,7 @@ class LelongController extends Controller
if($kodcaw == 'APM') if($kodcaw == 'APM')
$bakilelong += 4498.1; $bakilelong += 4498.1;
if($kodcaw == '010617') if($kodcaw == '010617')
$rugitotal -= 6.1; $rugitotal -= 6.1;
if($kodcaw == '011229'){ if($kodcaw == '011229'){
@@ -496,4 +496,4 @@ class LelongController extends Controller
return response()->json($cajperkhidmatan,200); return response()->json($cajperkhidmatan,200);
} }
} }
app/Http/Controllers/TebusController.php
+12
View File
@@ -61,7 +61,13 @@ class TebusController extends Controller
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $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); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
return $upah_semasa; return $upah_semasa;
} }
@@ -80,7 +86,13 @@ class TebusController extends Controller
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2); $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); $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
return $upah_rebet; return $upah_rebet;
} }