diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index 429764c0..9d2d7833 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -15,6 +15,8 @@ use App\Models\LelongBid; use App\Models\Payment; use App\Models\Resit; use App\Models\Gadai; +use App\Models\Daerah; +use App\Models\Negeri; use Carbon\Carbon; use PDF; use DateTime; @@ -95,6 +97,8 @@ class NotisController extends Controller $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->join('customer','gadai.nokp','=','customer.kpbaru') + ->join('daerah','customer.koddaerah','=','daerah.koddaerah') + ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); @@ -104,6 +108,7 @@ class NotisController extends Controller ->where('cawangan_lelong.lelong_id', $lelong_id) ->get(); + $lelong = Lelong::where('id', $lelongid)->get(); diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php index edf444bb..fa65c144 100644 --- a/resources/views/excel/listnotis_excel.blade.php +++ b/resources/views/excel/listnotis_excel.blade.php @@ -80,9 +80,9 @@ 6{{ $pay['telefon']}} {{ $pay['tempoh']}} {{ $pay['nokp']}} - {{ $pay['pinjaman']}} - {{ $pay['bakiupah']}} - {{ $bayaran}} + {{ number_format($pay['pinjaman'], 2, '.', ',')}} + {{ number_format($pay['bakiupah'], 2, '.', ',')}} + {{ number_format($bayaran, 2, '.', ',')}} @endforeach diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index ab8454b4..98471e64 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -32,13 +32,13 @@ @foreach($senarai as $notis) - {{ $loop->iteration }} + {{ $loop->iteration }} {{ $notis['norujukan']}} {{ $notis['tempoh']}} {{ $notis['nokp']}} - {{ $notis['pinjaman']}} - {{ $notis['bakiupah']}} - {{ $bayaran}} + {{ number_format($notis['pinjaman'], 2, '.', ',')}} + {{ number_format($notis['bakiupah'], 2, '.', ',')}} + {{ number_format($bayaran, 2, '.', ',')}} @endforeach diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index 353d467d..6741ade5 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -190,7 +190,7 @@ KEPADA : - {{ $notis['nama'] }}
{{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '
' . strtoupper($notis['alamat2']) !!}
{{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}} + {{ $notis['nama'] }}
{{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '
' . strtoupper($notis['alamat2']) !!}
{{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['namadaerah']) . ' ' . strtoupper($notis['negeri'])}} diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php index da27e58e..c7c1f211 100644 --- a/resources/views/pdf/listnotis.blade.php +++ b/resources/views/pdf/listnotis.blade.php @@ -108,9 +108,9 @@ tr:nth-child(even) { {{ $pay['norujukan']}} {{ $pay['tempoh']}} {{ $pay['nokp']}} - {{ $pay['pinjaman']}} - {{ $pay['bakiupah']}} - {{ $bayaran}} + {{ number_format($pay['pinjaman'], 2, '.', ',')}} + {{ number_format($pay['bakiupah'], 2, '.', ',')}} + {{ number_format($bayaran, 2, '.', ',')}} @endforeach