diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 63379bb..fb2e29d 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -32,7 +32,7 @@ class ProfileController extends Controller auth()->user()->update($request->all()); - return back()->withStatus(__('Profile successfully updated.')); + return back()->withStatus(__('Berjaya dikemaskini.')); } /** diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3bd3c81..5d0a99e 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -44,6 +44,8 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/api.php')); Route::middleware('web') + // ->middleware('cache.headers:private;must_revalidate;max_age=0;no_store;no_cache') // added this line + // ->middleware('cache.headers') ->namespace($this->namespace) ->group(base_path('routes/web.php')); }); diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 4dc2f94..0342064 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -10,8 +10,6 @@
- {{--

Portal rasmi ar-rahn pajak gadai.

--}} -
@csrf
@@ -72,7 +70,7 @@
-
+
@include('auth.slides.slidespage') diff --git a/resources/views/auth/slides/slidespage.blade.php b/resources/views/auth/slides/slidespage.blade.php index ea96e23..130f7df 100644 --- a/resources/views/auth/slides/slidespage.blade.php +++ b/resources/views/auth/slides/slidespage.blade.php @@ -12,21 +12,9 @@
- {{--
-
2 / 3
- -
Caption Two
-
- - - -
-
--}} -
2 / 2
- {{--
Caption Three
--}}
diff --git a/resources/views/pembayaran/checkout.blade.php b/resources/views/pembayaran/checkout.blade.php index d185bd0..3c45651 100644 --- a/resources/views/pembayaran/checkout.blade.php +++ b/resources/views/pembayaran/checkout.blade.php @@ -47,70 +47,128 @@
+ +
+ +
-
- - - - - - - - - - - - +
+
+
+
NoNo RujukanPembiayaanB. PembiayaanKeuntunganJumlah Telah DibayarBayaran
+ + + + + + + + + + + + + @php $counter = 1; @endphp + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] == '') + @php + $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); + @endphp + + + + + + + + + + @php $counter++; @endphp + @endif + @endforeach + +
No.No RujukanPembiayaanTempoh SimpanUpah telah bayarUpah semasaBayaran
+ {{ $counter }} + + {{ $bayar['norujukan'] }} + + {{ number_format($bayar['pinjaman'],2) }} + + {{ number_format($bayar['tempoh'],2) }} + + {{ number_format($bayar['telahbayar'],2) }} + + {{ number_format($koskeuntungan,2) }} + + + + + +
+
+ - @foreach($arraybayar as $index=>$bayar) - +
+ +
+ + - - - - - - - + + + + + + - - @endforeach -
- {{ $loop->iteration }} - - {{ $bayar['norujukan'] }} - - {{ $bayar['pinjaman'] }} - - {{ $bayar['bakipjm'] }} - - @php - $upahtawarruq = Http::get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); - @endphp - {{ $upahtawarruq }} - - @php - $ansuranbayar = Http::get(config('api.url') . '/api/transaction/' . $bayar['norujukan'])->json(); - $totalansuran = 0; - - if($ansuranbayar == '') - { - $totalansuran = 0; - }else{ - foreach($ansuranbayar as $index1=>$ans) - { - $totalansuran += $ans['duit_masuk']; - } - } - @endphp - - {{ $totalansuran }} - - - - - - NoNo RujukanPembiayaanB. PembiayaanKeuntunganBayaran
+ + @php $counter = 1; @endphp + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] != '') + + + + {{ $counter }} + + + {{ $bayar['norujukan'] }} + + + {{ number_format($bayar['pinjaman'],2) }} + + + {{ number_format($bayar['bakipjm'],2) }} + + + @php + $upahtawarruq = Http::get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); + @endphp + {{ $upahtawarruq }} + + + + + + + + + + @php $counter++; @endphp + @endif + @endforeach + +
+ + +
+ @@ -134,7 +192,18 @@
- + +
+ +
+ RM 0.00 +
+
+
+ +
+
+
@@ -146,7 +215,7 @@
- +
@@ -197,6 +266,18 @@ } }); + var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ + "bLengthChange": false, + "bFilter": false, + "bInfo": false, + language: { + 'paginate': { + 'previous': '', + 'next': '' + } + } + }); + function validateform() { return false; diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index 8874f82..b3ff404 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -57,74 +57,144 @@

Pembayaran SAG

+ +
+ +
+ @csrf - -
- - - - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - @if($bt['hargajualan'] != '') - - - - - - - - - - - - @endif - @endforeach - -
No RujukanPembiayaanKeuntunganNilai MarhunBeratMarhunJBGKadar UpahTindakan
-
-
- @php - $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); - @endphp - {{ $bt['norujukan'] }} +
+
+
+
+
+ + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] == '') + @php + $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); + @endphp + + + + + + + + + @endif + @endforeach + +
No RujukanPembiayaanTempoh SimpanUpah telah bayarUpah semasaTindakan
+
+
+ @php + $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); + @endphp + {{ $bt['norujukan'] }} +
+
+ 		+ {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['tempoh'],2) }} + + {{ number_format($bt['telahbayar'],2) }} + + {{ number_format($koskeuntungan,2) }} + + +
-
- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['bakiupah'],2) }} - - {{ number_format($bt['nilaimarhun'],2) }} - - {{ number_format($bt['berat'],2) }} - - {{ $bt['marhun'] }} - - {{ number_format($bt['jbg'],2) }} - - {{ number_format($bt['kadarupah'],2) }} - - -
+
+ + +
+ + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] != '') + @php + $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 + + + + + + + + + @endif + @endforeach + +
No RujukanPembiayaanB. PembiayaanKeuntungan (6bulan)KeuntunganTindakan
+
+
+ @php + $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); + @endphp + {{ $bt['norujukan'] }} +
+
+ 		+ {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['bakipjm'],2) }} + + {{ number_format($bt['bakiupah'],2) }} + + {{ number_format($koskeuntungan,2) }} + + +
+
+
+
+
+
-
- -
+ +
- + + +
@@ -145,6 +215,18 @@ } }); + var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ + "bLengthChange": false, + "bFilter": true, + "bInfo": false, + language: { + 'paginate': { + 'previous': '', + 'next': '' + } + } + }); + $("input[type='checkbox'][name='chkboxsag[]']").click(function () { var count = parseInt($('#totalsag').text()); if ($(this).is(':checked')) { diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index 8017317..8248fda 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -9,7 +9,7 @@
-
+ {{--
@@ -64,7 +64,7 @@
-
+
--}}
diff --git a/routes/web.php b/routes/web.php index 2421a6b..26b3df9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -58,6 +58,8 @@ Route::group(['middleware' => 'auth','verified'], function () { Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action'); Route::post('/paymentengine', 'App\Http\Controllers\BayaranController@PembayaranEngine')->name('payment.engine'); Route::get('/resit', 'App\Http\Controllers\BayaranController@ResitBayaran')->name('action.resit'); + Route::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']); + Route::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']); });