From 46265bce6700ab37b4a10032b471aba21f2ce063 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 16 Jun 2022 16:23:16 +0800
Subject: [PATCH] kodnegeri, daerah, thousand separator

---
 app/Http/Controllers/NotisController.php         | 5 +++++
 resources/views/excel/listnotis_excel.blade.php  | 6 +++---
 resources/views/jananotis/senarainotis.blade.php | 8 ++++----
 resources/views/pdf/jananotis.blade.php          | 2 +-
 resources/views/pdf/listnotis.blade.php          | 6 +++---
 5 files changed, 16 insertions(+), 11 deletions(-)

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 @@
                             <td align="left">6{{ $pay['telefon']}}</td>
                             <td align="left">{{ $pay['tempoh']}}</td>
                             <td align="left">{{ $pay['nokp']}}</td>
-                            <td align="left">{{ $pay['pinjaman']}}</td>
-                            <td align="left">{{ $pay['bakiupah']}}</td>
-                            <td align="left">{{ $bayaran}}</td>
+                            <td align="left">{{ number_format($pay['pinjaman'], 2, '.', ',')}}</td>
+                            <td align="left">{{ number_format($pay['bakiupah'], 2, '.', ',')}}</td>
+                            <td align="left">{{ number_format($bayaran, 2, '.', ',')}}</td>
 
                 @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 @@
             <tbody>
                 @foreach($senarai as $notis)
                         <tr>
-                            <td> {{ $loop->iteration }} </td>
+                            <td>{{ $loop->iteration }} </td>
                             <td>{{ $notis['norujukan']}}</td>
                             <td>{{ $notis['tempoh']}}</td>
                             <td>{{ $notis['nokp']}}</td>
-                            <td>{{ $notis['pinjaman']}}</td>
-                            <td>{{ $notis['bakiupah']}}</td>  
-                            <td>{{ $bayaran}}</td>  
+                            <td>{{ number_format($notis['pinjaman'], 2, '.', ',')}}</td>
+                            <td>{{ number_format($notis['bakiupah'], 2, '.', ',')}}</td>  
+                            <td>{{ number_format($bayaran, 2, '.', ',')}}</td>  
 
                 @endforeach
         </tbody>
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 @@
                   <tr>
                     <td style="vertical-align:top;">KEPADA</td>
                     <td style="vertical-align:top;">:</td>
-                    <td style="vertical-align:top;">{{ $notis['nama'] }}<br> {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['alamat2']) !!} <br> {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}}</td>
+                    <td style="vertical-align:top;">{{ $notis['nama'] }}<br> {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['alamat2']) !!} <br> {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['namadaerah']) . ' ' . strtoupper($notis['negeri'])}}</td>
                     <td></td>
                     <td> </td>
                     <td> </td>
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) {
                                 <td align="left">{{ $pay['norujukan']}}</td>
                                 <td align="left">{{ $pay['tempoh']}}</td>
                                 <td align="left">{{ $pay['nokp']}}</td>
-                                <td align="left">{{ $pay['pinjaman']}}</td>
-                                <td align="left">{{ $pay['bakiupah']}}</td>
-                                <td align="left">{{ $bayaran}}</td>    
+                                <td align="left">{{ number_format($pay['pinjaman'], 2, '.', ',')}}</td>
+                                <td align="left">{{ number_format($pay['bakiupah'], 2, '.', ',')}}</td>
+                                <td align="left">{{ number_format($bayaran, 2, '.', ',')}}</td> 
                             </tr>
                              @endforeach
                         </table>