From f21e60d448cd0cd776f4bdb3a7f51afde926bef2 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Sun, 3 Apr 2022 08:43:34 +0800
Subject: [PATCH] update notis tamat kontrak

---
 app/Http/Controllers/SimulasiController.php   |  2 +-
 app/Http/Controllers/TamatKontController.php  | 45 +++++++++++++------
 .../views/jananotis/gadaibycaw.blade.php      |  1 +
 .../views/jananotis/senaraitemp.blade.php     |  1 +
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 3cf746ea..3747c527 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -57,7 +57,7 @@ class SimulasiController extends Controller
 
     public function janadata(Request $request)
     {
-        dd($request->all());
+        // dd($request->all());
         $t_lelong = Carbon::parse($request->tarikh_lelong);
         $bulan = (int)round($request->jbg);
         $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index d9e971e4..c491eed6 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -25,17 +25,19 @@ class TamatKontController extends Controller
     {
         $t_lelong = $request->tarikh_lelong;
 
-        if($t_lelong != null)
+        $user = Auth::user();
+        $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
+                        ->where('kodcaw', $user->kodcaw)
+                        ->where('sttebus', '=', '')
+                        ->where('taglel', '=', 0)
+                        ->where('tagpalsu', '=', 0)
+                        ->where('tagpalsu2', '=', 0)
+                        ->whereNotNull('upah12')
+                        ->get();
+
+
+        if(sizeof($getsurat) != 0)
         {
-            $user = Auth::user();
-            $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
-                            ->where('kodcaw', $user->kodcaw)
-                            ->where('sttebus', '=', '')
-                            ->where('taglel', '=', 0)
-                            ->where('tagpalsu', '=', 0)
-                            ->where('tagpalsu2', '=', 0)
-                            ->whereNotNull('upah12')
-                            ->get();
             
             $t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
                              ->where('sttebus', '=', '')
@@ -46,7 +48,19 @@ class TamatKontController extends Controller
                              ->orderBy('t_gadai')
                              ->select('t_gadai')
                              ->first(); 
-
+            
+            $bil_lelongcaw = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
+                            ->where('gadai.t_matang1', '<', $t_lelong)
+                            ->where('kodcaw', $user->kodcaw)
+                            ->where('gadai.sttebus', '=', '')
+                            ->where('gadai.taglel', '=', 0)
+                            ->where('gadai.tagpalsu', '=', 0)
+                            ->where('gadai.tagpalsu2', '=', 0)
+                            ->whereNotNull('gadai.upah12')
+                            ->selectRaw('count(*) as bil_lelong')
+                            ->get()->toArray();  
+            
+            
             $tarikh_lelong = Carbon::parse($t_lelong);
             $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
 
@@ -63,13 +77,18 @@ class TamatKontController extends Controller
             //                                         ->sum('bayaran_keuntungan');
 
             return view('jananotis.gadaibycaw', compact( 'getsurat', 
-                                            'senarai',
                                             't_lelong',
                                             'user',
                                             't_gadais',
-                                            't_anggaran'
+                                            't_anggaran',
+                                            'bil_lelongcaw'
                                             ));
         }
+        else if(sizeof($getsurat) == 0)
+        {
+            return redirect()->route('jananotis.notistamatkontrak')
+                             ->with('failed','Tiada surat untuk di lelong');
+        }
         else
         {
             return redirect()->route('jananotis.notistamatkontrak')
diff --git a/resources/views/jananotis/gadaibycaw.blade.php b/resources/views/jananotis/gadaibycaw.blade.php
index eee23806..def74f15 100644
--- a/resources/views/jananotis/gadaibycaw.blade.php
+++ b/resources/views/jananotis/gadaibycaw.blade.php
@@ -18,6 +18,7 @@
                             <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
                             <p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
                             <p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
+                            <p> <b>Bilangan Surat : </b>{{ $bil_lelongcaw[0]['bil_lelong'] }}</p>
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php
index 5a395acf..217e1bce 100644
--- a/resources/views/jananotis/senaraitemp.blade.php
+++ b/resources/views/jananotis/senaraitemp.blade.php
@@ -16,6 +16,7 @@
                     <div class="col-md-11 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
                         <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
                         <p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
+                        <p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
                     </div>
                 </div>
             </div>