From 9e4fcd02757cd966d0e7d791ac35151d964436ac Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 28 Nov 2022 21:30:02 +0800 Subject: [PATCH] update back button --- .../Controllers/TangguhLelongController.php | 20 +++++----- app/Mail/ResetPassword.php | 4 +- .../views/lelong/listsagpindah.blade.php | 40 ++++++++++--------- .../views/pembida/senaraipembida.blade.php | 13 ++++-- .../senaraipembidakeseluruhan.blade.php | 15 +++++-- .../simulasi/tempbycawsimulasi.blade.php | 2 +- .../tangguhlelong/senleltlhtangguh.blade.php | 13 ++++-- .../tangguhlelong/sentangguhoperasi.blade.php | 33 +++++++++------ 8 files changed, 86 insertions(+), 54 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index eeee2f25..65c38c9d 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -965,17 +965,19 @@ class TangguhLelongController extends Controller ->where('kodcaw','=',$caw_code) ->get(); - // dd($pengesahan); + // dd($tangguh); + if($tangguh){ + foreach($tangguh as $index1=>$sah) + { + $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->where('lelong.id', $sah->lelong_id) + ->get(); + // dd($lelongbid); - foreach($tangguh as $index1=>$sah) - { - $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->where('lelong.id', $sah->lelong_id) - ->get(); - // dd($lelongbid); - - $tangguh[$index1]['bid_details'] = $lelongbid; + $tangguh[$index1]['bid_details'] = $lelongbid; + $tangguh[$index1]['status'] = $sah['status']; + } } // $filter_null = function($x){ diff --git a/app/Mail/ResetPassword.php b/app/Mail/ResetPassword.php index 668d5b9d..4932239a 100644 --- a/app/Mail/ResetPassword.php +++ b/app/Mail/ResetPassword.php @@ -36,8 +36,8 @@ class ResetPassword extends Mailable $user['name'] = $this->name; $user['token'] = $this->token; - return $this->from("masterlelongpkb@gmail.com", "Admin Lelong") - ->subject('Sistem Lelong Online PKB-Tukar Katalaluan') + return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid") + ->subject('ArrahnBid -Tukar Katalaluan') ->view('template.reset-password', ['user' => $user]); } } diff --git a/resources/views/lelong/listsagpindah.blade.php b/resources/views/lelong/listsagpindah.blade.php index 774b8024..f1f50317 100644 --- a/resources/views/lelong/listsagpindah.blade.php +++ b/resources/views/lelong/listsagpindah.blade.php @@ -4,25 +4,27 @@
-
- - Senarai Lelong(Pindah Batch Lelong) - @foreach ($arrayinfo as $laporan) +
+
+
+ + + + @foreach ($arrayinfo as $laporan) +
+ Senarai SAG(Pindah Batch Lelong) : @foreach($laporan['details'] as $details) + {{ $details['caw_name']}} + @endforeach +
+
+
- Batch Lelong : {{ $laporan['laporan']['lelong_id']}} + Batch Lelong : {{ $laporan['laporan']['lelong_id']}}
Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $datez = $myDateTime->format('d-m-Y'); echo($datez); - @endphp - @foreach($laporan['details'] as $details) - Nama Cawangan : {{ $details['caw_name']}} - Kod Cawangan : {{ $details['caw_code']}} - @endforeach - @endforeach @if ($message = Session::get('success')) @@ -34,15 +36,15 @@ @csrf -
Pindah Ke-
+
+ - +
@@ -51,10 +53,10 @@ - + @@ -67,7 +69,7 @@ - + diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php index 3d829a63..a46bd3e6 100644 --- a/resources/views/pembida/senaraipembida.blade.php +++ b/resources/views/pembida/senaraipembida.blade.php @@ -3,8 +3,15 @@ @section('content')
-
- +
+
+
+ +
+ Senarai Pembida +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -16,7 +23,7 @@
@csrf -
PilihTempoh Berat (gm) Nilai Marhun (RM)Harga Asas (RM) Pembiayaan (RM) Keuntungan (RM) Caj Lelong (%)Harga Asas (RM) Rugi Lelong (RM) Baki Lelong (RM) {{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['norujukan']}} {{ $marhun['jbg']}} {{ $marhun['berat'] }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}
+
diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php index dfae7378..bd63563c 100644 --- a/resources/views/pembida/senaraipembidakeseluruhan.blade.php +++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php @@ -3,8 +3,15 @@ @section('content')
-
- +
+
+
+ +
+ Senarai pembida +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -16,7 +23,7 @@ @csrf -
+
@@ -49,7 +56,7 @@ @endif @endforeach diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php index 59bf443f..551818dc 100644 --- a/resources/views/simulasi/tempbycawsimulasi.blade.php +++ b/resources/views/simulasi/tempbycawsimulasi.blade.php @@ -51,8 +51,8 @@ - + diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php index 2b13adc7..56dcd5bc 100644 --- a/resources/views/tangguhlelong/senleltlhtangguh.blade.php +++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php @@ -3,8 +3,15 @@ @section('content')
-
-

Senarai Telah Tangguh Lelong

+
+
+
+ +
+ Senarai Telah Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +19,7 @@ @endif -
- +
{{ $surat['list_norujukan'][0]['norujukan'] }} {{ $surat['list_norujukan'][0]['nokp'] }} {{ $surat['list_norujukan'][0]['tempoh'] }}{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }} {{ number_format($surat['list_norujukan'][0]['berat'] , 2, '.', ',') }}{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }} {{ number_format($surat['list_norujukan'][0]['pinjaman'] , 2, '.', ',') }} {{ number_format($surat['list_norujukan'][0]['bakipjm'] , 2, '.', ',') }} {{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}
+
diff --git a/resources/views/tangguhlelong/sentangguhoperasi.blade.php b/resources/views/tangguhlelong/sentangguhoperasi.blade.php index 6816144a..cbc209d6 100644 --- a/resources/views/tangguhlelong/sentangguhoperasi.blade.php +++ b/resources/views/tangguhlelong/sentangguhoperasi.blade.php @@ -3,10 +3,17 @@ @section('content')
-
- +
+
+
+ + + +
+ Pengesahan Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -14,7 +21,7 @@ @endif -
No
+
@@ -31,7 +38,7 @@ - @foreach ($tangguh as $index1=>$sah) + @forelse ($tangguh as $index1=>$sah) @@ -71,16 +78,16 @@ - @endforeach + @empty + + + + + @endforelse
No
No Data
-
- - -
+