diff --git a/resources/views/pembayaran/checkout.blade.php b/resources/views/pembayaran/checkout.blade.php index 60660a6..234b645 100644 --- a/resources/views/pembayaran/checkout.blade.php +++ b/resources/views/pembayaran/checkout.blade.php @@ -39,7 +39,7 @@
-

Senarai Surat

+

Senarai Surat Gadaian

@@ -91,7 +91,7 @@
-

Ringkasan Pesanan

+

Ringkasan Pembayaran

diff --git a/resources/views/pembayaran/paymentlist.blade.php b/resources/views/pembayaran/paymentlist.blade.php index 50f5e8a..586907c 100644 --- a/resources/views/pembayaran/paymentlist.blade.php +++ b/resources/views/pembayaran/paymentlist.blade.php @@ -35,7 +35,7 @@
-

Belum Tawarruq

+

Ar-Rahn

@@ -99,7 +99,7 @@
- +
diff --git a/resources/views/penyata/penyata.blade.php b/resources/views/penyata/penyata.blade.php index 73116ac..8ce6b9e 100644 --- a/resources/views/penyata/penyata.blade.php +++ b/resources/views/penyata/penyata.blade.php @@ -208,7 +208,7 @@ echo($formattedweddingdate) @endphp - Pelanggan Gadai + Pembiayaan {{ $gad['norujukan'] }} {{ number_format($gad['pinjaman'],2) }} @@ -226,13 +226,13 @@ @php switch($trans['trans_type']){ - case 'T': echo 'Pelanggan Tebus'; + case 'T': echo 'Pembayaran Tebus'; break; - case 'A': echo 'Bayaran Ansuran'; + case 'A': echo 'Pembayaran Ansuran'; break; - case 'S': echo 'Pelanggan Tebus Sebahagian'; + case 'S': echo 'Pembayaran Tebus Sebahagian'; break; - case 'P': echo 'Pelanggan Tambah Pinjaman'; + case 'P': echo 'Pembayaran Tambah Pinjaman'; break; } diff --git a/resources/views/penyata/summary.blade.php b/resources/views/penyata/summary.blade.php index 6a710bd..be957da 100644 --- a/resources/views/penyata/summary.blade.php +++ b/resources/views/penyata/summary.blade.php @@ -212,56 +212,56 @@ - - + + @foreach($gadai as $index1=>$gad) - - - + + @endforeach @foreach($transaction as $index=>$trans) - - - - + + @endforeach - - - - - + + + {{-- --}} + +
TRANSAKSI PELANGGAN(RM)KEUNTUNGAN (RM)JUMLAH (RM)
PERMULAAN PEMBIAYAAN PADA @php + 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['hargajualan'],2) }}-{{ number_format($gad['pinjaman'],2) }}
+ @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $gad['t_gadai']); - $formattgadai = $myDateTime->format('d/m/Y'); + + $timestamp = strtotime($trans['created_at']); + $timebayar = gmdate("d/m/Y",$timestamp); switch($trans['trans_type']){ - case 'T': echo 'PELANGGAN TEBUS PENUH PADA ' . $formattgadai; + case 'T': echo 'PEMBAYARAN TEBUS PENUH PADA ' . $timebayar; break; - case 'A': echo 'PELANGGAN BAYAR ANSURAN PADA ' . $formattgadai; + case 'A': echo 'PEMBAYARAN ANSURAN PADA ' . $timebayar; break; - case 'S': echo 'PELANGGAN TEBUS SEBAHAGIAN PADA ' . $formattgadai;; + case 'S': echo 'PEMBAYARAN TEBUS SEBAHAGIAN PADA ' . $timebayar;; break; - case 'P': echo 'PELANGGAN TAMBAH PINJAMAN PADA ' . $formattgadai;; + case 'P': echo 'PEMBAYARAN TAMBAH PINJAMAN PADA ' . $timebayar;; break; } @endphp :{{ number_format(($trans['duit_masuk']*-1),2) }}{{ ($trans['bayaran_keuntungan'] == 0) ? '-' : number_format(($trans['bayaran_keuntungan']*1),2) }}{{ number_format(($trans['bayaran_pembiayaan']*-1),2) }}
BAKI KESELURUHAN:{{ number_format($gad['bakihargajualan'],2) }}
BAKI KESELURUHAN:{{ number_format($gad['bakipjm'],2) }}
diff --git a/resources/views/semak/senaraisag.blade.php b/resources/views/semak/senaraisag.blade.php index cab761a..d235c5e 100644 --- a/resources/views/semak/senaraisag.blade.php +++ b/resources/views/semak/senaraisag.blade.php @@ -35,7 +35,7 @@
-

Belum Tawarruq

+

Ar-Rahn

@@ -160,7 +160,7 @@
-

History

+

Penyata Terdahulu

diff --git a/routes/web.php b/routes/web.php index 415b930..0450d26 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,12 +13,18 @@ use Illuminate\Support\Facades\Route; | */ -Route::get('/', function () { - return view('welcome'); -}); +// Route::get('/', function () { +// return view('welcome'); +// }); +Route::get('/', function () { + return view('dashboard'); +})->middleware(['auth','verified']); + +// Route::get('/home', 'HomeController@index'); Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); + Auth::routes(['verify' => true]); Route::get('/home', 'App\Http\Controllers\HomeController@index')->name('home'); @@ -39,7 +45,7 @@ Route::get('/home', 'App\Http\Controllers\HomeController@index')->name('home'); Route::get('/authenticateregister', 'App\Http\Controllers\Auth\RegisterController@firsttimer')->name('auth.registerfirst'); -Route::post('/registering', 'App\Http\Controllers\Auth\RegisterController@tempatregister')->name('auth.tempatregister'); +// Route::get('/registering', 'App\Http\Controllers\Auth\RegisterController@tempatregister')->name('auth.tempatregister'); Route::group(['middleware' => 'auth','verified'], function () {