From 712d28abbcd2a5ebbc49eb540c00d30711719bd9 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 3 Mar 2022 08:21:35 +0800
Subject: [PATCH 1/2] update notis

---
 app/Http/Controllers/NotisController.php      |  1 +
 .../views/excel/listnotis_excel.blade.php     | 34 +++++++++++--------
 resources/views/pdf/listnotis.blade.php       | 28 +++++++--------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index 933b96c1..f2ce2c0e 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -117,6 +117,7 @@ class NotisController extends Controller
         $lelong_id = $request->lelong_id;
 
         $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        ->join('customer','gadai.nokp','=','customer.kpbaru')
         ->where('lelongbid.lelong_id', $lelong_id)
         ->get()->toArray();      
 
diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php
index 4eef19fb..e914af9e 100644
--- a/resources/views/excel/listnotis_excel.blade.php
+++ b/resources/views/excel/listnotis_excel.blade.php
@@ -43,7 +43,7 @@
 
         <div class="row">
             <div class="first-prgph">
-                <img src="http://lelongrpt.test/img/icon_pkb.png" alt="PKB LOGO" width="100" height="100">
+                <img src="{{ asset('img/icon_pkb.png') }}" alt="PKB LOGO" width="100" height="100">
             </div>      
 
             <div class="first-prgph1">
@@ -61,24 +61,28 @@
         <table width="100%" height="168" id="customers">
             <thead>
                 <tr>
-                    <th>No</th>
-                    <th>No Rujukan</th>
-                    <th>JBG</th>
-                    <th>No KP</th>
-                    <th>Pembiayaan</th>
-                    <th>Keuntungan 6 Bulan</th>
-                    <th>Bayaran Telah Dibuat</th>
+                    <th align="left">No</th>
+                    <th align="left">Nama</th>
+                    <th align="left">No Rujukan</th>
+                    <th align="left">No Telefon</th>
+                    <th align="left">JBG</th>
+                    <th align="left">No KP</th>
+                    <th align="left">Pembiayaan</th>
+                    <th align="left">Keuntungan 6 Bulan</th>
+                    <th align="left">Bayaran Telah Dibuat</th>
                 </tr>
             </thead>
             @foreach($payment as $pay)
                         <tr>
-                            <td>{{ $loop->iteration }} </td>
-                            <td>{{ $pay['norujukan']}}</td>
-                            <td>{{ $pay['jbg']}}</td>
-                            <td>{{ $pay['nokp']}}</td>
-                            <td>{{ $pay['pinjaman']}}</td>
-                            <td>{{ $pay['bakiupah']}}</td>
-                            <td></td>  
+                            <td align="left">{{ $loop->iteration }} </td>
+                            <td align="left">{{ $pay['nama']}}</td>
+                            <td align="left">{{ $pay['norujukan']}}</td>
+                            <td align="left">{{ $pay['telefon']}}</td>
+                            <td align="left">{{ $pay['jbg']}}</td>
+                            <td align="left">{{ $pay['nokp']}}</td>
+                            <td align="left">{{ $pay['pinjaman']}}</td>
+                            <td align="left">{{ $pay['bakiupah']}}</td>
+                            <td align="left"></td>  
                             {{-- join online_arrahn table (transaksi_keuntungan) --}}
 
                 @endforeach
diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php
index 0b494a69..f1f67bf5 100644
--- a/resources/views/pdf/listnotis.blade.php
+++ b/resources/views/pdf/listnotis.blade.php
@@ -60,24 +60,24 @@
         <table width="100%" height="168" id="customers">
             <thead>
                 <tr>
-                    <th>No</th>
-                    <th>No Rujukan</th>
-                    <th>JBG</th>
-                    <th>No KP</th>
-                    <th>Pembiayaan</th>
-                    <th>Keuntungan 6 Bulan</th>
-                    <th>Bayaran Telah Dibuat</th>
+                    <th align="left">No</th>
+                    <th align="left">No Rujukan</th>
+                    <th align="left">JBG</th>
+                    <th align="left">No KP</th>
+                    <th align="left">Pembiayaan</th>
+                    <th align="left">Keuntungan 6 Bulan</th>
+                    <th align="left">Bayaran Telah Dibuat</th>
                 </tr>
             </thead>
             @foreach($payment as $pay)
                         <tr>
