From 984fae9a3ceec5db9a81f9a3deaebbe9bc5c2c98 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 13 Mar 2022 13:02:15 +0800 Subject: [PATCH] migration lelonngbid --- app/Http/Controllers/LelongController.php | 2 +- app/Http/Controllers/SimulasiController.php | 37 ++++ ...2021_12_14_041557_create_lelongs_table.php | 1 + .../views/simulasi/senaraimarhunsim.blade.php | 169 ++++++++++++++++++ .../views/simulasi/showsimulasi.blade.php | 2 +- routes/web.php | 2 + 6 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 resources/views/simulasi/senaraimarhunsim.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 703e20bc..7cd354a6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -674,7 +674,7 @@ class LelongController extends Controller } public function deletemarhun(Request $request){ - dd($request->checkboxdata); + // dd($request->checkboxdata); $data = $request->checkboxdata; foreach($data as $index=>$norujukan) { diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index a835a75f..384f362f 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -706,6 +706,43 @@ class SimulasiController extends Controller } + + public function senaraimarhunlel($lelongid, $cawid) + { + $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') + ->where('lelong_id','=',$lelongid) + ->where('caw_id','=',$cawid) + ->select( + 'lelongbid.t_lelong', + 'lelongbid.kodcaw', + 'cawangan.caw_name', + 'lelongbid.norujukan', + 'lelongbid.pinjaman', + 'lelongbid.berat', + 'lelongbid.nilaimarhun', + 'lelongbid.hargaasas', + 'lelongbid.upahsimpan', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.status_jual', + ) + ->get(); + + return view('lelong.senaraimarhunsim',compact('marhuns','lelongid','cawid')); + } + public function deletemarhunlel(Request $request){ + dd($request->checkboxdata); + + $data = $request->checkboxdata; + foreach($data as $index=>$norujukan) + { + $marhun = LelongBid::where('norujukan','=',$norujukan)->first(); + $marhun->delete(); + } + + return redirect()->route('lelong.senaraimarhunlel',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid]) + ->with('success','Delete Berjaya'); + } } \ No newline at end of file diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 3b375d54..09b63431 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -76,6 +76,7 @@ class CreateLelongsTable extends Migration $table->string('status_jual'); $table->string('status_payment'); $table->integer('status_semak')->default(0); + $table->datetime('diserahkan_pada')->nullable(); $table->string('mora_upah'); $table->timestamps(); diff --git a/resources/views/simulasi/senaraimarhunsim.blade.php b/resources/views/simulasi/senaraimarhunsim.blade.php new file mode 100644 index 00000000..d1461cd1 --- /dev/null +++ b/resources/views/simulasi/senaraimarhunsim.blade.php @@ -0,0 +1,169 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +
+ @csrf + + + + + + + + + + + + + + + + + + + + + + + @foreach ($marhuns as $index=> $marhun) + + + + + + + + + + + + + baki, '-') !== false) + { + $rugi = $marhun->baki; + } + else { + $baki = $marhun->baki; + } + ?> + + + + + + + @endforeach + + +
No.Tarikh LelongKod CawanganNama CawanganNorujukanPinjaman (RM)Berat (gm)Nilai Marhun (RM)Harga Asas (RM)Upah Simpan (RM)Caj Lelong (%)Rugi Lelong (RM)Baki Lelong (RM)Action
{{$index+1}}{{ $marhun->t_lelong }}{{ $marhun->kodcaw }}{{ $marhun->caw_name }}{{ $marhun->norujukan}}{{ $marhun->pinjaman }}{{ $marhun->berat }}{{ $marhun->nilaimarhun }}{{ $marhun->hargaasas }}{{ $marhun->upahsimpan }}{{ $marhun->cajlelong }}{{$rugi}}{{$baki}} + +
+
+ Kembali + +
+ {{-- Kembali --}} + +
+
+ +
+
+ +@endsection diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 1a609260..824871ab 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -73,7 +73,7 @@ @foreach ($arraycaw as $index=>$caw) {{$index+1}} - {{ $caw['cawangan'] }} + {{ $caw['cawangan'] }} {{ $caw['t_lelong'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} diff --git a/routes/web.php b/routes/web.php index a87f717c..85e748e3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -59,6 +59,8 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct Route::get('/senaraisimulasi',['as'=>'analisa.senaraisimulasi','uses'=>'SimulasiController@senaraisimulasi']); Route::get('/showsimulasi/{id}',['as'=>'analisa.show','uses'=>'SimulasiController@show']); Route::get('/deletesimulasi/{id}',['as'=>'analisa.delete','uses'=>'SimulasiController@delete']); + Route::get('/senaraimarhunlel/{lelongid}/{cawid}',['as'=>'analisa.senaraimarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); + Route::get('/deletemarhunlel',['as'=>'analisa.deletemarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']);