From c4425425159f2aa9028100c9c8d4b4d9bb6d3fe2 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sun, 21 Aug 2022 10:04:49 +0800 Subject: [PATCH] update slip serahan --- app/Http/Controllers/SerahanController.php | 17 +++++++++-------- app/Http/Controllers/SimulasiController.php | 13 ++++--------- resources/views/pdf/penyatabayaran.blade.php | 4 ++-- resources/views/pdf/slipserahan.blade.php | 6 +++--- .../pembayaran/kaunterpembayaran.blade.php | 8 +++++++- resources/views/serahan/resit.blade.php | 6 +++--- routes/web.php | 2 +- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index b9c6991a..cc06524c 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -186,11 +186,12 @@ class SerahanController extends Controller $brgdetails= LelongBidder::join('payment','lelongbidder.payment_id','=','payment.id') ->join('lelongbid','lelongbidder.lelongbid_id','=','lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.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('payment.status', 2) + ->where('payment.user_id',$user_id) ->where('lelongbid.kodcaw',$user->kodcaw) + ->where('status_payment_opt', 2) ->orWhere('status_payment_opt', 3) ->distinct() ->orderBy('resit_id') @@ -280,7 +281,7 @@ class SerahanController extends Controller return $pdf->download('Resit Bayaran.pdf'); } - public function slipserahan($user_id, $resit_id, $lelong_id) + public function slipserahan($user_id, $lelong_id) { @@ -294,8 +295,8 @@ class SerahanController extends Controller $lelong = Lelong::where('id',$lelong_id) ->first(); - $invois = Resit::where('id',$resit_id) - + $invois = Invoice::where('user_id',$user_id) + ->where('lelong_id',$lelong_id) ->get(); // dd($invois); @@ -307,7 +308,7 @@ class SerahanController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw',$user->kodcaw) - ->where('payment.resit_id',$resit_id) + // ->where('payment.resit_id',$resit_id) ->get(); // dd($SAGWin); @@ -316,7 +317,7 @@ class SerahanController extends Controller ->join('payment','lelongbid.norujukan','=','payment.norujukan') ->where('lelongbid.kodcaw',$user->kodcaw) ->where('lelongbidder.user_id',$user_id) - ->where('payment.resit_id',$resit_id) + // ->where('payment.resit_id',$resit_id) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->get(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 81ca6991..683e5a60 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -1630,8 +1630,7 @@ class SimulasiController extends Controller $fasa = $fasa; $jbgadai = $t_gadai1; - //$fasa = $request->fasa; - // dd($details); + if($fasa == '1'){ $getsurat = Gadai::on($details) ->where('t_gadai', '<=', $jbgadai) @@ -1677,11 +1676,7 @@ class SimulasiController extends Controller ->first(); } - // $tarikh_lelong = Carbon::parse($t_lelong); - // $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); - // $t_lelongdisplay = $tarikh_lelong->format('d-m-Y'); - //$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y'); - //$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y'); + foreach($getsurat as $index1=>$surats) @@ -1689,9 +1684,9 @@ class SimulasiController extends Controller $senarai = Gadai::on($details) ->where('norujukan', $surats['norujukan']) ->get(); - // dd($surats['tempoh']); + dd($senarai); $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('keuntungan_rebet'); $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('bayaran_keuntungan'); @@ -1714,7 +1709,7 @@ class SimulasiController extends Controller return view('simulasi.cawpercubaansim', compact( 'getsurat', 'details', 'senarai', - 'keuntungan', + 'keuntungan', 't_gadais', 'ktlhbyr', 'caw_name', diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php index 63d19401..ea4c1526 100644 --- a/resources/views/pdf/penyatabayaran.blade.php +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -108,9 +108,9 @@ - + - + diff --git a/resources/views/pdf/slipserahan.blade.php b/resources/views/pdf/slipserahan.blade.php index 325d4953..9f703c7c 100644 --- a/resources/views/pdf/slipserahan.blade.php +++ b/resources/views/pdf/slipserahan.blade.php @@ -57,7 +57,7 @@ @foreach ($invois as $data) - + @endforeach @@ -112,9 +112,9 @@
BilBil No RujukanJenis BarangJenis Barang Berat(g) Harga Bidaan(RM)
{{$caw['alamat1']}}No.Slip: {{$data['reference_no']}}No.Slip: {{$data['invoice_no']}}
- + - + diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index a13e2486..80221154 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -23,7 +23,8 @@ - + + @@ -48,9 +49,14 @@ + + + --}} - + {{-- --}} @@ -52,7 +52,7 @@ @endif - + --}} @endforeach {{-- diff --git a/routes/web.php b/routes/web.php index f6b7a519..40290cf5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -306,7 +306,7 @@ Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], funct Route::get('/penyatabayaran/{user_id}/{lelong_id}',['as'=>'serahan.penyatabayaran','uses'=>'SerahanController@penyatabayaran']); Route::get('/resitpembayaran/{user_id}/{resit_id}/{lelong_id}',['as'=>'serahan.resitpembayaran','uses'=>'SerahanController@resitpembayaran']); Route::get('/resit/{user_id}/{lelong_id}',['as'=>'serahan.resit','uses'=>'SerahanController@resit']); - Route::get('/slipserahan/{user_id}/{resit_id}/{lelong_id}',['as'=>'serahan.slipserahan','uses'=>'SerahanController@slipserahan']); + Route::get('/slipserahan/{user_id}/{lelong_id}',['as'=>'serahan.slipserahan','uses'=>'SerahanController@slipserahan']); Route::get('/senaraibid/{user_id}/{lelong_id}',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']);
BilBil No RujukanJenis BarangJenis Barang Berat(g) Harga Lelong(RM)
Amaun Telah Dibayar(RM) Status Bayaran Penyata BayaranResit/ Slip SerahanSlip SerahanResit Pembayaran Tindakan
+ + {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) ) --}} diff --git a/resources/views/serahan/resit.blade.php b/resources/views/serahan/resit.blade.php index 844f7a82..56791f0d 100644 --- a/resources/views/serahan/resit.blade.php +++ b/resources/views/serahan/resit.blade.php @@ -27,7 +27,7 @@ {{-- No ResitNo rujukan Resit BayaranSlip SerahanSlip Serahan
+ {{-- @if($laporan['brg']['status_payment'] == 1) @elseif($laporan['brg']['status_payment'] == 2) @@ -60,7 +60,7 @@ @else BELUM BAYAR @endif -