notis tamat kontrak pc

app/Http/Controllers/TamatKontController.php

@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
 
+use App\Models\User;
 use App\Models\Gadai;
 use App\Models\GadaiMarhun;
 use App\Models\Cawangan;
@@ -20,37 +22,38 @@ class TamatKontController extends Controller
         
     }
 
-    public function senaraitemppc(Request $request)
+    public function gadaibycaw(Request $request)
     {
-        // dd($request->all());
-        $t_lelong = Carbon::parse($request->tarikh_lelong);
-        $bulan = 12;
-        $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
-        $surat = Gadai::where('t_gadai','<=',$jbgadai)
-                        ->where('t_matang1','<=','t_lelong')
-                        ->whereNotNull('upah12')
-                        ->where('sttebus','=','')
-                        ->where('tagpalsu','=',0)
-                        ->where('tagpalsu2','=',0)
-                        ->where('taglel','=',0)
-                        ->where('lelong_tawarruq','=',1)
-                        ->orderBy('norujukan','desc')
-                        ->get();
+        $user = Auth::user();
+        $t_lelong = $request->tarikh_lelong;
+        $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($surat) == 0)
-        {
-            return redirect()->route('notistamatkontrak.sebelumtamatkont')
-                        ->with('failed','Tiada surat untuk di lelong');
-        }
 
-        foreach($surat as $index1=>$surats)
+        foreach($getsurat as $index1=>$surats)
         {
             $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
             ->where('norujukan', $surats['norujukan'])
-            ->get();
+            ->get();   
+            
+            $getsurat[$index1]['list_norujukan'] = $senarai;
         }
 
-        return view('jananotis.senaraitemp', compact('t_lelong', 'jbgadai', 'surat'));
+        // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
+        //                                         ->sum('bayaran_keuntungan');
+
+        return view('jananotis.gadaibycaw', compact( 'getsurat', 
+                                           'senarai',
+                                           't_lelong',
+                                           'user'
+                                           )
+                                        );
     }
     
     //Operasi