From 0158fa195da11831639992a24c56d01117873a03 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:45:01 +0800 Subject: [PATCH] update lap lelong full --- app/Http/Controllers/LelongController.php | 69 ++++++++++- resources/views/includes/sidebar.blade.php | 13 +- resources/views/lelong/laplelong.blade.php | 117 ++++++++++++++++++ .../views/lelong/laplelongindex.blade.php | 73 +++++++++++ .../views/lelong/laporanbidaanindex.blade.php | 2 +- .../views/lelong/senaraibrglelong.blade.php | 18 ++- .../views/lelong/senarailapbidaan.blade.php | 2 +- routes/web.php | 15 ++- 8 files changed, 287 insertions(+), 22 deletions(-) create mode 100644 resources/views/lelong/laplelong.blade.php create mode 100644 resources/views/lelong/laplelongindex.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 3641d8c0..6617f9d2 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -795,7 +795,7 @@ class LelongController extends Controller } - public function laporansenarailelong(Request $request){ + public function lapbrglelongindex (Request $request){ // $user = Auth::user(); @@ -815,19 +815,28 @@ class LelongController extends Controller ->get()->toArray(); $keuntungan=0; - + $total_hargaasas = 0; + $total_upahkeuntungan = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + foreach($brglelong as $index1=>$upah) { - + $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); $brglelong[$index1]['keuntungan'] = $keuntungan; - + + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_upahkeuntungan = $total_upahkeuntungan + $keuntungan; + $total_nmarhun = $total_nmarhun + $upah['nilaimarhun']; + $total_pinjaman = $total_pinjaman + $upah['pinjaman']; + } - return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan')); + return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); } @@ -874,7 +883,7 @@ class LelongController extends Controller } - public function lapbidaan (Request $request){ + public function lapbidaanpembidaindex (Request $request){ @@ -951,6 +960,54 @@ class LelongController extends Controller return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); } + + Public function laplelongindex (Request $request){ + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->get(); + + return view('lelong.laplelongindex',compact('lelongid')); + + + } + + Public function laplelong ($lelong_id){ + + + $total_nmarhun = 0; + $total_pembiayaan = 0; + $total_upahsimpan = 0; + $total_cajlelong = 0; + $total_hargalelong = 0; + $total_bakirugi = 0; + $total_hargaasas = 0; + + $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbidder.status_bidder','=','1') + ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', + 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') + ->get()->toArray(); + + foreach($laporanlelong as $index1=>$laplelong) + { + + $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; + $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; + $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan']; + $total_cajlelong = $total_cajlelong + $laplelong['cajlelong']; + $total_hargalelong = $total_hargalelong $laplelong['hargabida']; + $total_bakirugi = $total_bakirugi + $laplelong['baki']; + $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; + + } + + + return view('lelong.laplelong', compact('laporanlelong','lelong_id','total_nmarhun')); + + + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d8812d1a..7994b3f1 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -139,13 +139,18 @@
  • +
    • diff --git a/resources/views/lelong/laplelong.blade.php b/resources/views/lelong/laplelong.blade.php new file mode 100644 index 00000000..4c4b1e48 --- /dev/null +++ b/resources/views/lelong/laplelong.blade.php @@ -0,0 +1,117 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + @csrf + + + + + + + + + + + + + + + + + + + + + @foreach ($laporanlelong as $laporan) + + + + + + + + + + + + + + + + @endforeach + + + + + + + {{-- + + + --}} + + + + + + +
    NoNo RujukanNilai MarhunPembiayaanUpah SimpanCaj LelongHarga LelongBaki RugiHarga AsasNama Pembeli
    {{ $loop->iteration }}{{ $laporan['norujukan']}}{{ $laporan['nilaimarhun']}}{{ $laporan['pinjaman']}}{{ $laporan['upahsimpan']}}{{ $laporan['cajlelong']}}{{ $laporan['hargabida']}}{{ $laporan['baki']}}{{ $laporan['hargaasas']}}{{ $laporan['nama_bidder']}}
    JUMLAH KESELURUHAN{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_upahkeuntungan, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}
    +
    + Kembali +
    +
    +
    +
    + + +@endsection diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php new file mode 100644 index 00000000..7d38fb82 --- /dev/null +++ b/resources/views/lelong/laplelongindex.blade.php @@ -0,0 +1,73 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + @foreach ($lelongid as $bid) + + + + + + + + @endforeach + + +
    Lelong IDCawanganTarikh LelongAction
    {{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} + +
    + +
    + +
    +
    + + +@endsection diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index 1d88ddfe..3d2a68e5 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -31,7 +31,7 @@ {{ $bid->caw_name}} {{ $bid->tarikh_lelong }} - + @endforeach diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 31c4aed7..bb269bbf 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -46,13 +46,19 @@ - {{-- JUMLAH KESELURUHAN - {{ number_format($tot_hargaasas, 2, '.', ',') }} --}} + JUMLAH KESELURUHAN + {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_upahkeuntungan, 2, '.', ',') }} + + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_pinjaman, 2, '.', ',') }} + +
    - Kembali + Kembali
    @@ -73,14 +79,14 @@ "info": false, "lengthChange": false, - "pageLength": 15, + "pageLength": 999999999, dom: 'Bfrtip', buttons: [ { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - // titleAttr: 'Download to PDF', + className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export', + titleAttr: 'Download to PDF', text: 'PDF', action: function ( e, dt, node, config ) { $("#exportform").submit(); diff --git a/resources/views/lelong/senarailapbidaan.blade.php b/resources/views/lelong/senarailapbidaan.blade.php index b920a256..74687603 100644 --- a/resources/views/lelong/senarailapbidaan.blade.php +++ b/resources/views/lelong/senarailapbidaan.blade.php @@ -56,7 +56,7 @@
    - Kembali + Kembali
    diff --git a/routes/web.php b/routes/web.php index 6bf71fae..300581f3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -89,15 +89,22 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/laporansenarailelong',['as'=>'lelong.laporansenarailelong','uses'=>'LelongController@laporansenarailelong']); - Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); - Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); - Route::get('/lapbidaan', ['as'=>'lelong.lapbidaan','uses'=>'LelongController@lapbidaan']); + + + Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); + Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); + Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); + + Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']); Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); Route::post('/pdfsenarailapbidaan',['as' =>'lelong.pdfsenarailapbidaan','uses'=>'LelongController@pdfsenarailapbidaan']); + Route::get('/laplelongindex',['as' =>'lelong.laplelongindex','uses'=>'LelongController@laplelongindex']); + Route::get('/laplelong/{lelong_id}',['as' =>'lelong.laplelong','uses'=>'LelongController@laplelong']); + + });