update slip serahan
This commit is contained in:
Amirah22
@@ -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();
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -108,9 +108,9 @@
|
||||
<table width="100%" height="168" id="customers">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="11%">Bil</th>
|
||||
<th width="3%">Bil</th>
|
||||
<th width="15%">No Rujukan</th>
|
||||
<th width="16%">Jenis Barang</th>
|
||||
<th width="25%">Jenis Barang</th>
|
||||
<th width="10%">Berat(g)</th>
|
||||
<th width="13%"> Harga Bidaan(RM)</th>
|
||||
</tr>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<tr>
|
||||
<td>{{$caw['alamat1']}}</td>
|
||||
@foreach ($invois as $data)
|
||||
<td align="right">No.Slip: {{$data['reference_no']}}</td>
|
||||
<td align="right">No.Slip: {{$data['invoice_no']}}</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
|
||||
@@ -112,9 +112,9 @@
|
||||
<table width="100%" height="100" align="left" id="customers">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="8%">Bil</th>
|
||||
<th width="3%">Bil</th>
|
||||
<th width="21%" align="center">No Rujukan</th>
|
||||
<th width="29%" align="center">Jenis Barang</th>
|
||||
<th width="35%" align="center">Jenis Barang</th>
|
||||
<th width="13%" align="right">Berat(g)</th>
|
||||
<th width="16%" align="right"> Harga Lelong(RM)</th>
|
||||
</tr>
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
<th>Amaun Telah Dibayar(RM)</th>
|
||||
<th>Status Bayaran</th>
|
||||
<th>Penyata Bayaran</th>
|
||||
<th>Resit/ Slip Serahan</th>
|
||||
<th>Slip Serahan</th>
|
||||
<th>Resit Pembayaran</th>
|
||||
<th class="text-center">Tindakan</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -48,9 +49,14 @@
|
||||
<a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<a href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
{{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) ) --}}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
{{-- <th class="text-center">No Resit</th> --}}
|
||||
<th class="text-center">No rujukan</th>
|
||||
<th class="text-center">Resit Bayaran</th>
|
||||
<th class="text-center">Slip Serahan</th>
|
||||
{{-- <th class="text-center">Slip Serahan</th> --}}
|
||||
|
||||
|
||||
</tr>
|
||||
@@ -52,7 +52,7 @@
|
||||
@endif
|
||||
</td>
|
||||
|
||||
<td class="text-center">
|
||||
{{-- <td class="text-center">
|
||||
@if($laporan['brg']['status_payment'] == 1)
|
||||
<a href="{{ route('serahan.slipserahan',['user_id'=>$laporan['brg']['user_id'],'resit_id'=>$laporan['brg']['resit_id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
|
||||
@elseif($laporan['brg']['status_payment'] == 2)
|
||||
@@ -60,7 +60,7 @@
|
||||
@else
|
||||
<span class="btn btn-danger btn-sm hovernone-danger">BELUM BAYAR</span>
|
||||
@endif
|
||||
</td>
|
||||
</td> --}}
|
||||
</tr>
|
||||
@endforeach
|
||||
{{-- <tr>
|
||||
|
||||
+1
-1
@@ -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']);
|
||||
|
||||
Reference in New Issue
Block a user