add function kali

app/Http/Controllers/SimulasiController.php

@@ -28,7 +28,7 @@ use App\Models\LelongBidMarhun;
 use App\Models\LelKarat;
 use App\Models\LogUser;
 use App\Models\LelongTebus;
-
+use App\Models\Tetapan;
 
 
 
@@ -54,7 +54,8 @@ class SimulasiController extends Controller
     public function index()
     {
         $caw = Cawangan::all();
-        return view('simulasi.janasimulasi',compact('caw'));
+        $tetapan = Tetapan::where('id','=',1)->first();
+        return view('simulasi.janasimulasi',compact('caw','tetapan'));
     }
 
     public function janadata(Request $request)
@@ -64,6 +65,7 @@ class SimulasiController extends Controller
         $bulan = (int)round($request->jbg);
         $fasa = $request->fasa;
         $jbg = $request->jbg;
+        $kali = $request->kali;
        // dd($fasa);
       // dd($fasa);
        //create simulasi
@@ -73,6 +75,7 @@ class SimulasiController extends Controller
        $simulasi->jbg = $request->jbg;
        $simulasi->cajlelong = $request->cajlelong;
        $simulasi->fasa = $request->fasa;
+       $simulasi->kali = $request->kali;
        $simulasi->save();
        $simulasi_id = $simulasi->id;
         $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
@@ -136,8 +139,13 @@ class SimulasiController extends Controller
             $caw_simulasi->online = 'Online';
             $caw_simulasi->lokasi = $cawsimulasi->lokasi;
             $caw_simulasi->fasa = $request->fasa;
+            $caw_simulasi->kali = $request->kali;
             $caw_simulasi->save();
             // dd($caw_simulasi);
+
+            // $cawangan = Cawangan::whereIn('caw_code',$request->caw)->get();
+            // $cawangan->kali = $request->kali;
+            // $cawangan->update();
             
             $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
 
@@ -871,10 +879,13 @@ class SimulasiController extends Controller
         $fasa = $request->fasa;
         $jbg = $request->jbg;
         $cajlelong = $request->cajlelong;
+        $kali = $request->kali;
+        // dd($kali);
         $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
         $t_lelongdisplay = $t_lelong->format('d-m-Y');
        // $t_lelongdisplay = $t_lelong->format('d-m-Y');
         //dd($fasa);
+        $tetapan = Tetapan::where('id','=',1)->first();
         if($t_lelong != null)
         {
             if($request->fasa == '1'){
@@ -901,7 +912,7 @@ class SimulasiController extends Controller
             // $t_gadaisehingga = Carbon::parse($t_gadais);
             // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
         
-
+           
             $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
                             ->orderBy('cawangan.caw_name')
                             ->where('gadai.t_gadai', '<=', $jbgadai)
@@ -910,6 +921,13 @@ class SimulasiController extends Controller
                             ->where('gadai.taglel', '=', 0)
                             ->where('gadai.tagpalsu', '=', 0)
                             ->where('gadai.tagpalsu2', '=', 0)
+                            // ->where('cawangan_simulasi.kali', '!=', $kali)
+                            ->whereNotIn('cawangan.id', function($query) use ($kali) {
+                                $query->select('caw_id')
+                                      ->from('cawangan_simulasi')
+                                      ->where('kali', '=' ,$kali);
+                            })
+                           
                             ->whereNotNull('gadai.upah12')
                             ->groupBy('gadai.kodcaw','cawangan.caw_name')
                             ->selectRaw('count(*) as bil_lelong, 
@@ -918,9 +936,11 @@ class SimulasiController extends Controller
                                         sum(pinjaman) as total_pembiayaan,
                                         sum(bakipjm) as total_bakipjm,
                                         gadai.kodcaw,
-                                        cawangan.caw_name as caw_name')
-                            ->get();            
-            
+                                        cawangan.caw_name as caw_name
+                                        ')
+                            
+                            ->get();     
+            // dd($senarai);
             $bil_lelong = sizeof($getsurat);
             }
             
@@ -987,7 +1007,8 @@ class SimulasiController extends Controller
                                                         'jbgadai',
                                                         'fasa',
                                                         'jbg',
-                                                        'cajlelong'
+                                                        'cajlelong',
+                                                        'tetapan'
 
                                                         
                                                     ));