From b17f60a71ce9fc3f13041edfbd369c2ae6af7ab8 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 10 Jan 2023 12:21:15 +0800 Subject: [PATCH 1/7] fix issues lelong arrahnbid --- app/Http/Controllers/HomeController.php | 1 + .../Controllers/InformationController.php | 24 +++++++-- app/Models/LelongBid.php | 53 +++++++++++++++++++ config/database.php | 22 ++++++++ 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 app/Models/LelongBid.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8f3d1d5..5393469 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -58,6 +58,7 @@ class HomeController extends Controller $bilanganlelong = 0; foreach($CustomerInfo['lelong'] as $index1=>$lelong) { + $bilangan++; $bilanganlelong += 1; } diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index d749776..52abfc5 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\LelongBid; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Http; @@ -37,6 +38,16 @@ class InformationController extends Controller $pembiayaansemasa = $CustomerInfo['gadai']; } + if(isset($CustomerInfo['lelong'])){ + if(sizeof($CustomerInfo['lelong']) > 0){ + foreach($CustomerInfo['lelong'] as $index=>$lelong){ + $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lelong['norujukan']],['hargajual','>',0]])->first()->toArray(); + $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong)->toArray(); + } + $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); + } + } + $pembiayaansemasa = $pembiayaansemasa->toArray(); return response()->json($pembiayaansemasa,200); // return view('includes.information.pembiayaanaktif',compact('pembiayaansemasa')); } @@ -71,9 +82,15 @@ class InformationController extends Controller $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json(); $lelong = []; - if(isset($CustomerInfo['lelong'])) - { - $lelong += $CustomerInfo['lelong']; + + if(isset($CustomerInfo['lelong'])){ + if(sizeof($CustomerInfo['lelong']) > 0){ + foreach($CustomerInfo['lelong'] as $index=>$lel){ + $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lel['norujukan']],['hargajual','>',0]])->first()->toArray(); + $CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong)->toArray(); + } + $lelong = collect($lelong)->merge($CustomerInfo['lelong']); + } } @@ -88,3 +105,4 @@ class InformationController extends Controller return view('auth.termasyarat', compact('termasyarat')); } } + diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php new file mode 100644 index 0000000..db5f2bc --- /dev/null +++ b/app/Models/LelongBid.php @@ -0,0 +1,53 @@ + env('MYSQL_ATTR_SSL_CA'), ]) : [], ], + + 'lelong' => [ + 'driver' => 'mysql', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST_LELONG', '127.0.0.1'), + 'port' => env('DB_PORT_LELONG', '3306'), + 'database' => env('DB_DATABASE_LELONG', 'lelong'), + 'username' => env('DB_USERNAME_LELONG', 'root'), + 'password' => env('DB_PASSWORD_LELONG', ''), + 'unix_socket' => env('DB_SOCKET_LELONG', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + + 'pgsql' => [ 'driver' => 'pgsql', From 4e990ffb5f857089f198690bcceab6574bdd218a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 10 Jan 2023 13:06:59 +0800 Subject: [PATCH 2/7] fix arrahnbid connection --- app/Http/Controllers/InformationController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index 52abfc5..d140e78 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -41,8 +41,8 @@ class InformationController extends Controller if(isset($CustomerInfo['lelong'])){ if(sizeof($CustomerInfo['lelong']) > 0){ foreach($CustomerInfo['lelong'] as $index=>$lelong){ - $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lelong['norujukan']],['hargajual','>',0]])->first()->toArray(); - $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong)->toArray(); + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json(); + $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); } $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); } @@ -86,8 +86,10 @@ class InformationController extends Controller if(isset($CustomerInfo['lelong'])){ if(sizeof($CustomerInfo['lelong']) > 0){ foreach($CustomerInfo['lelong'] as $index=>$lel){ - $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lel['norujukan']],['hargajual','>',0]])->first()->toArray(); - $CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong)->toArray(); + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json(); + if($array_lelong['lelong'] !== null){ + $CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong['lelong'])->toArray(); + } } $lelong = collect($lelong)->merge($CustomerInfo['lelong']); } From 5ee5589f288c817ef2e264c75e05bd4daef38b52 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 10 Jan 2023 13:13:11 +0800 Subject: [PATCH 3/7] fix issues lelong2 --- app/Http/Controllers/InformationController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index d140e78..c7f8ed9 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -41,8 +41,11 @@ class InformationController extends Controller if(isset($CustomerInfo['lelong'])){ if(sizeof($CustomerInfo['lelong']) > 0){ foreach($CustomerInfo['lelong'] as $index=>$lelong){ - $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json(); - $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lelong['norujukan']])->json(); + + if($array_lelong['lelong'] !== null){ + $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); + } } $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); } From 97274b742011621e19a696bc1ed59121f79e00e5 Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Wed, 15 Feb 2023 16:22:02 +0800 Subject: [PATCH 4/7] fix home --- resources/views/includes/home.blade.php | 56 ++++++++++++++----------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index 857d36e..5a3ab8c 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -94,7 +94,7 @@ {{ $bilangan }}
-
+