-                            <td>{{ $loop->iteration }} </td>
-                            <td>{{ $pay['norujukan']}}</td>
-                            <td>{{ $pay['jbg']}}</td>
-                            <td>{{ $pay['nokp']}}</td>
-                            <td>{{ $pay['pinjaman']}}</td>
-                            <td>{{ $pay['bakiupah']}}</td>
-                            <td></td>  
+                            <td align="left">{{ $loop->iteration }} </td>
+                            <td align="left">{{ $pay['norujukan']}}</td>
+                            <td align="left">{{ $pay['jbg']}}</td>
+                            <td align="left">{{ $pay['nokp']}}</td>
+                            <td align="left">{{ $pay['pinjaman']}}</td>
+                            <td align="left">{{ $pay['bakiupah']}}</td>
+                            <td align="left"></td>  
                             {{-- join online_arrahn table (transaksi_keuntungan) --}}
 
                 @endforeach

From 6f4b99a4a340adfd1d9cc6927c338f7f9a623542 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 3 Mar 2022 09:33:04 +0800
Subject: [PATCH 2/2] update bayaran keuntungan

---
 app/Http/Controllers/NotisController.php      | 28 +++++++++++++++----
 .../views/excel/listnotis_excel.blade.php     |  3 +-
 .../views/jananotis/senarainotis.blade.php    |  5 ++--
 resources/views/pdf/listnotis.blade.php       |  3 +-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index f2ce2c0e..d747ae90 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -61,11 +61,18 @@ class NotisController extends Controller
 
         $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray();      
+        ->get()->toArray();     
 
-  
+        $bayaran=0;
+        foreach($payment as $index1=>$pay)
+        {
+            $bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
+        }
 
-        return view('jananotis.senarainotis',compact('payment','lelong_id'));
+        $payment[$index1]['payment'] = $payment;
+        $payment[$index1]['bayaran_keuntungan'] = $bayaran;
+
+        return view('jananotis.senarainotis',compact('payment','lelong_id','bayaran'));
 
     }
 
@@ -85,7 +92,7 @@ class NotisController extends Controller
         $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan')
         ->join('customer','gadai.nokp','=','customer.kpbaru')
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray();  
+        ->get()->toArray(); 
 
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -121,13 +128,22 @@ class NotisController extends Controller
         ->where('lelongbid.lelong_id', $lelong_id)
         ->get()->toArray();      
 
+        $bayaran=0;
+        foreach($payment as $index1=>$pay)
+        {
+            $bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
+        }
+
+        $payment[$index1]['payment'] = $payment;
+        $payment[$index1]['bayaran_keuntungan'] = $bayaran;
+
         if($request->type == 'excel')
         {
-            return view('excel.listnotis_excel',compact('payment','caw','lelong_id'));
+            return view('excel.listnotis_excel',compact('payment','caw','lelong_id','bayaran'));
         }
         else
         {
-            $pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id'))
+            $pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id','bayaran'))
             ->setPaper('a4', 'landscape');
             
             return $pdf->download('Senarai Notis.pdf');
diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php
index e914af9e..8e985d83 100644
--- a/resources/views/excel/listnotis_excel.blade.php
+++ b/resources/views/excel/listnotis_excel.blade.php
@@ -82,8 +82,7 @@
                             <td align="left">{{ $pay['nokp']}}</td>
                             <td align="left">{{ $pay['pinjaman']}}</td>
                             <td align="left">{{ $pay['bakiupah']}}</td>
-                            <td align="left"></td>  
-                            {{-- join online_arrahn table (transaksi_keuntungan) --}}
+                            <td align="left">{{ $bayaran}}</td>
 
                 @endforeach
 
diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php
index 833f6a20..4b27ad4f 100644
--- a/resources/views/jananotis/senarainotis.blade.php
+++ b/resources/views/jananotis/senarainotis.blade.php
@@ -37,9 +37,8 @@
                             <td>{{ $pay['jbg']}}</td>
                             <td>{{ $pay['nokp']}}</td>
                             <td>{{ $pay['pinjaman']}}</td>
-                            <td>{{ $pay['bakiupah']}}</td>
-                            <td></td>  
-                            {{-- join online_arrahn table (transaksi_keuntungan) --}}
+                            <td>{{ $pay['bakiupah']}}</td>  
+                            <td>{{ $bayaran}}</td>
 
                 @endforeach
         </tbody>
diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php
index f1f67bf5..dee527d4 100644
--- a/resources/views/pdf/listnotis.blade.php
+++ b/resources/views/pdf/listnotis.blade.php
@@ -77,8 +77,7 @@
                             <td align="left">{{ $pay['nokp']}}</td>
                             <td align="left">{{ $pay['pinjaman']}}</td>
                             <td align="left">{{ $pay['bakiupah']}}</td>
-                            <td align="left"></td>  
-                            {{-- join online_arrahn table (transaksi_keuntungan) --}}
+                            <td align="left">{{ $bayaran}}</td>
 
                 @endforeach