diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index f02b039c..d7d3f55b 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -27,7 +27,7 @@ class PaymentController extends Controller $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->where('lelong.sts_lelong', 3) ->where('cawangan.caw_code', $user->kodcaw) ->groupBy('lelong_id') diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 29f148b0..3e07526b 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -292,7 +292,8 @@ class ReportCawanganController extends Controller } $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbid.kodcaw','=',$user['kodcaw']) ->where('lelongbidder.status_bidder','=','1') ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index b33a8f5b..7f0f954e 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -139,7 +139,7 @@ class SerahanController extends Controller $invois = Payment::join('resit','payment.resit_id','=','resit.id') ->where('resit.id',$lelong_id) - ->first(); + ->get(); // dd($invois); diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index f18dbfca..3dccccc4 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -43,7 +43,7 @@
- PKB LOGO + {{-- PKB LOGO --}}
diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php index a8edd9d8..d9f77fc5 100644 --- a/resources/views/pdf/penyatabayaran.blade.php +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -52,7 +52,7 @@ {{$caw['alamat1']}} - No.Invois: :{{$invois->reference_no}} + {{-- No.Invois: :{{$invois->reference_no}} --}} diff --git a/resources/views/pdf/resitpembayaran.blade.php b/resources/views/pdf/resitpembayaran.blade.php index 221792ed..b5c495aa 100644 --- a/resources/views/pdf/resitpembayaran.blade.php +++ b/resources/views/pdf/resitpembayaran.blade.php @@ -55,7 +55,7 @@ {{$caw['alamat1']}} - No.Slip: {{$invois['reference_no']}} + {{-- No.Slip: {{$invois['reference_no']}} --}} {{$caw['alamat2']}} diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index f1ab46f4..c849af99 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -35,10 +35,12 @@ {{ $winner['total_surat']}} {{ $winner['totalBid']}} {{ $winner['totalPay']}} - + + + {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) ) --}}