diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 4665ef71..c7c891ff 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -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) { diff --git a/app/Models/Payment.php b/app/Models/Payment.php index d4ff26ee..b4dfb58b 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -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'); + + } } diff --git a/resources/views/pembida/detailspembayaran.blade.php b/resources/views/pembida/detailspembayaran.blade.php new file mode 100644 index 00000000..0f30a164 --- /dev/null +++ b/resources/views/pembida/detailspembayaran.blade.php @@ -0,0 +1,102 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
+ + + +
+ Butiran Pembayaran +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
RM
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ @foreach ($fileresit_all as $item) + + @endforeach +
+
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php index b8de45a8..0e32db9c 100644 --- a/resources/views/pembida/pembayaranbidaan.blade.php +++ b/resources/views/pembida/pembayaranbidaan.blade.php @@ -33,14 +33,15 @@ Bil Nama - No Kad Pengenalan + No Telefon Bilangan Surat - Jumlah Pembayaran(RM) - Jumlah Bidaan(RM) - Jenis Bayaran + + Jumlah Bidaan (RM) Status + Kaedah Bayaran Maklumat + Bayaran @@ -51,29 +52,36 @@ @foreach($listwinner as $winner) {{ $loop->iteration }} - {{ $winner['details']['name'] }} - {{ $winner['details']['nokp'] }} + {{ $winner['details']['name'] }} + {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat'] }} + {{ number_format($winner['totalBid'], 2, '.', ',') }} - {{ number_format($winner['totalPay'], 2, '.', ',') }} - @if($winner['jenisbayaran']['status'] == 1) - - @elseif($winner['jenisbayaran']['status'] == 2) - + @if($winner['jenisbayaran']['status_payment'] == 1) + + @else + @endif + + @if($winner['jenisbayaran']['kaedah_bayaran'] == 1) + + @elseif($winner['jenisbayaran']['kaedah_bayaran'] == 2) + + @elseif($winner['jenisbayaran']['kaedah_bayaran'] == 3) + + @endif + + + + @if($winner['jenisbayaran']['status_payment'] == 1) - - @else - + @endif - - - @php $totalsurat += $winner['total_surat']; @@ -84,11 +92,10 @@ - JUMLAH KESELURUHAN + JUMLAH KESELURUHAN {{$totalsurat}} {{ number_format($totalbid, 2, '.', ',') }} - {{ number_format($totalpay, 2, '.', ',') }} - + @@ -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: '', - // 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: '', - // action: function ( e, dt, node, config ) { - // $("#exportform").submit(); - // } - // } - // ] - }); + var tablesahsagonline = $('#sahsagonline').DataTable({}); // $('.addcaw').tooltip(); // $('.export').tooltip(); diff --git a/routes/web.php b/routes/web.php index b9cd941b..61d12824 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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