From d724a323ebd097ff7a9d411507cf646103c549d9 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 31 Oct 2021 08:54:00 +0800 Subject: [PATCH] fix portal --- app/Http/Controllers/SemakController.php | 29 +- resources/views/auth/login.blade.php | 21 +- resources/views/pembayaran/checkout.blade.php | 26 +- .../views/pembayaran/senaraibayaran.blade.php | 12 +- resources/views/penyata/summary.blade.php | 41 --- resources/views/penyata/summaryupah.blade.php | 266 ++++++++++++++++++ resources/views/semak/senaraisag.blade.php | 44 +-- routes/web.php | 6 +- 8 files changed, 348 insertions(+), 97 deletions(-) create mode 100644 resources/views/penyata/summaryupah.blade.php diff --git a/app/Http/Controllers/SemakController.php b/app/Http/Controllers/SemakController.php index 7ce3067..74e56b6 100644 --- a/app/Http/Controllers/SemakController.php +++ b/app/Http/Controllers/SemakController.php @@ -41,11 +41,11 @@ class SemakController extends Controller return view('semak.senaraisag', compact('belum_tebus','sudah_tebus')); } - public function PenyataSummary($norujukan) + public function PenyataSummary($kodcaw,$norujukan) { $api_url = config('api.url'); - $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $kodcaw)->json(); $cawangan_detail=$cawangan[0]; $auth_user = Auth::user(); @@ -64,11 +64,32 @@ class SemakController extends Controller return view('penyata.summary',compact('cawangan_detail','transaction','customer','gadai','api_url')); } - public function Penyata($norujukan) + public function PenyataSummaryUpah($kodcaw,$norujukan) { $api_url = config('api.url'); - $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $kodcaw)->json(); + $cawangan_detail=$cawangan[0]; + + $auth_user = Auth::user(); + + $customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json(); + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + + if(sizeof($gadai) != 0) + $gadai = $gadai[0]; + + $upah = Http::get(config('api.url').'/portal/transaksipelanggan/upah',['norujukan' => $norujukan,'kodcaw' => $kodcaw])->json(); + + return view('penyata.summaryupah',compact('cawangan_detail','upah','customer','gadai','api_url')); + } + + public function Penyata($kodcaw,$norujukan) + { + $api_url = config('api.url'); + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $kodcaw)->json(); $cawangan_detail=$cawangan[0]; $auth_user = Auth::user(); diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 7b21f5f..a75bc56 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -7,17 +7,15 @@
+
- {{-- --}} -

Customer Portal

-
+
- + @include('auth.slides.slidespage') - {{-- @include('auth.slides.slidespage') --}} -

Copyright © 2021 Permodalan Kelantan Berhad.

