KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update slip serahan

Browse Source
This commit is contained in:
Amirah22
2022-08-21 10:04:49 +08:00
parent 615894d426
commit c442542515
7 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SerahanController.php
+9 -8
View File
@@ -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();
app/Http/Controllers/SimulasiController.php
+4 -9
View File
@@ -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',