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 @@
| Pilih | @@ -51,10 +53,10 @@Tempoh | Berat (gm) | Nilai Marhun (RM) | -Harga Asas (RM) | Pembiayaan (RM) | Keuntungan (RM) | Caj Lelong (%) | +Harga Asas (RM) | Rugi Lelong (RM) | Baki Lelong (RM) | @@ -67,7 +69,7 @@{{$loop->iteration}} | -{{ $marhun['norujukan']}} | +{{ $marhun['norujukan']}} | {{ $marhun['jbg']}} | {{ $marhun['berat'] }} | {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} | 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')
|---|