From 7b9a8634d7a4c9f5ea94806a6467063c06622d99 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 13 Mar 2023 17:15:31 +0800 Subject: [PATCH] update function edit rugi lelong dan caj lelong --- app/Http/Controllers/LelongController.php | 230 +++++++++++++++- .../views/lelong/senaraimarhundone.blade.php | 15 +- .../lelong/senaraiubahrugilelong.blade.php | 212 +++++++++++++++ .../lelong/senaraiubahrugilelongnew.blade.php | 250 ++++++++++++++++++ .../views/simulasi/showsimulasiall.blade.php | 2 +- routes/web.php | 3 + 6 files changed, 705 insertions(+), 7 deletions(-) create mode 100644 resources/views/lelong/senaraiubahrugilelong.blade.php create mode 100644 resources/views/lelong/senaraiubahrugilelongnew.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 3366a10b..08cbc750 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -6266,7 +6266,7 @@ class LelongController extends Controller $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; - $total_cazlelong = $total_cazlelong + $cal['bakiupah']; + $total_cazlelong = $total_cazlelong + $cal['cajlelong']; $total_hargajual = $total_hargajual + $cal['hargajual']; } @@ -7033,6 +7033,234 @@ class LelongController extends Controller ->with('success','Kemaskini Berjaya'); } + public function ubahrugilelong($lelongid, $cawid){ + $total_berat = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_bakiupah = 0; + $total_nilaimarhun = 0; + $keuntungan = 0; + $bakilelong = 0; + $total_cazlelong = 0; + $total_hargajual = 0; + // dd($cawid); + + $lelonglel = Lelong::with('cawangan')->find($lelongid); + + $cawanganDetail = $lelonglel->cawangan->find($cawid); + + $marhuns = LelongBid::where('caw_id', '=', $cawid) + ->where('lelong_id', '=', $lelongid) + ->where('status_jual', '=', 1) + ->where('baki', '<', 0.00) + ->get(); + // dd($marhuns); + $arraymarhun = []; + foreach ($marhuns as $index1=> $cal) { + array_push($arraymarhun,[ + 'norujukan' => $cal['norujukan'], + 'tempoh' => $cal['jbg'], + 'berat' => $cal['berat'], + 'nilaimarhun' => $cal['nilaimarhun'], + 'hargaasas' => $cal['hargaasas'], + 'hargajual' => $cal['hargajual'], + 'pinjaman' => $cal['pinjaman'], + 'bakiupah' => $cal['bakiupah'], + 'cajlelong' => $cal['cajlelong'], + 'baki' => $cal['baki'], + ]); + $total_berat = $total_berat + $cal['berat']; + $total_pinjaman = $total_pinjaman + $cal['pinjaman']; + $total_hargaasas = $total_hargaasas + $cal['hargaasas']; + $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; + $total_bakiupah = $total_bakiupah + $cal['bakiupah']; + $total_cazlelong = $total_cazlelong + $cal['cajlelong']; + $total_hargajual = $total_hargajual + $cal['hargajual']; + } + + $arrayinfo = []; + + $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelongid) + ->select('lelong_id','tarikh_lelong','lelong.fasa') + ->groupBy('lelong_id') + ->get()->toArray(); + + + foreach($lelong_id as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->where('caw_id',$cawid) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + return view('lelong.senaraiubahrugilelong',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat', + 'total_pinjaman', + 'total_upah', + 'total_hargaasas', + 'total_bakiupah', + 'total_nilaimarhun', + 'lelonglel', + 'cawanganDetail', + 'total_cazlelong', + 'total_hargajual')); + } + + public function cajrugilelong(Request $request){ + $total_berat = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_bakiupah = 0; + $total_nilaimarhun = 0; + $keuntungan = 0; + $bakilelong = 0; + $total_cazlelong = 0; + $total_bakilelong = 0; + $total_hargajual = 0; + $total_cajlelnew = 0; + $total_rugilelongnew = 0; + $newcajlel= 0; + $newbaki = 0; + $lelongid = $request->lelongid; + $cawid = $request->cawid; + $cajlelong = $request->cajlelong; + // dd($cajlelong); + + $lelonglel = Lelong::with('cawangan')->find($lelongid); + + $cawanganDetail = $lelonglel->cawangan->find($cawid); + + $marhuns = LelongBid::where('caw_id', '=', $cawid) + ->where('lelong_id', '=', $lelongid) + ->where('status_jual', '=', 1) + ->where('baki', '<', 0.00) + ->get(); + // dd($marhuns); + $arraymarhun = []; + foreach ($marhuns as $index1=> $cal) { + $cajlel = $cal['hargajual'] * ($cajlelong/100) ; + $cajlelnew = round($cajlel, 1, 1); + // dd($cajlelnew); + $rugilelongnew = $cal['hargajual'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelnew; + // dd($rugilelongnew); + //cajlelong baru + if($rugilelongnew < 0){ + $newbaki = $cajlelnew + $rugilelongnew; + if($newbaki > 0) + { + $newcajlel = $newbaki; + $newbaki = 0; + } + else { + $newcajlel = 0; + // $newbaki = 0; + } + }elseif($rugilelongnew > 0){ + $newcajlel = $cajlelnew; + $newbaki = $rugilelongnew; + } + + array_push($arraymarhun,[ + 'norujukan' => $cal['norujukan'], + 'lelongbid_id' => $cal['id'], + 'tempoh' => $cal['jbg'], + 'berat' => $cal['berat'], + 'nilaimarhun' => $cal['nilaimarhun'], + 'hargaasas' => $cal['hargaasas'], + 'hargajual' => $cal['hargajual'], + 'pinjaman' => $cal['pinjaman'], + 'bakiupah' => $cal['bakiupah'], + 'cajlelong' => $cajlelnew, + 'baki' => $rugilelongnew, + 'cajlelongnew' => $newcajlel, + 'rugilelongnew' => $newbaki, + ]); + $total_berat = $total_berat + $cal['berat']; + $total_pinjaman = $total_pinjaman + $cal['pinjaman']; + $total_hargaasas = $total_hargaasas + $cal['hargaasas']; + $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; + $total_bakiupah = $total_bakiupah + $cal['bakiupah']; + $total_cazlelong = $total_cazlelong + $cajlelnew; + $total_bakilelong = $total_bakilelong + $rugilelongnew; + $total_hargajual = $total_hargajual + $cal['hargajual']; + $total_cajlelnew = $total_cajlelnew + $newcajlel; + $total_rugilelongnew = $total_rugilelongnew + $newbaki; + + } + + $arrayinfo = []; + + $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelongid) + ->select('lelong_id','tarikh_lelong','lelong.fasa') + ->groupBy('lelong_id') + ->get()->toArray(); + + + foreach($lelong_id as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->where('caw_id',$cawid) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + return view('lelong.senaraiubahrugilelongnew',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat', + 'total_pinjaman', + 'total_upah', + 'total_hargaasas', + 'total_bakiupah', + 'total_nilaimarhun', + 'lelonglel', + 'cawanganDetail', + 'total_cazlelong', + 'total_bakilelong', + 'total_hargajual', + 'total_cajlelnew', + 'total_rugilelongnew','cajlelong')); + } + + public function editcajrugilelong(Request $request){ + $lelongbid_id = $request->lelongbid_id; + $norujukan = $request->norujukan; + $cajlelongnew = $request->cajlelongnew; + $rugilelongnew = $request->rugilelongnew; + $lelongid = $request->lelongid; + $cawid = $request->cawid; + $cajlelong = $request->cajlelong; + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + for($i=0; $ifirst(); + $updatecajrugilelong->baki = $rugilelongnew[$i]; + $updatecajrugilelong->cajlelong = $cajlelongnew[$i]; + $updatecajrugilelong->update(); + + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $norujukan[$i]; + $loguser->nota = 'Ubah Rugi Lelong: Caj '.$cajlelong.'%'; + $loguser->save(); + } + } + return redirect()->route('lelong.senaraimarhundone',['lelongid'=>$lelongid,'cawid'=>$cawid]) + ->with('success','Kemaskini Rugi Lelong Berjaya'); + } + + + diff --git a/resources/views/lelong/senaraimarhundone.blade.php b/resources/views/lelong/senaraimarhundone.blade.php index 5246f043..68a218e9 100644 --- a/resources/views/lelong/senaraimarhundone.blade.php +++ b/resources/views/lelong/senaraimarhundone.blade.php @@ -54,10 +54,10 @@ - {{--
- Muat Turun PDF - Senarai Mengikut Nama Pelanggan -
--}} +
+ {{-- Muat Turun PDF --}} + Ubah Rugi Lelong +
@csrf @@ -115,6 +115,8 @@ {{number_format($marhun['baki'], 2, '.', ',')}} @elseif($marhun['baki'] < 0 ) ({{number_format(-($marhun['baki']), 2, '.', ',')}}) + @else + 0.00 @endif @@ -137,8 +139,11 @@ {{ number_format($total_hargajual, 2, '.', ',') }} @if($bakilelong > 0) {{ number_format($bakilelong, 2, '.', ',') }} - @else + @elseif($bakilelong < 0) ({{number_format(-($bakilelong), 2, '.', ',')}}) + @else + 0.00 + @endif @endif {{-- --}} diff --git a/resources/views/lelong/senaraiubahrugilelong.blade.php b/resources/views/lelong/senaraiubahrugilelong.blade.php new file mode 100644 index 00000000..81c41760 --- /dev/null +++ b/resources/views/lelong/senaraiubahrugilelong.blade.php @@ -0,0 +1,212 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+
+
+ + + +
+ senarai Sag : {{ $cawanganDetail->caw_name }} +
+
+
+ @if ($message = Session::get('success')) +
+ {{ $message }} +
+ @endif + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + @endphp + + @csrf + + +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + {{-- --}} + + + + + + + + + + {{-- --}} + + + + @php + $rugilelong = 0; + $bakilelong = 0; + @endphp + @foreach ($marhuns as $index=> $marhun) + + + + {{-- --}} + + + + + + + + + @php + $rugi = 0; + $baki = 0; + if(strpos($marhun['baki'], '-') !== false) + { + $baki = -$marhun['baki']; + $bakilelong += $marhun['baki']; + } + else { + $baki = $marhun['baki']; + $bakilelong += $marhun['baki']; + } + @endphp + + + {{-- --}} + + + @endforeach + + + + + + + + + + + + + {{-- --}} + + + + +
NoNo RujukanNama PelangganTempohBerat (gm)Nilai Marhun Asal (RM)Pembiayaan (RM)Keuntungan (RM)Caj Lelong (RM)Harga Asas (RM)Harga Jual (RM)Baki Lelong (RM)Tindakan
{{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['nama']['nama']}}{{ number_format($marhun['jbg'], 2, '.', ',') }}{{ number_format($marhun['berat'], 2, '.', ',') }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'], 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}{{ number_format($marhun['hargajual'], 2, '.', ',') }}@if($marhun['baki'] > 0) + {{number_format($marhun['baki'], 2, '.', ',')}} + @elseif($marhun['baki'] < 0 ) + ({{number_format(-($marhun['baki']), 2, '.', ',')}}) + @endif + + +
JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_cazlelong, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_hargajual, 2, '.', ',') }}@if($bakilelong > 0) + {{ number_format($bakilelong, 2, '.', ',') }} + @else + ({{number_format(-($bakilelong), 2, '.', ',')}}) + @endif
+ + {{-- Kembali --}} + + +
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/lelong/senaraiubahrugilelongnew.blade.php b/resources/views/lelong/senaraiubahrugilelongnew.blade.php new file mode 100644 index 00000000..0db9f7a3 --- /dev/null +++ b/resources/views/lelong/senaraiubahrugilelongnew.blade.php @@ -0,0 +1,250 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
+ + + +
+ senarai Sags : {{ $cawanganDetail->caw_name }} +
+
+
+ @if ($message = Session::get('success')) +
+ {{ $message }} +
+ @endif + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + @endphp +
+ @csrf + + +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+ + + + + + + + +
+
+
+
+
+ +
+ +
+
+
+
+ + +
+ @csrf + + + + + + + + + {{-- --}} + + + + + + + + + + + + {{-- --}} + + + + @php + $rugilelong = 0; + $bakilelong = 0; + @endphp + @foreach ($arraymarhun as $index=> $marhun) + + + + {{-- --}} + + + + + + {{-- --}} + + + + @php + $rugi = 0; + $baki = 0; + if(strpos($marhun['baki'], '-') !== false) + { + $baki = -$marhun['baki']; + $bakilelong += $marhun['baki']; + } + else { + $baki = $marhun['baki']; + $bakilelong += $marhun['baki']; + } + @endphp + + + + + + {{-- --}} + + + @endforeach + + + + + + + + + + + + + {{-- --}} + + + + + + +
NoNo RujukanNama PelangganTempohBerat (gm)Nilai Marhun Asal (RM)Pembiayaan (RM)Keuntungan (RM)Caj Lelong (RM)Harga Asas (RM)Harga Jual (RM)Rugi Lelong (RM)Caj Lelong Baru (RM)Rugi Lelong Baru (RM)Tindakan
{{$loop->iteration}} {{ $marhun['norujukan']}}{{ $marhun['nama']['nama']}}{{ number_format($marhun['tempoh'], 2, '.', ',') }}{{ number_format($marhun['berat'], 2, '.', ',') }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'], 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}{{ number_format($marhun['hargajual'], 2, '.', ',') }}@if($marhun['baki'] > 0) + {{number_format($marhun['baki'], 2, '.', ',')}} + @elseif($marhun['baki'] < 0 ) + ({{number_format(-($marhun['baki']), 2, '.', ',')}}) + @endif + + {{ number_format($marhun['cajlelongnew'], 2, '.', ',') }}@if($marhun['rugilelongnew'] > 0) + + {{ number_format($marhun['rugilelongnew'], 2, '.', ',') }} + @else + + ({{number_format(-($marhun['rugilelongnew']), 2, '.', ',')}}) + @endif + +
JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_cazlelong, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_hargajual, 2, '.', ',') }}@if($total_bakilelong > 0) + {{ number_format($total_bakilelong, 2, '.', ',') }} + @else + ({{number_format(-($total_bakilelong), 2, '.', ',')}}) + @endif@if($bakilelong > 0) + {{ number_format($bakilelong, 2, '.', ',') }} + @else + ({{number_format(-($bakilelong), 2, '.', ',')}}) + @endif{{ number_format($total_cajlelnew, 2, '.', ',') }}@if($total_rugilelongnew > 0) + {{ number_format($total_rugilelongnew, 2, '.', ',') }} + @else + ({{number_format(-($total_rugilelongnew), 2, '.', ',')}}) + @endif
+
+ +
+ +
+
+
+ {{-- Kembali --}} + + +
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/simulasi/showsimulasiall.blade.php b/resources/views/simulasi/showsimulasiall.blade.php index 5c1d93fd..25703845 100644 --- a/resources/views/simulasi/showsimulasiall.blade.php +++ b/resources/views/simulasi/showsimulasiall.blade.php @@ -143,7 +143,7 @@ Cawangan Bil SAG Berat (gm) - Nilai Marhun Asal(RM) + Nilai Marhun Asal (RM) Pembiayaan (RM) Keuntungan (RM) Caj (RM) diff --git a/routes/web.php b/routes/web.php index 846ce572..92ad29e5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -182,6 +182,9 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/exporthargaemas/{lelong_id}',['as'=>'lelong.exporthargaemas','uses'=>'LelongController@exporthargaemas']); Route::get('/senaraimarhundone/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhundone','uses'=>'LelongController@senaraimarhundone']); + Route::get('/ubahrugilelong/{lelongid}/{cawid}', ['as'=>'lelong.ubahrugilelong','uses'=>'LelongController@ubahrugilelong']); + Route::post('/cajrugilelong', ['as'=>'lelong.cajrugilelong','uses'=>'LelongController@cajrugilelong']); + Route::post('/editcajrugilelong', ['as'=>'lelong.editcajrugilelong','uses'=>'LelongController@editcajrugilelong']); }); Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']);