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

Add details payment role operasi

Browse Source
This commit is contained in:
Amir
2023-02-21 05:05:08 +08:00
parent 1913c36ba9
commit 37b70cc5d3
5 changed files with 175 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PembidaController.php
+36 -2
View File
@@ -22,18 +22,20 @@ use App\Models\LogUser;
use App\Models\FileResit;
use App\Models\Invoice;
use App\Models\ScanJual;
use App\Services\ResitPhotoService;
class PembidaController extends Controller
{
private $resitPhotoService;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
public function __construct(ResitPhotoService $resitPhotoService)
{
$this->middleware('auth');
$this->resitPhotoService = $resitPhotoService;
}
/**
@@ -311,6 +313,7 @@ class PembidaController extends Controller
$listwinner[$index1]['payment_id'] = $payment_id;
$listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment;
$listwinner[$index1]['jenisbayaran']['status'] = ($detailspayment) ? $detailspayment['status'] : 0;
$listwinner[$index1]['jenisbayaran']['kaedah_bayaran'] = ($detailspayment) ? $detailspayment['status_payment_opt'] : 0;
}
@@ -376,6 +379,37 @@ class PembidaController extends Controller
return view('pembida.detailsbidaan', compact('infos', 'userdetail', 'kodcaw'));
}
public function detailsbayaran($lelong_id, $user_id, $kodcaw)
{
$lelong = Lelong::find($lelong_id, ['id', 'tarikh_lelong']);
$cawangan = Cawangan::where('caw_code', $kodcaw)->select('id', 'caw_name')->first();
$user = User::find($user_id, ['id', 'name']);
$lelong_bid_all = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbid.nopembeli', $user_id)
->where('cawangan.caw_code', $kodcaw)
->where('lelongbid.kodcaw', $kodcaw)
->where('lelongbidder.status_payment', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbid.id', 'norujukan', 'hargabida')
->get();
$disahkan_oleh = Payment::with('disahkanOleh:id,name')->where('lelongbid_id', $lelong_bid_all[0]->id)->where('disahkan_oleh', '<>', null)->select('id', 'disahkan_oleh', 'disahkan_pada', 'remark')->first();
$total_payment = $lelong_bid_all->sum('hargabida');
$fileresit_all = FileResit::where('lelong_id', $lelong_id)->where('user_id', $user_id)->where('kodcaw', $kodcaw)->get();
if ($disahkan_oleh->remark == "BERJAYA BAYARAN ONLINE") {
$disahkan_oleh->remark = "FPX";
}
return view('pembida.detailspembayaran', compact('lelong', 'cawangan', 'user', 'fileresit_all', 'total_payment', 'disahkan_oleh'));
}
public function showPhotoResit(Request $request)
{
$resit = FileResit::where('id', '=', $request->fileresit_id)->first();
return $this->resitPhotoService->show($request->user_id, $resit);
}
public function belumbayarbidaan(Request $request)
{
app/Models/Payment.php
+6
View File
@@ -46,4 +46,10 @@ class Payment extends Model
{
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function disahkanOleh()
{
return $this->belongsTo(User::class, 'disahkan_oleh', 'id');
}
}
resources/views/pembida/detailspembayaran.blade.php
+102
View File
@@ -0,0 +1,102 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Butiran Pembayaran
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col-md-12 col-lg">
<div class="form-group row">
<label class="col-6 col-form-label">Tarikh Lelong</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$lelong->tarikh_lelong}}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Batch Lelong</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$lelong->id}}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Cawangan</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$cawangan->caw_name}}">
</div>
</div>
</div>
</div>
<div class="col-lg-1"></div>
<div class="col-md-12 col-lg">
<div class="form-group row">
<label class="col-6 col-form-label">Pembida</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light text-uppercase" value="{{ $user->name }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Jumlah Bidaan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_payment, 2, '.', ',') }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Kaedah Bayaran</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{ $disahkan_oleh->remark }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Disahkan Oleh</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{ $disahkan_oleh->disahkanOleh->name }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Disahkan Pada</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{ $disahkan_oleh->disahkan_pada }}">
</div>
</div>
</div>
</div>
</div>
<div class="row justify-content-center">
@foreach ($fileresit_all as $item)
<img class="m-2" src="{{ route('report.showphotoresit', ['user_id' => $user->id, 'fileresit_id' => $item->id]) }}" width="50%">
@endforeach
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
resources/views/pembida/pembayaranbidaan.blade.php
+28 -61
View File
@@ -33,14 +33,15 @@
<tr>
<th>Bil</th>
<th>Nama</th>
<th>No Kad Pengenalan</th>
<!-- <th>No Kad Pengenalan</th> -->
<th>No Telefon</th>
<th>Bilangan Surat</th>
<th>Jumlah Pembayaran(RM)</th>
<th>Jumlah Bidaan(RM)</th>
<th>Jenis Bayaran</th>
<!-- <th>Jumlah Pembayaran(RM)</th> -->
<th>Jumlah Bidaan (RM)</th>
<th>Status</th>
<th>Kaedah Bayaran</th>
<th class="text-center">Maklumat</th>
<th>Bayaran</th>
</tr>
</thead>
<tbody>
@@ -51,29 +52,36 @@
@foreach($listwinner as $winner)
<tr>
<td>{{ $loop->iteration }}</td>
<td class="text-left">{{ $winner['details']['name'] }}</td>
<td>{{ $winner['details']['nokp'] }}</td>
<td class="text-left text-uppercase">{{ $winner['details']['name'] }}</td>
<!-- <td>{{ $winner['details']['nokp'] }}</td> -->
<td>{{ $winner['details']['notelbimbit']}}</td>
<td>{{ $winner['total_surat'] }}</td>
<!-- <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td> -->
<td>{{ number_format($winner['totalBid'], 2, '.', ',') }}</td>
<td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
<td>
@if($winner['jenisbayaran']['status'] == 1)
<button class="btn btn-info btn-sm" disabled>YURAN</button>
@elseif($winner['jenisbayaran']['status'] == 2)
<button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
@if($winner['jenisbayaran']['status_payment'] == 1)
<button class="btn btn-sm btn-success" disabled>Selesai Bayar</button>
@else
<button class="btn btn-sm btn-secondary" disabled>Belum Bayar</button>
@endif
</td>
<td>
@if($winner['jenisbayaran']['kaedah_bayaran'] == 1)
<button class="btn btn-sm btn-dark" disabled>TUNAI</button>
@elseif($winner['jenisbayaran']['kaedah_bayaran'] == 2)
<button class="btn btn-sm btn-primary" disabled>FPX</button>
@elseif($winner['jenisbayaran']['kaedah_bayaran'] == 3)
<button class="btn btn-sm btn-secondary" disabled>CDM</button>
@endif
</td>
<td>
<a class="btn btn-sm btn-info" href="{{ route('pembida.detailsbidaan', [ $lelong_id, 'user_id'=>$winner['details']['id'], $kodcaw ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
</td>
<td>
@if($winner['jenisbayaran']['status_payment'] == 1)
<button class="btn btn-success btn-sm" disabled>BERJAYA SELESAI</button>
@else
<button class="btn btn-secondary btn-sm" disabled>BELUM SELESAI</button>
<a href="{{ route('pembida.detailsbayaran', [ $lelong_id, 'user_id'=>$winner['details']['id'], $kodcaw ]) }}" class="btn btn-sm btn-warning" data-toggle="tooltip" data-placement="top" title="Butiran Bayaran"><i class="far fa-list-alt"></i></a>
@endif
</td>
<td>
<a class="btn m-1 btn-info" href="{{ route('pembida.detailsbidaan', [ $lelong_id, 'user_id'=>$winner['details']['id'], $kodcaw ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
</td>
</tr>
@php
$totalsurat += $winner['total_surat'];
@@ -84,11 +92,10 @@
</tbody>
<tfoot>
<tr>
<td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'center'><b><b>{{$totalsurat}}</b></td>
<td align = 'center'><b>{{ number_format($totalbid, 2, '.', ',') }}</b></td>
<td align = 'center'><b>{{ number_format($totalpay, 2, '.', ',') }}</b></td>
<td colspan="3"></td>
<td colspan="5"></td>
</tr>
</tfoot>
</table>
@@ -102,47 +109,7 @@
$('[data-toggle="tooltip"]').tooltip()
})
var tablesahsagonline = $('#sahsagonline').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 9,
"orderable": false
}
],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
var tablesahsagonline = $('#sahsagonline').DataTable({});
// $('.addcaw').tooltip();
// $('.export').tooltip();
routes/web.php
+3
View File
@@ -324,6 +324,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']);
Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']);
Route::get('/detailsbidaan/{lelong_id}/{user_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
Route::get('/detailsbayaran/{lelong_id}/{user_id}/{kodcaw}',['as'=>'pembida.detailsbayaran','uses'=>'PembidaController@detailsbayaran']);
Route::get('/senlelbelumbayarbidaan',['as'=>'pembida.senlelbelumbayarbidaan','uses'=>'PembidaController@senlelbelumbayarbidaan']);
Route::get('/belumbayarbidaan',['as'=>'pembida.belumbayarbidaan','uses'=>'PembidaController@belumbayarbidaan']);
Route::post('/declaretidaklaku',['as'=>'pembida.declaretidaklaku','uses'=>'PembidaController@declaretidaklaku']);
@@ -538,6 +539,8 @@ Route::get('/lapubahmarhunlelongindexpdf/{lelong_id}/{kodcaw}/{t_lelong}',['as'=
Route::post('/export',['as'=>'report.exportubahmarhun','uses'=>'ReportController@exportubahmarhun']);
Route::get('/showphotoresit',['as'=>'report.showphotoresit','uses'=>'PembidaController@showPhotoResit']);
});
//Report by KALI