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

Merge branch 'apiaku' into 'master'

Browse Source 
fix denominasi and vault

See merge request online-sistem1/api_arrahn!109
This commit is contained in:
hafifie rahman
2021-08-31 09:58:46 +00:00
parent 3444309806 88110dd1ac
commit 142a6ce969
2 changed files with 108 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/DenominasiController.php
+52 -2
View File
@@ -117,7 +117,9 @@ class DenominasiController extends Controller
$deno = Denominasi::on($cawangan['mysql'])->orderby('tarikh','desc')->first();
$savedeno = Denominasi::on($cawangan['mysql'])->create([
if(is_array($deno) && sizeof($deno) > 0)
{
$savedeno = Denominasi::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'bd1' => $deno['bd1'],
@@ -161,7 +163,55 @@ class DenominasiController extends Controller
'lebihan' => $deno['lebihan'],
'nota' => $deno['nota'],
'jumlahkeping' => $deno['jumlahkeping']
]);
]);
}else{
$savedeno = Denominasi::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'bd1' => 0,
'b1' => 0,
'bd5' => 0,
'b5' => 0,
'bd10' => 0,
'b10' => 0,
'bd20' => 0,
'b20' => 0,
'bd50' => 0,
'b50' => 0,
'bd100' => 0,
'b100' => 0,
'txtring1' => 0,
'k1' => 0,
'txtring5' => 0,
'k5' => 0,
'txtsen1' => 0,
'k01' => 0,
'txtsen5' => 0,
'k05' => 0,
'txtsen10' => 0,
'k010' => 0,
'txtsen20' => 0,
'k020' => 0,
'txtsen50' => 0,
'k050' => 0,
'txtring10' => 0,
'k10' => 0,
'txtring20' => 0,
'k20' => 0,
'txtring50' => 0,
'k50' => 0,
'txtring100' => 0,
'k100' => 0,
'txtring1000' => 0,
'k1000' => 0,
'jumlahbundle' => 0,
'txtjumlah' => 0,
'lebihan' => 0,
'nota' => 0,
'jumlahkeping' => 0
]);
}
return response()->json($savedeno);
}
app/Http/Controllers/VaultController.php
+56 -25
View File
@@ -172,32 +172,63 @@ class VaultController extends Controller
$vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first();
$vaultcreate = Vault::on($cawangan['mysql'])->create([
if(is_array($vault) && sizeof($vault) > 0)
{
$vaultcreate = Vault::on($cawangan['mysql'])->create([
'kodcaw'=>$request->kodcaw,
'tarikh'=> $current->toDateString(),
'bakiawal' => $vault['bakiakhir'],
'keluar' => 0,
'masuk' => 0,
'bakiakhir' => $vault['bakiakhir'],
'bakieod' => $vault['bakiakhir'],
'pendahuluan' => 0,
'serahan' => 0,
'1sen' => $vault['1sen'],
'5sen' => $vault['5sen'],
'10sen' => $vault['10sen'],
'20sen' => $vault['20sen'],
'50sen' => $vault['50sen'],
'rm1' => $vault['rm1'],
'rm2' => $vault['rm2'],
'rm5' => $vault['rm5'],
'rm10' => $vault['rm10'],
'rm50' => $vault['rm50'],
'rm100' => $vault['rm100'],
'rm1000' => $vault['rm1000'],
'totpanjar' => 0
]);
'kodcaw'=>$request->kodcaw,
'tarikh'=> $current->toDateString(),
'bakiawal' => $vault['bakiakhir'],
'keluar' => 0,
'masuk' => 0,
'bakiakhir' => $vault['bakiakhir'],
'bakieod' => $vault['bakiakhir'],
'pendahuluan' => 0,
'serahan' => 0,
'1sen' => $vault['1sen'],
'5sen' => $vault['5sen'],
'10sen' => $vault['10sen'],
'20sen' => $vault['20sen'],
'50sen' => $vault['50sen'],
'rm1' => $vault['rm1'],
'rm2' => $vault['rm2'],
'rm5' => $vault['rm5'],
'rm10' => $vault['rm10'],
'rm50' => $vault['rm50'],
'rm100' => $vault['rm100'],
'rm1000' => $vault['rm1000'],
'totpanjar' => 0
]);
}else{
$vaultcreate = Vault::on($cawangan['mysql'])->create([
'kodcaw'=>$request->kodcaw,
'tarikh'=> $current->toDateString(),
'bakiawal' => 0,
'keluar' => 0,
'masuk' => 0,
'bakiakhir' => 0,
'bakieod' => 0,
'pendahuluan' => 0,
'serahan' => 0,
'1sen' => 0,
'5sen' => 0,
'10sen' => 0,
'20sen' => 0,
'50sen' => 0,
'rm1' => 0,
'rm2' => 0,
'rm5' => 0,
'rm10' => 0,
'rm50' => 0,
'rm100' => 0,
'rm1000' => 0,
'totpanjar' => 0
]);
}
return response()->json($vaultcreate,201);
}