Merge branch 'amirah'

app/Http/Controllers/NotisController.php

@@ -6,9 +6,7 @@ use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
 use App\Models\User;
-use PDF;
 use App\Models\Cawangan;
 use App\Models\LelongBidder;
 use App\Models\Lelong;
@@ -16,6 +14,10 @@ use App\Models\CawanganLelong;
 use App\Models\LelongBid;
 use App\Models\Payment;
 use App\Models\Resit;
+use App\Models\Gadai;
+use Carbon\Carbon;
+use PDF;
+use DateTime;
 
 
 class NotisController extends Controller
@@ -79,24 +81,28 @@ class NotisController extends Controller
 
         $lelong_id = $lelong_id;
 
-        $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        // -join('customer','gadai.')
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan')
+        ->join('customer','gadai.nokp','=','customer.kpbaru')
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray();      
+        ->get()->toArray();  
 
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user->kodcaw)
         ->where('cawangan_lelong.lelong_id', $lelong_id)
-
         ->get();
+
   
         $lelong = Lelong::where('id', $lelongid)->get();
 
   
-        // return view ('pdf.jananotis',compact('payment','lelong_id','lelongid','caw'));
+        // return view ('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak'));
 
-        $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw'))
+        $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak'))
         ->setPaper('a4', 'potrait');
        
        return $pdf->download('Penjanaan Notis.pdf');