diff --git a/resources/views/pembayaran/checkout.blade.php b/resources/views/pembayaran/checkout.blade.php index 000c4c3..14b7cb3 100644 --- a/resources/views/pembayaran/checkout.blade.php +++ b/resources/views/pembayaran/checkout.blade.php @@ -330,7 +330,7 @@ let bayar = Number(this.value); - let errorlebih = nm - (nm * 0.01); + let errorlebih = nm - (nm * 0.1); if(bayar > parseFloat(errorlebih)){ $("#bayarsbmt").prop('disabled', false); @@ -345,6 +345,17 @@ return false; } + if(bayar <= 0){ + $("#bayarsbmt").prop('disabled', true); + Swal.fire( + 'Amaran!', + 'Bayaran tidak boleh ditinggalkan kosong!', + 'error' + ) + }else{ + $("#bayarsbmt").prop('disabled', false); + } + $(this).closest('tr').find('.bayaran').val(this.value); calculateall(jenis); }); @@ -358,7 +369,7 @@ let bayar = Number(this.value); - let errorlebih = (bakipinjam - (nm * 0.01)); + let errorlebih = (bakipinjam - (nm * 0.1)); if(bayar > parseFloat(errorlebih)){ $("#bayarsbmt").prop('disabled', false); @@ -373,6 +384,17 @@ return false; } + if(bayar <= 0){ + $("#bayarsbmt").prop('disabled', true); + Swal.fire( + 'Amaran!', + 'Bayaran tidak boleh ditinggalkan kosong!', + 'error' + ) + }else{ + $("#bayarsbmt").prop('disabled', false); + } + $(this).closest('tr').find('.bayaran').val(this.value); calculateall(jenis); }); diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index e25b393..c39e36a 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -92,8 +92,9 @@ @if($bt['hargajualan'] == '') @php $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); + $searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json(); @endphp - +
@@ -117,7 +118,7 @@ {{ number_format($koskeuntungan,2) }} - + @endif @@ -144,14 +145,15 @@ @foreach($belum_tebus as $index=>$bt) @if($bt['hargajualan'] != '') - @php + @php + $searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json(); $koskeuntungan = Http::get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); $keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100); $ten_percent = floatval($bt['nilaimarhun']) * 0.1; $baki_pinjaman = floatval($bt['bakipjm']); $max_bayaran = $baki_pinjaman - $ten_percent; @endphp - +
@@ -175,7 +177,7 @@ {{ number_format($koskeuntungan,2) }} - + @endif diff --git a/resources/views/penyata/summary.blade.php b/resources/views/penyata/summary.blade.php index 5ba47ec..d2f6b66 100644 --- a/resources/views/penyata/summary.blade.php +++ b/resources/views/penyata/summary.blade.php @@ -275,47 +275,6 @@

