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

fix merge

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-09-06 11:01:49 +08:00
parent b0251cb4a1
commit dd7c01f77a
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+3 -1
View File
@@ -2419,7 +2419,9 @@ class GadaiController extends Controller
// $rekod_pinjamandiberi; // $rekod_pinjamandiberi;
if($kodcaw === '011232') if($kodcaw === '011232')
$rekod_pinjamandiberi -= 282; {
$rekod_pinjamandiberi -= 282;
}
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
app/Http/Controllers/LelongController.php
+3 -1
View File
@@ -223,7 +223,9 @@ class LelongController extends Controller
} }
if($kodcaw === '011232') if($kodcaw === '011232')
{
$bakilelong += 6; $bakilelong += 6;
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -496,7 +498,7 @@ class LelongController extends Controller
->sum('cajlelong'); ->sum('cajlelong');
if($kodcaw === '011232') if($kodcaw === '011232')
$cajlelong += 122.5; $cajlelong +=122.5;
return response()->json($cajlelong,200); return response()->json($cajlelong,200);
} }
app/Http/Controllers/TebusController.php
+5 -2
View File
@@ -568,7 +568,8 @@ class TebusController extends Controller
->whereNotNull('hargajualan') ->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan'); ->where('hargajualan','<>','bakihargajualan');
$totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); // $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$bilpenebusantawarruq = $tebustawarruq->count(); $bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
@@ -929,7 +930,9 @@ class TebusController extends Controller
$total = $keuntungansebelumtawarruq + $keuntungan; $total = $keuntungansebelumtawarruq + $keuntungan;
if($kodcaw === '011232') if($kodcaw === '011232')
$total += 623.5; {
$total +=623.5;
}
return response()->json($total,200); return response()->json($total,200);
} }
app/Http/Controllers/VaultController.php
-10
View File
@@ -400,16 +400,6 @@ class VaultController extends Controller
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
// $pendahuluan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('pendahuluan');
// $serahan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('serahan');
$serahanpkb = '1000/020'; $serahanpkb = '1000/020';
$serahanjmc = '1000/026'; $serahanjmc = '1000/026';
$pendahuluanpkb = '7000/102'; $pendahuluanpkb = '7000/102';