@@ -112,7 +112,7 @@ {{ $sixmonths }}
-
+

@@ -130,7 +130,7 @@ {{ $bilanganlelong }}
-
+

@@ -169,10 +169,10 @@ # - Cawangan No Rujukan - JBG Keuntungan + Cawangan + JBG T Lanjut {{-- Status --}} @@ -344,7 +344,7 @@ var hargaemastable = $('#harga_emas').DataTable({ $('#totalsag').text(0); var empat = selepastawarruqtable.columns(3).header(); - $(empat).html('JBG'); + //$(empat).html('JBG'); selepastawarruqtable.column( 4 ).visible( true ); selepastawarruqtable.column( 5 ).visible( true ); // selepastawarruqtable.column( 6 ).visible( true ); @@ -417,7 +417,7 @@ var hargaemastable = $('#harga_emas').DataTable({ var today = new Date(); var tarikhlelong = new Date(response.t_lelong); tarikhblock = DateDiff(tarikhlelong,today); - if(tarikhblock.toFixed() <= 2) + if(tarikhblock.toFixed() <= 3) { lelongblock = 'disabled'; } @@ -466,10 +466,10 @@ var hargaemastable = $('#harga_emas').DataTable({ selepastawarruqtable.row.add([ ``, - namacawangan, - `${ps.norujukan}`, - ps.tempoh, + `${ps.norujukan}`, formatter.format(ps.keuntungan), + namacawangan, + ps.tempoh, t_matang, // statementlelong ]).draw(); @@ -486,7 +486,7 @@ var hargaemastable = $('#harga_emas').DataTable({ $('#totalsag').text(0); var empat = selepastawarruqtable.columns(3).header(); - $(empat).html('JBG'); + // $(empat).html('JBG'); selepastawarruqtable.column( 4 ).visible( true ); selepastawarruqtable.column( 5 ).visible( true ); // selepastawarruqtable.column( 6 ).visible( true ); @@ -558,7 +558,7 @@ var hargaemastable = $('#harga_emas').DataTable({ var today = new Date(); var tarikhlelong = new Date(response.t_lelong); tarikhblock = DateDiff(tarikhlelong,today); - if(tarikhblock.toFixed() <= 2) + if(tarikhblock.toFixed() <= 3) { lelongblock = 'disabled'; } @@ -616,10 +616,10 @@ var hargaemastable = $('#harga_emas').DataTable({ selepastawarruqtable.row.add([ ``, - namacawangan, - `${ps.norujukan}`, - ps.tempoh, + `${ps.norujukan}`, formatter.format(ps.keuntungan), + namacawangan, + ps.tempoh, t_matang // statementlelong ]).draw(); @@ -629,18 +629,21 @@ var hargaemastable = $('#harga_emas').DataTable({ } function lelongan(e){ - $('#loadertable').removeClass('d-none'); $('#formtable').addClass('d-none'); $('#totalsag').text(0); var empat = selepastawarruqtable.columns(3).header(); + var tiga = selepastawarruqtable.columns(2).header(); + $(empat).html('T Lelong'); + $(tiga).html('Cawangan'); + // selepastawarruqtable.column( 3 ).visible( true ); - $(empat).html('T. Lelong'); + //selepastawarruqtable.column( 2 ).visible( false ); selepastawarruqtable.column( 4 ).visible( false ); - selepastawarruqtable.column( 5 ).visible( false ); - // selepastawarruqtable.column( 6 ).visible( false ); + selepastawarruqtable.column( 5 ).visible( false ); + //console.log('hi'); let datalelong = []; $.ajax({ @@ -694,8 +697,9 @@ var hargaemastable = $('#harga_emas').DataTable({ var today = new Date(); var tarikhlelong = new Date(lelong.t_lelong); + tarikhblock = DateDiff(tarikhlelong,today); - if(tarikhblock.toFixed() <= 2) + if(tarikhblock.toFixed() <= 3) { lelongblock = 'disabled'; } @@ -736,9 +740,8 @@ var hargaemastable = $('#harga_emas').DataTable({ selepastawarruqtable.row.add([ ``, + `${lelong.norujukan}`, namacawangan, - // lelong.norujukan, - `${lelong.norujukan}`, tarikhlelong = new Date(lelong.t_lelong).toLocaleDateString("en-GB"), '', '', @@ -750,7 +753,6 @@ var hargaemastable = $('#harga_emas').DataTable({ } - function bayaranfunc(e,api){ let norujukan = $(e).data('norujukan'); @@ -812,7 +814,13 @@ var hargaemastable = $('#harga_emas').DataTable({ } }, false); - } + } + + $(".buttontekan").click(function() { + $('html,body').animate({ + scrollTop: $("#formtable").offset().top}, + 'slow'); + });

