diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 18a0d08..25d0039 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -4,8 +4,14 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Foundation\Auth\AuthenticatesUsers; + +use App\Models\loguser; +use Carbon\Carbon; + class LoginController extends Controller { /* @@ -21,6 +27,56 @@ class LoginController extends Controller use AuthenticatesUsers; + public function showLoginForm() + { + return view('auth.login'); + } + + protected function authenticated(Request $request, $user) + { + $current = Carbon::now(); + $current = new Carbon(); + + $log = new loguser; + $log->emel = $request->email; + $log->user = Auth::user()->id; + $log->action = 'Login Berjaya'; + $log->date = $current; + + $log->save(); + + $getlogdata = loguser::where('emel','=', $request->email)->orderBy('recno', 'desc')->skip(1)->first(); + + session(['logindate' => $getlogdata['date']]); + + } + + public function logout(Request $request) + { + + $first_time_login = false; + if (Auth::user()->first_time_login === 0) { + $first_time_login = true; + Auth::user()->first_time_login = 1; + Auth::user()->save(); + } + + $this->guard()->logout(); + + $request->session()->invalidate(); + + $request->session()->regenerateToken(); + + if ($response = $this->loggedOut($request)) { + return $response; + } + + return $request->wantsJson() + ? new JsonResponse([], 204) + : redirect('/'); + + } + /** * Where to redirect users after login. * diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index dbc1aad..f52fd1e 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -88,10 +88,19 @@ class RegisterController extends Controller return view('auth.pertama-kali.pertamakalistep1'); } - protected function tempatregister(Request $request) - { - $nama = $request->name; + // protected function tempatregister(Request $request) + // { + // $nama = $request->name; - return view('auth.register',compact('nama')); + // return view('auth.register',compact('nama')); + // } + + public function showRegistrationForm(Request $request) + { + + $nama = $request->name; + $icno = $request->icno; + + return view('auth.register',compact('nama','icno')); } } diff --git a/app/Http/Controllers/BayaranController.php b/app/Http/Controllers/BayaranController.php index d327895..6669d22 100644 --- a/app/Http/Controllers/BayaranController.php +++ b/app/Http/Controllers/BayaranController.php @@ -6,6 +6,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; +use Carbon\Carbon; + class BayaranController extends Controller { public function SenaraiPembayaran() @@ -28,20 +30,62 @@ class BayaranController extends Controller public function PembayaranAction(Request $request) { + $validated = $request->validate([ 'chkboxsag' => 'required', ]); - $arraybayar = []; + $arraybayar = array(); foreach($request->chkboxsag as $index=>$sag) { $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $sag)->json(); - $arraybayar = [$gadai[0][0]]; + $arraybayar[] = $gadai[0][0]; } + return view('pembayaran.checkout',compact('arraybayar')); } + + public function PembayaranEngine(Request $request) + { + $arraybayaran = array(); + + foreach($request->txtnorujukanhidden as $index1=>$norujukan) + { + // $updategadai = Http::put(config('api.url').'/api/gadai/'. $request->txtkodcawhidden[$index1] .'/norujukan/' . $norujukan,[ + // 'bayaran' => $request->txtbayaranhidden[$index1] + // ])->json(); + + + array_push($arraybayaran,['norujukan' => $norujukan, 'kodcaw' => $request->txtkodcawhidden[$index1], 'bayaran' => $request->txtbayaranhidden[$index1]]); + } + + return view('pembayaran.result.berjaya',compact('arraybayaran')); + } + + public function ResitBayaran(Request $request) + { + $payment_details = $request->payment; + + $kpbaru = Auth::User()->icno; + + $customer = Http::get(config('api.url') .'/api/customers/'.$kpbaru)->json(); + $customer_details = $customer; + + $current = Carbon::now(); + $current = new Carbon(); + $date = $current->toDateTimeString(); + + $gadai_details = Http::get(config('api.url') .'/api/gadai/norujukan/'.$payment_details['norujukan'])->json(); + + $baki_harga_jualan_sebelum = $gadai_details[0][0]['bakihargajualan'] + $payment_details['bayaran']; + $baki_harga_jualan_semasa = $gadai_details[0][0]['bakihargajualan']; + + return view('pembayaran.resit.resit_baru',compact('customer_details','payment_details','date','baki_harga_jualan_sebelum','baki_harga_jualan_semasa')); + + dd($request->norujukan); + } } diff --git a/public/argon/img/brand/PKB AR RAHNU PANJANG.png b/public/argon/img/brand/PKB AR RAHNU PANJANG.png new file mode 100644 index 0000000..feba2e9 Binary files /dev/null and b/public/argon/img/brand/PKB AR RAHNU PANJANG.png differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 5ef941f..2efc742 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -72,44 +72,9 @@
- -
+ + @include('auth.slides.slidespage') - -
-
1 / 3
- -
Caption Text
-
- - - -
-
- -
-
2 / 3
- -
Caption Two
-
- - - -
-
- -
-
3 / 3
- -
Caption Three
-
- - - -
-
- -
diff --git a/resources/views/auth/pertama-kali/pertamakalistep1.blade.php b/resources/views/auth/pertama-kali/pertamakalistep1.blade.php index f07512b..ed6c11f 100644 --- a/resources/views/auth/pertama-kali/pertamakalistep1.blade.php +++ b/resources/views/auth/pertama-kali/pertamakalistep1.blade.php @@ -66,46 +66,8 @@
- {{-- --}} - -
- - -
-
1 / 3
- -
Caption Text
-
- - - -
-
- -
-
2 / 3
- -
Caption Two
-
- - - -
-
- -
-
3 / 3
- -
Caption Three
-
- - - -
-
- -
- + + @include('auth.slides.slidespage') + + diff --git a/resources/views/layouts/navbars/navs/auth.blade.php b/resources/views/layouts/navbars/navs/auth.blade.php index 81c493d..e971d6e 100644 --- a/resources/views/layouts/navbars/navs/auth.blade.php +++ b/resources/views/layouts/navbars/navs/auth.blade.php @@ -13,7 +13,7 @@ @endphp
- Log masuk terakhir pada {{ $logDate }} + {{ (Auth::user()->first_time_login === 0) ? 'Selamat datang untuk pertama kali!' : 'Log masuk terakhir pada ' . $logDate }}
diff --git a/resources/views/pembayaran/checkout.blade.php b/resources/views/pembayaran/checkout.blade.php index 234b645..d185bd0 100644 --- a/resources/views/pembayaran/checkout.blade.php +++ b/resources/views/pembayaran/checkout.blade.php @@ -30,7 +30,8 @@
-
+ {{-- onsubmit="return validateform()" --}} + @csrf
@@ -54,7 +55,9 @@ No No Rujukan Pembiayaan - Upah + B. Pembiayaan + Keuntungan + Jumlah Telah Dibayar Bayaran @@ -72,10 +75,37 @@ {{ $bayar['pinjaman'] }} - {{ $bayar['bakiupah'] }} + {{ $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 }} + + + + + + @@ -141,7 +171,7 @@
- +
@@ -174,15 +204,51 @@ let total = 0; - $("input[name=txtbayaran]").change(function(){ + $("input[name=txtbayaran]").change(function(e){ + + let upah = $(this).data('upah'); + let bakipinjam = $(this).data('bakipjm'); + + // let hiddenbayaran = $('.bayaran').val('sadas'); + let bayar = Number(this.value); - total = total + bayar; + if(bayar > bakipinjam){ + $("#bayarsbmt").prop('disabled', false); + Swal.fire( + 'Amaran!', + 'Bayaran tidak boleh melebihi 10% nilai marhun!', + 'error' + ) + $(this).val(upah); + $(this).closest('tr').find('.bayaran').val(upah); + calculateall(); + return false; + } - $('#spanbayaran').text(formatter.format(total)); - $('#spanjumlah').text(formatter.format(total)); + $(this).closest('tr').find('.bayaran').val(this.value); + calculateall(); + + // total = total + bayar; + + // $('#spanbayaran').text(formatter.format(total)); + // $('#spanjumlah').text(formatter.format(total)); }); + + function calculateall() + { + var $row = $(this).closest('tr'); + var sum = 0; + + $('#belum_tawarruq').find('input[name=txtbayaran]').each(function() { + sum += parseFloat(this.value) || 0; + }); + + $("#spanbayaran").text(sum.toFixed(2)); + $('#spanjumlah').text(formatter.format(sum)); + } + @endsection diff --git a/resources/views/pembayaran/resit/resit_baru.blade.php b/resources/views/pembayaran/resit/resit_baru.blade.php new file mode 100644 index 0000000..41bd715 --- /dev/null +++ b/resources/views/pembayaran/resit/resit_baru.blade.php @@ -0,0 +1,95 @@ + + + + + + +Permodalan Kelantan Berhad | Pembayaran Ansuran + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+
+
+
+
+

Permodalan Kelantan Berhad

+
+
+
+
+
+
+

+
+
+

Resit Bayaran

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Nama Pelanggan: {{ $customer_details['nama'] }}
No Rujukan: {{ $payment_details['norujukan'] }}
Masa Transaksi: {{ date('d/m/Y - h:i:s',strtotime($date)) }}
Harga Jualan: RM {{ number_format($baki_harga_jualan_sebelum,2) }}
Bayaran: RM {{ number_format($payment_details['bayaran'],2) }}
Baki Harga Jualan: RM {{ number_format($baki_harga_jualan_semasa,2) }}
Status Payment: Berjaya
+
+
+
+
+
+
+
+ bizappay +
+

FPX provider by ANSI Systems Sdn Bhd

+
+
+
\ No newline at end of file diff --git a/resources/views/pembayaran/result/berjaya.blade.php b/resources/views/pembayaran/result/berjaya.blade.php new file mode 100644 index 0000000..525f760 --- /dev/null +++ b/resources/views/pembayaran/result/berjaya.blade.php @@ -0,0 +1,95 @@ +@extends('layouts.app') + +@section('content') + @include('layouts.headers.cards') + + + +
+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+
+ @error('sltcawangan') + + @enderror + +
+ +

Senarai Berjaya

+ +
+ + + + + + + + + + + @foreach($arraybayaran as $index=>$arb) + + + + + + + @endforeach + + +
No RujukanKodcawBayaranMuat Turun
{{ $arb['norujukan'] }}{{ $arb['kodcaw'] }}{{ $arb['bayaran'] }}Muat Turun
+
+ + Laman Utama +
+
+
+
+
+ +
+ +@endsection + +@push('js') + + +@endpush \ No newline at end of file diff --git a/resources/views/pembayaran/result/gagal.blade.php b/resources/views/pembayaran/result/gagal.blade.php new file mode 100644 index 0000000..bfddae9 --- /dev/null +++ b/resources/views/pembayaran/result/gagal.blade.php @@ -0,0 +1,85 @@ +@extends('layouts.app') + +@section('content') + @include('layouts.headers.cards') + + + +
+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+
+ @error('sltcawangan') + + @enderror + +
+ + @csrf +
+ + +
+ + + +
+
+
+
+
+ +
+ +@endsection + +@push('js') + + +@endpush \ No newline at end of file diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index d35f895..a1d7b57 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -65,7 +65,7 @@ No Rujukan Pembiayaan - Upah + Keuntungan Nilai Marhun Berat Marhun @@ -89,22 +89,22 @@ {{ 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) }} + {{ $bt['marhun'] }} - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['jbg'],2) }} - {{ number_format($bt['pinjaman'],2) }} + {{ number_format($bt['kadarupah'],2) }} diff --git a/routes/web.php b/routes/web.php index 0450d26..2421a6b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -56,6 +56,9 @@ Route::group(['middleware' => 'auth','verified'], function () { 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::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'); + });