From 3385328504bf1932176ce38b744c12cd7dad4271 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Thu, 18 Jul 2024 12:15:24 +0800
Subject: [PATCH] Fix keuntungan formula for ujrah payment

---
 app/Http/Controllers/BayaranController.php | 2 +-
 app/Services/PembiayaanService.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/BayaranController.php b/app/Http/Controllers/BayaranController.php
index 9598d94..01a9c23 100644
--- a/app/Http/Controllers/BayaranController.php
+++ b/app/Http/Controllers/BayaranController.php
@@ -304,7 +304,7 @@ class BayaranController extends Controller
 	        $upahTawarruq = Http::arrahn()->get('/api/upahtawarruq/'.$x['kodcaw'].'/'.$x['norujukan'], ['jeniskeuntungan' => $jenisKeuntungan])->json();
 
 		if($jenisKeuntungan == 'onepercent'){
-			$x['upah_tawarruq'] =  $upahTawarruq['pendapatan'] + $upahTawarruq['keuntungan'];
+			$x['upah_tawarruq'] =  $upahTawarruq['keuntungan'] + $upahTawarruq['ujrah'];
 		}
 
 		if($jenisKeuntungan == 'asal'){
diff --git a/app/Services/PembiayaanService.php b/app/Services/PembiayaanService.php
index 9f083b1..c8b37d4 100644
--- a/app/Services/PembiayaanService.php
+++ b/app/Services/PembiayaanService.php
@@ -48,7 +48,7 @@ class PembiayaanService
 	        $upahTawarruq = Http::arrahn()->get('/api/upahtawarruq/'.$x->kodcaw.'/'.$x->norujukan, ['jeniskeuntungan' => $jenisKeuntungan])->json();
 
 		if($jenisKeuntungan == 'onepercent'){
-			$x->upah_tawarruq =  $upahTawarruq['pendapatan'] + $upahTawarruq['keuntungan'];
+			$x->upah_tawarruq =  $upahTawarruq['keuntungan'] + $upahTawarruq['ujrah'];
 		}
 
 		if($jenisKeuntungan == 'asal'){