From e8c80c9250649678b3ed358209026cbb4bc773d3 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 27 May 2021 02:25:50 +0800 Subject: [PATCH] push khazanah for imbang duga als and wb --- app/Http/Controllers/KhazanahController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 8b5a0b9..aa732a5 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4035,11 +4035,12 @@ class KhazanahController extends Controller //Tanggungan Semasa $panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); - $wtd = Http::get(config('api.url').'/api/WTD/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $wtd = Http::get(config('api.url').'/api/SerahBaki/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $xtra = Http::get(config('api.url').'/api/Xtra/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); //TunaiDitangan Sementara Upah if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') @@ -4062,6 +4063,10 @@ class KhazanahController extends Controller $cajlelongxtra = floatval(25.50); $upahsimpanxtra = floatval(4894.40); + }else{ + $upahsimpanxtra = $xtra['upahsimpan']; + $bakilelongxtra = $xtra['bakilelong']; + $utgterkumpulxtra = $xtra['untungrugiterkumpul']; } //Terkumpul