Pertama Kali @@ -57,4 +57,4 @@ -@endsection \ No newline at end of file +@endsection From f65d40c3bfbac62bdd83ac64e4942503742cbebd Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Sun, 19 Feb 2023 12:04:27 +0800 Subject: [PATCH 6/7] update pembayaransag.blade --- resources/views/includes/bayaran/pembayaransag.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php index 047ad93..b645b1e 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -98,6 +98,7 @@ + From cb01a4b18bc2e4d359cf0ba77d6b7ef480b12714 Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Sun, 19 Feb 2023 12:17:22 +0800 Subject: [PATCH 7/7] update pembayaransag.blade --- .../includes/bayaran/pembayaransag.blade.php | 102 +++++++++--------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php index b645b1e..17dd451 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -28,7 +28,7 @@

-
+
@@ -39,56 +39,44 @@
- - - -
- -
- -
- - - - - - - - - - +
+
+
NoNo RujukanPembiayaan AsalBaki PembiayaanTempohKeuntunganBayaran
+ +
+ Klik 'Klik Di Sini' untuk Pilihan Bayaran
+ Amaun Semasa -> Amaun Keuntungan Semasa Sahaja.
+ Amaun Lain -> Amaun Ansuran Pembiayaan & Amaun Keuntungan Semasa, Sila Masukkan Amaun +
+ + + + + + + + + - - @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp + + @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp @foreach($arraybayar as $index=>$bayar) @if($bayar['hargajualan'] != '') - - - + + - - - - + + + + + + + - - @php $counter++; @endphp + + @php $counter++; @endphp @endif @endforeach -
No
Rujukan		BayaranKeuntunganBaki
Pembiayaan		Pembiayaan AsalTempoh
+
{{ $bayar['norujukan'] }} - {{ number_format($bayar['pinjaman'],2) }} - - {{ number_format($bayar['bakipjm'],2) }} - - {{ $bayar['tempoh'] }} - - @php + @php $upahtawarruq = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); @endphp - {{ $upahtawarruq }} - @@ -98,22 +86,36 @@ - + + {{ $upahtawarruq }} + {{ number_format($bayar['bakipjm'],2) }} + + {{ number_format($bayar['pinjaman'],2) }} + + {{ $bayar['tempoh'] }} +
-
- - + +
- +
+ +
@@ -131,7 +133,7 @@ - + @@ -143,9 +145,9 @@ @if($bayar['hargajualan'] != '') -
No No Rujukan Bayaran
+ {{ $bayar['norujukan'] }}