From c1e69527faa9c87d23fc2ad5ed212f8a3f8ca41e Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 3 Aug 2022 17:00:29 +0800
Subject: [PATCH] notis sebelum tamat kontrak

---
 app/Http/Controllers/TamatKontController.php  | 38 +++++++++++++++----
 .../views/jananotis/gadaibycaw.blade.php      |  5 ++-
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index fb333bb8..a95096b3 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -44,7 +44,14 @@ class TamatKontController extends Controller
         $t_lelong = $request->tarikh_lelong;
 
         $user = Auth::user();
-        $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
+
+        // $cawangan = Cawangan::where('caw_code', $user->kodcaw)
+        // ->get();
+        // dd($cawangan);
+
+        
+        $getsurat = Gadai::on($user->kodcaw)
+                        ->where('t_matang1', '<', $t_lelong)
                         ->where('kodcaw', $user->kodcaw)
                         ->where('sttebus', '=', '')
                         ->where('taglel', '=', 0)
@@ -53,11 +60,14 @@ class TamatKontController extends Controller
                         ->whereNotNull('upah12')
                         ->get();
 
+        // dd($getsurat);
+
 
         if(sizeof($getsurat) != 0)
         {
             
-            $t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
+            $t_gadais = Gadai::on($user->kodcaw)
+                             ->where('t_matang1', '<', $t_lelong)
                              ->where('sttebus', '=', '')
                              ->where('taglel', '=', 0)
                              ->where('tagpalsu', '=', 0)
@@ -66,8 +76,13 @@ class TamatKontController extends Controller
                              ->orderBy('t_gadai')
                              ->select('t_gadai')
                              ->first(); 
-            
-            $bil_lelongcaw = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
+
+            $cawangan_all = Cawangan::where('caw_code', $user->kodcaw)->get();
+
+            foreach($cawangan_all as $cawangan){
+
+            $bil_lelongcaw = Gadai::on($cawangan->caw_code)
+            // join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
                             ->where('gadai.t_matang1', '<', $t_lelong)
                             ->where('kodcaw', $user->kodcaw)
                             ->where('gadai.sttebus', '=', '')
@@ -77,7 +92,8 @@ class TamatKontController extends Controller
                             ->whereNotNull('gadai.upah12')
                             ->selectRaw('count(*) as bil_lelong')
                             ->get()->toArray();  
-            
+            }
+            // dd($bil_lelongcaw);
             
             $tarikh_lelong = Carbon::parse($t_lelong);
             $t_anggaran = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
@@ -86,12 +102,19 @@ class TamatKontController extends Controller
 
             foreach($getsurat as $index1=>$surats)
             {
-                $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
+                $senarai = Gadai::on($user->kodcaw)
+                // join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
                 ->where('norujukan', $surats['norujukan'])
                 ->get();   
+
+                $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
+
                 
                 $getsurat[$index1]['list_norujukan'] = $senarai;
+                $getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
+
             }
+            // dd($getsurat);
 
             // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
             //                                         ->sum('bayaran_keuntungan');
@@ -101,7 +124,8 @@ class TamatKontController extends Controller
                                             'user',
                                             't_gadais',
                                             't_anggaran',
-                                            'bil_lelongcaw'
+                                            'bil_lelongcaw',
+                                            'ktlhbyr'
                                             ));
         }
         else if(sizeof($getsurat) == 0)
diff --git a/resources/views/jananotis/gadaibycaw.blade.php b/resources/views/jananotis/gadaibycaw.blade.php
index def74f15..2be3225f 100644
--- a/resources/views/jananotis/gadaibycaw.blade.php
+++ b/resources/views/jananotis/gadaibycaw.blade.php
@@ -47,7 +47,10 @@
                                 <td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
                                 <td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
                                 <td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
-                                <td></td>
+
+                                <td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
+
+                            
                             </tr>
                         @endforeach
                     </tbody>