-
- -
- - - - - - - - - - - - - - - - -
NorujukanPembiayaanKeuntunganBayaran
{{ $gad['norujukan'] }}{{ number_format($gad['bakihargajualan'],2) }}{{ number_format($gad['bakiupah'],2) }}
- - - - -
- - - \ No newline at end of file diff --git a/resources/views/penyata/summaryupah.blade.php b/resources/views/penyata/summaryupah.blade.php new file mode 100644 index 0000000..330476f --- /dev/null +++ b/resources/views/penyata/summaryupah.blade.php @@ -0,0 +1,266 @@ + + + + + + + @php + + $mytime = Carbon\Carbon::now()->format('d-m-Y'); + + @endphp + + +
SULIT DAN PERSENDIRIAN
+ + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + @php + $poskod = Http::get($api_url . '/api/poskod/' . $customer['poskod'])->json(); + $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json(); + $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json(); + + @endphp + + + + + + + +
Nombor KP:{{ $customer['kpbaru'] }}
Nama :{{ $customer['nama'] }}
Alamat:{!! strtoupper($customer['alamat1']) . ',
' . $customer['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) !!}
Tarikh Cetak:{{ $mytime }}
+ +
+ +
PENYATA KIRA-KIRA PEMBIAYAAN SURAT AKUAN GADAI
+ + +
+ + + + + + + + @foreach($gadai as $index1=>$gad) + + + + + + + @endforeach + @foreach($upah as $index=>$upahan) + + + + + + + @endforeach + + + + + +
TRANSAKSI PELANGGANUPAH (RM)JUMLAH (RM)
PERMULAAN PEMBIAYAAN PADA @php + + $myDateTime = DateTime::createFromFormat('Y-m-d', $gad['t_gadai']); + $formattedweddingdate = $myDateTime->format('d/m/Y'); + echo($formattedweddingdate) + + @endphp :-{{ number_format($gad['pinjaman'],2) }}
+ @php + + $myDateTime = DateTime::createFromFormat('Y-m-d', $upahan['tarikh']); + $formattedweddingdate = $myDateTime->format('d/m/Y'); + + echo 'PEMBAYARAN UPAH PADA ' . $formattedweddingdate; + @endphp:{{ $upahan['upahDibayar'] }}{{ number_format($gad['pinjaman'],2) }}
PEMBIAYAAN KESELURUHAN:{{ number_format($gad['pinjaman'],2) }}
+ +
+
+ + + + \ No newline at end of file diff --git a/resources/views/semak/senaraisag.blade.php b/resources/views/semak/senaraisag.blade.php index d235c5e..0d1157b 100644 --- a/resources/views/semak/senaraisag.blade.php +++ b/resources/views/semak/senaraisag.blade.php @@ -47,7 +47,6 @@ Upah Nilai Marhun Berat - Marhun JBG Kadar Upah @@ -59,7 +58,7 @@
- {{ $bt['norujukan'] }} + {{ $bt['norujukan'] }}
@@ -67,22 +66,19 @@ {{ number_format($bt['pinjaman'],2) }} - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['bakiupah'],2) }} - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['nilaimarhun'],2) }} - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['berat'],2) }} - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['tempoh'],2) }} - {{ number_format($bt['pinjaman'],2) }} - - - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['kadarupah'],2) }} @endif @@ -110,7 +106,6 @@ N. Marhun Berat(gm) Kos Keuntungan (12bulan) - Marhun JBG @@ -121,7 +116,7 @@
- {{ $bt['norujukan'] }} + {{ $bt['norujukan'] }}
@@ -132,7 +127,7 @@ {{ number_format($bt['bakipjm'],2) }} - {{ number_format($bt['bakipjm'],2) }} + {{ number_format($bt['bakiupah'],2) }} {{ number_format($bt['nilaimarhun'],2) }} @@ -144,10 +139,7 @@ {{ number_format($bt['upah12'],2) }} - {{ number_format($bt['upah12'],2) }} - - - {{ number_format($bt['jbg'],2) }} + {{ number_format($bt['tempoh'],2) }} @endif @@ -171,9 +163,7 @@ Pinjaman N. Marhun Berat(gm) - Marhun JBG - K.Upah Upah J.Tebus T.Tebus @@ -185,19 +175,13 @@
- {{ $st['norujukan'] }} + {{ $st['norujukan'] }}
{{ number_format($st['pinjaman'],2) }} - - {{ number_format($st['bakipjm'],2) }} - - - {{ number_format($st['bakipjm'],2) }} - {{ number_format($st['nilaimarhun'],2) }} @@ -205,16 +189,16 @@ {{ number_format($st['berat'],2) }} - {{ number_format($st['upah12'],2) }} + {{ number_format($st['tempoh'],2) }} - {{ number_format($st['upah12'],2) }} + {{ number_format($st['bakiupah'],2) }} - {{ number_format($st['jbg'],2) }} + {{ $st['sttebus'] }} - {{ number_format($st['jbg'],2) }} + {{ $st['t_update'] }} @endforeach diff --git a/routes/web.php b/routes/web.php index 995642d..bb96791 100644 --- a/routes/web.php +++ b/routes/web.php @@ -53,8 +53,10 @@ Route::group(['middleware' => 'auth','verified'], function () { Route::post('/senaraisag', 'App\Http\Controllers\SemakController@SenaraiSAG')->name('senaraisag'); Route::get('/semakbayaran', 'App\Http\Controllers\BayaranController@SenaraiPembayaran')->name('pembayaransag'); Route::get('/analisa', 'App\Http\Controllers\AnalisaController@index')->name('analisa.index'); - Route::get('/penyata/{norujukan}', 'App\Http\Controllers\SemakController@Penyata')->name('penyata.show'); - Route::get('/penyata/summary/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummary')->name('penyata.summary'); + Route::get('/penyata/{kodcaw}/{norujukan}', 'App\Http\Controllers\SemakController@Penyata')->name('penyata.show'); + Route::get('/penyata/summary/{kodcaw}/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummary')->name('penyata.summary'); + Route::get('/penyata/summaryarrahn/{kodcaw}/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummaryUpah')->name('penyata.summaryupah'); + Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action'); //Pembayaran Engine