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

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into tukar-taraf

Browse Source
This commit is contained in:
Afiq Zakwan Hamdan
2021-07-08 20:17:08 +08:00
parent 0f24f93cca 46a6be8613
commit e6270868c9
4 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+7 -4
View File
@@ -1401,10 +1401,10 @@ class KhazanahController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
if($request->datetarikh == null){
$gadai_date = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker1);
$split_date = explode('-',$request->datetarikh);
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
@@ -1428,10 +1428,10 @@ class KhazanahController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
if($request->datetarikh == null){
$tebus_date = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker1);
$split_date = explode('-',$request->datetarikh);
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
@@ -2384,12 +2384,14 @@ class KhazanahController extends Controller
$bakilelongxtra = floatval(123.20);
$cajlelongxtra = floatval(25.50);
$upahsimpanxtra = floatval(4894.40);
$peruntukanhapuskira = ($xtra['phapuskira']);
}else{
$upahsimpanxtra = $xtra['upahsimpan'];
$bakilelongxtra = $xtra['bakilelong'];
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
$rugilelongxtra = -($xtra['kerugianlelong']);
$peruntukanhapuskira = ($xtra['phapuskira']);
}
//Terkumpul
@@ -2409,6 +2411,7 @@ class KhazanahController extends Controller
if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
$totalhartasemasa = 0;