update notis, slipserahan bu user_id

app/Http/Controllers/NotisController.php

@@ -138,9 +138,9 @@ class NotisController extends Controller
         foreach($marhuns as $index1=>$cal){
             $customer =  Customer::where('kpbaru','=',$cal['nokp'])
             ->orWhere('kplama','=',$cal['nokp'])
-            ->join('daerah','customer.koddaerah','=','daerah.koddaerah')
-            ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri')      
             ->join('poskod','customer.poskod','=','poskod.poskod')  
+            ->join('daerah','poskod.koddaerah','=','daerah.koddaerah')
+            ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri')
             ->first();
 
             $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
@@ -152,11 +152,14 @@ class NotisController extends Controller
                 $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
 
             }
-            $marhuns[$index1]['nama'] = $customer;
+            $marhuns[$index1]['nama'] = ($customer) ? $customer : dd($cal['nokp']);
             $marhuns[$index1]['listsag'] = $listsag;
 
             
         }
+
+
+        // dd($marhuns->toArray());
         // $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
         // $datacustomer = $gadaicaw2->get();
         // $customer = Customer::query()

app/Http/Controllers/ReportController.php

@@ -655,13 +655,99 @@ class ReportController extends Controller
         $pdf = PDF::loadView('pdf.pdfsimulasireport',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','datacaw'))
         ->setPaper('a4','potrait');
 
-        return $pdf->download('Laporan Barang Lelong Pembida.pdf');
+        return $pdf->download('Laporan Simulasi Cawangan.pdf');
      
 
 
 
      }
 
+     public function lelongreport ($lelongid, $cawid){
+
+        $keuntungan = 0;
+        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
+        ->select(
+            'lelongbid.t_lelong',
+            'lelongbid.kodcaw',
+            'cawangan.caw_name',
+            'lelongbid.norujukan',
+            'lelongbid.pinjaman',
+            'lelongbid.berat',
+            'lelongbid.nilaimarhun',
+            'lelongbid.hargaasas',
+            'lelongbid.hargajual',
+            'lelongbid.t_jual',
+            'lelongbid.upahsimpan',
+            'lelongbid.cajlelong',
+            'lelongbid.baki',
+            'lelongbid.bakiupah',
+            'lelongbid.status_jual',
+            'lelongbid.jbg'
+        )
+        ->get()->toArray();
+        // dd($marhuns);
+        $arraymarhun = [];
+        foreach ($marhuns as $index1=> $cal) {
+            // dd($cal);
+            $gadai = Gadai::on($cal['kodcaw'])
+            ->where('norujukan','=',$cal['norujukan'])
+            ->first();
+            // dd($gadai);
+            $customer =  Customer::where('kpbaru','=',$gadai['nokp'])
+            ->orWhere('kplama','=',$gadai['nokp'])
+            ->first();
+            // dd($customer);
+
+            // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
+            $marhuns[$index1]['keuntungan'] = $keuntungan;
+            $marhuns[$index1]['nama'] = $customer;
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $gadai['tempoh'],
+                'nama' => $customer['nama'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'hargajual' => $cal['hargajual'],
+                't_jual' => $cal['t_jual'],
+                'pinjaman' => $cal['pinjaman'],
+                'pinjasal' => $gadai['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+                'upah6bulan' => $gadai['bakiupah']
+            ]);
+        }
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+
+        $pdf = PDF::loadView('pdf.pdflelongreport',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'))
+        ->setPaper('a4','potrait');
+
+        return $pdf->download('Laporan Lelong Cawangan.pdf');
+
+        // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
+    }
+
 
   
 

app/Http/Controllers/SerahanController.php

@@ -188,6 +188,7 @@ class SerahanController extends Controller
         ->join('lelongbid','lelongbidder.lelongbid_id','=','lelongbid.id')
         ->select('resit_id','payment.lelong_id','payment.user_id','payment.status','status_payment_opt','lelongbidder.status_payment')
         ->where('status', 2)
+        // ->where('payment.user_id',$user_id)
         ->where('status_payment_opt', 2)
         ->where('lelongbid.kodcaw',$user->kodcaw)
         ->orWhere('status_payment_opt', 3)