From 6b77f34e6210f1efd250e9b98d64280b4714f719 Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Tue, 22 Nov 2022 12:17:38 +0800 Subject: [PATCH 1/5] pengurusan pengguna --- app/Http/Controllers/PenggunaController.php | 67 ++++++++++++--------- resources/views/pembida/kemaskini.blade.php | 6 +- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index da6485aa..fe55e4e1 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -72,40 +72,51 @@ class PenggunaController extends Controller 'username' => 'required|string|unique:users' ]); - if ($validator->fails()) { - $errors = [ - 'success' => "error", - 'message' => $validator->errors() + // if ($validator->fails()) { + // $errors = [ + // 'success' => "error", + // 'message' => $validator->errors() - ]; + // ]; - return redirect()->route('pengguna.index') - ->with('message', 'Sila Masukkan Email Yang Sah'); } + // return redirect()->route('pengguna.index') + // ->with('message', 'Sila Masukkan Email Yang Sah'); } - $user = new User; - $user->name = $request->name; - $user->username = $request->username; - $user->kodcaw = $request->caw; - $user->status = 'active'; - $user->t_daftar = $currentdate; - $user->email = $request->email; - $user->email_verified_at = $currentdate; - $user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password - $user->user_type = 1; - $user->save(); + //check if user already existed + $check = User::where('username',$request->username) + ->orWhere('email',$request->email) + ->first(); - $allroles = Role::all()->pluck('name'); - $arraytaraf = []; - foreach($allroles as $index=>$taraf) { - $req = 'taraf'.$taraf; - if($request->$req) + if($check) { - array_push($arraytaraf,$taraf); + return redirect()->route('pengguna.index')->with('failed','Maaf, Nama Pengguna / Emel Berikut Telah Wujud !'); + } else { + $user = new User; + $user->name = $request->name; + $user->username = $request->username; + $user->kodcaw = $request->caw; + $user->status = 'active'; + $user->t_daftar = $currentdate; + $user->email = $request->email; + $user->email_verified_at = $currentdate; + $user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password + $user->user_type = 1; + $user->save(); + + $allroles = Role::all()->pluck('name'); + $arraytaraf = []; + foreach($allroles as $index=>$taraf) { + $req = 'taraf'.$taraf; + if($request->$req) + { + array_push($arraytaraf,$taraf); + } + } + $user->syncRoles($arraytaraf); + return redirect()->route('pengguna.index') + ->with('success', 'Pengguna Berjaya Disimpan'); } - } - $user->syncRoles($arraytaraf); - return redirect()->route('pengguna.index') - ->with('success', 'Pengguna Berjaya Disimpan'); + } public function store(Request $request) diff --git a/resources/views/pembida/kemaskini.blade.php b/resources/views/pembida/kemaskini.blade.php index 10774656..c8cac593 100644 --- a/resources/views/pembida/kemaskini.blade.php +++ b/resources/views/pembida/kemaskini.blade.php @@ -43,16 +43,16 @@
-
- +
-
From 171cdbba37ccebaac7f3debf23179d73c7615117 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 22 Nov 2022 16:27:39 +0800 Subject: [PATCH 2/5] update pengesahan oleh pc --- app/Http/Controllers/LelongController.php | 1 + app/Http/Controllers/MarhunController.php | 25 +++++- ...2021_12_14_041557_create_lelongs_table.php | 3 +- resources/views/marhun/marhun.blade.php | 4 +- .../listperubahanmutumarhun.blade.php | 90 ++++++++++++++++--- 5 files changed, 103 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index e3dab427..e15a2510 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -620,6 +620,7 @@ class LelongController extends Controller $lelongbidmarhun->bil = $simbidmarhun->bil; $lelongbidmarhun->marhun = $simbidmarhun->marhun; $lelongbidmarhun->nota = $simbidmarhun->nota; + $lelongbidmarhun->old_marhun = $simbidmarhun->marhun; $lelongbidmarhun->old_karat = $simbidmarhun->karat; $lelongbidmarhun->old_berat = $simbidmarhun->berat; $lelongbidmarhun->old_harga = $simbidmarhun->harga; diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index e475e46f..e9b7b021 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -1730,10 +1730,11 @@ class MarhunController extends Controller $user = Auth::user(); - $cawangan = Pengesahan::join('users', 'pengesahan.diminta_oleh', 'users.id') - ->where('pengesahan.lelong_id', $id) + $cawangan = Pengesahan::where('pengesahan.lelong_id', $id) + ->where('pengesahan.status', 1) ->whereNotNull('pengesahan.disahkan_oleh') - ->select('pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id', 'users.id as user_id', 'users.name', 'users.username', 'users.kodcaw') + ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id') + ->orderBy('pengesahan.lelongbid_id') ->distinct() ->get(); // dd($cawangan); @@ -1741,6 +1742,7 @@ class MarhunController extends Controller foreach($cawangan as $index1=>$caw) { // dd($caw); + $getpengesahan = Cawangan::where('caw_code', $caw['kodcaw'])->first(); // dd($getpengesahan); @@ -1748,9 +1750,22 @@ class MarhunController extends Controller $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first(); // dd($getdisahkanoleh); - $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; + // dd(/$caw['lelongbid_id']); + $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id']) + ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') + ->get(); + // dump($status); + + // $marhun= LelongBidMarhun::where('lelongbid_id','=',$caw['lelongbid_id']) + // ->get(); + $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id']) + ->get()->toArray(); + // dd($marhuns); + // $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name']; $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name']; + $cawangan[$index1]['detailmarhun']=$status; + $cawangan[$index1]['detail']=$marhuns; } return view('pengesahan.listperubahanmutumarhun', compact('cawangan', 'id')); @@ -2386,5 +2401,7 @@ class MarhunController extends Controller } + + } 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 82311997..1dc55c27 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -123,7 +123,8 @@ class CreateLelongsTable extends Migration $table->bigIncrements('id'); $table->unsignedBigInteger('lelongbid_id')->unsigned(); $table->decimal('bil', $precision = 3, $scale = 0); - $table->string('marhun'); + $table->string('old_marhun'); + $table->string('marhun'); $table->string('nota')->nullable(); $table->string('old_karat'); $table->string('karat'); diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 7de5f10b..66dd01ff 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -169,11 +169,11 @@ @elseif($status['status'] == 1) @else - + + @endif {{-- --}} @elseif($lelongbid->status_semak == 1) diff --git a/resources/views/pengesahan/listperubahanmutumarhun.blade.php b/resources/views/pengesahan/listperubahanmutumarhun.blade.php index 4016aaac..cde3c494 100644 --- a/resources/views/pengesahan/listperubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/listperubahanmutumarhun.blade.php @@ -13,40 +13,104 @@ Senarai SAG: Pengesahan Oleh PC +
@if ($message = Session::get('success'))

{{ $message }}

@endif - +
- - + {{-- --}} + {{-- --}} + + + + + + + - - + {{-- + --}} - @foreach($cawangan as $marhun) + {{-- @foreach($cawangan as $marhun) --}} + @forelse($cawangan as $marhun) - - + {{-- --}} + {{-- --}} - - + {{-- {{dd($marhun['detailmarhun'])}} --}} + + + + + + + + + + {{-- --}} + {{-- --}} - @endforeach + @empty + + + + + @endforelse
BilID LelongCawanganID LelongCawanganNo RujukanPerubahanMarhun AsalMarhun BaruMutu AsalMutu BaruBerat Asal (gm)Berat Baru (gm) StatusDiminta OlehDisahkan OlehDiminta OlehDisahkan Oleh
{{ $loop->iteration }}{{ $marhun['lelong_id'] }}{{ $marhun['namacaw'] }}{{ $marhun['lelong_id'] }}{{ $marhun['namacaw'] }}{{ $marhun['norujukan'] }} - - {{ $marhun['diminta_oleh'] }}{{ $marhun['disahkan_oleh'] }}@foreach ($marhun['detailmarhun'] as $item) + @if($item['status_ubah'] == 1) + Mutu + @elseif($item['status_ubah'] == 2) + Pertambahan Marhun + @elseif($item['status_ubah'] == 3) + Hapus Marhun + @elseif($item['status_ubah'] == 4) + Berat + @elseif($item['status_ubah'] == 5) + Mutu & Berat + @elseif($item['status_ubah'] == 7) + Marhun + @elseif($item['status_ubah'] == 8) + Mutu, Berat & Marhun + @elseif($item['status_ubah'] == 9) + Mutu & Marhun + @elseif($item['status_ubah'] == 10) + Berat & Marhun + @endif +
+ @endforeach		@foreach ($marhun['detail'] as $item) + {{$item['old_marhun']}}
+ @endforeach		@foreach ($marhun['detailmarhun'] as $item) + @if($item['request_marhun'] == null) + @else + + @endif {{$item['request_marhun']}}
+ @endforeach		@foreach ($marhun['detail'] as $item) + {{$item['old_karat']}}
+ @endforeach		@foreach ($marhun['detailmarhun'] as $item) + @if($item['request_karat'] == null) + @else + + @endif{{$item['request_karat']}}
+ @endforeach		@foreach ($marhun['detail'] as $item) + {{$item['old_berat']}}
+ @endforeach		@foreach ($marhun['detailmarhun'] as $item) + @if($item['request_berat'] == null) + @else + + @endif{{$item['request_berat']}}
+ @endforeach		{{ $marhun['diminta_oleh'] }}{{ $marhun['disahkan_oleh'] }}
No Data
From e9cfa539fcc2b6bb288ca3c8682c8230f260cb78 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 23 Nov 2022 00:45:41 +0800 Subject: [PATCH 3/5] update idlelong kepada batch lelong --- app/Http/Controllers/NotisController.php | 4 ++-- resources/views/account/senarailelongan.blade.php | 2 +- resources/views/home.blade copy 2.php | 8 ++++---- resources/views/home.blade copy.php | 2 +- resources/views/home.blade.php | 8 ++++---- resources/views/home/senarailelongubahmutu.blade.php | 2 +- resources/views/home00.blade.php | 8 ++++---- resources/views/homexxxx.blade.php | 8 ++++---- resources/views/jananotis/notislelong.blade.php | 2 +- resources/views/jurulelong/listcawangan.blade.php | 2 +- resources/views/jurulelong/listpemenang.blade.php | 2 +- resources/views/jurulelong/senaraipemenangbycaw.blade.php | 2 +- resources/views/lelong/brgleldetails.blade.php | 2 +- resources/views/lelong/currentlelong.blade.php | 2 +- resources/views/lelong/exportData.blade.php | 2 +- resources/views/lelong/indexbrgleldetailscaw.blade.php | 2 +- resources/views/lelong/indexbrglelpembidacaw.blade.php | 2 +- resources/views/lelong/indexlelfullcaw.blade.php | 2 +- resources/views/lelong/indexnamapembidacaw.blade.php | 2 +- resources/views/lelong/lapbrglelpembida.blade.php | 2 +- resources/views/lelong/lapbrglelpembidaindex.blade.php | 2 +- resources/views/lelong/laplelong.blade.php | 3 +-- resources/views/lelong/laplelongindex.blade.php | 2 +- resources/views/lelong/laporanbidaanindex.blade.php | 2 +- resources/views/lelong/laporancawindex.blade.php | 2 +- resources/views/lelong/lelongtaklaku.blade.php | 2 +- resources/views/lelong/lelongtebusindex.blade.php | 2 +- resources/views/lelong/listsagpindah.blade.php | 8 ++++---- resources/views/lelong/pindahsenarailelong.blade.php | 2 +- resources/views/lelong/senarailelong.blade.php | 8 ++++---- resources/views/lelong/senarailelongpc.blade.php | 2 +- resources/views/lelong/senarailelongtaklaku.blade.php | 2 +- resources/views/lelong/senaraimarhunpc.blade.php | 2 +- resources/views/lelong/senaraimarhunsimulasi.blade.php | 2 +- resources/views/lelong/senaraipemenang.blade.php | 2 +- resources/views/lelong/showpindah.blade.php | 4 ++-- resources/views/lelong/showrenewxlaku.blade.php | 4 ++-- resources/views/lelong/showtukartarikh.blade.php | 4 ++-- resources/views/lelong/tukartarikhlelong.blade.php | 2 +- resources/views/lelongkhas/jadualN.blade.php | 2 +- resources/views/lelongkhas/jadualO.blade.php | 2 +- resources/views/lelongkhas/laporanlelong.blade.php | 2 +- resources/views/lelongkhas/laporantuntutbaki.blade.php | 2 +- resources/views/lelongkhas/resitpemenang.blade.php | 2 +- resources/views/lelongkhas/sandarankpkt.blade.php | 2 +- resources/views/lelongkhas/sandaranpembida.blade.php | 2 +- resources/views/lelongkhas/senarailelongkhas.blade.php | 2 +- resources/views/lelongkhas/senaraimarhunkhas.blade.php | 2 +- .../views/lelongkhas/senaraimarhunkhastelahjual.blade.php | 2 +- resources/views/lelongkhas/tambahhargajual.blade.php | 2 +- resources/views/marhun/ubahmarhun.blade.php | 2 +- resources/views/pdf/brglelcaw.blade.php | 2 +- resources/views/pdf/cetakbdbrglelong.blade.php | 2 +- resources/views/pdf/cetakkeluarscanbarcode.blade.php | 2 +- resources/views/pdf/cetakkeluarscanbarcodejual.blade.php | 2 +- resources/views/pdf/cetakmasukscanbarcode.blade.php | 2 +- resources/views/pdf/cetakterimaserahmarhun.blade.php | 2 +- resources/views/pdf/laporanbrgleldetailscaw.blade.php | 2 +- resources/views/pdf/laporanbrglelpembidacaw.blade.php | 2 +- resources/views/pdf/laporanlelfullcaw.blade.php | 2 +- resources/views/pdf/laporannamapembidacaw.blade.php | 2 +- resources/views/pdf/listlelong.blade.php | 2 +- resources/views/pdf/listlelongdetails.blade.php | 2 +- resources/views/pdf/listubahmarhun.blade.php | 2 +- resources/views/pdf/pdflapbrglelpembida.blade.php | 2 +- resources/views/pdf/pdflaplelong.blade.php | 2 +- resources/views/pdf/pdflelongreport.blade.php | 2 +- resources/views/pdf/pdflelongreportpc.blade.php | 2 +- resources/views/pdf/pdflelongtaklaku.blade.php | 2 +- resources/views/pdf/pdflelongtebus.blade.php | 2 +- resources/views/pdf/pdfsenarailapbidaan.blade.php | 2 +- resources/views/pdfkhas/cetakjadualN.blade.php | 2 +- resources/views/pdfkhas/cetakjadualO.blade.php | 2 +- resources/views/pdfkhas/cetaklaporanlelong.blade.php | 2 +- resources/views/pdfkhas/cetaklaporantuntutbaki.blade.php | 4 ++-- resources/views/pdfkhas/cetaksandarankpkt.blade.php | 2 +- resources/views/pdfkhas/cetaksandaranpembida.blade.php | 2 +- resources/views/pembayaran/senarailelongbayaran.blade.php | 2 +- resources/views/pembayaran/testbillplz.blade.php | 2 +- .../views/pembida/listkebenaranbayarantunai.blade.php | 2 +- resources/views/pembida/senlelbelumbayarbidaan.blade.php | 2 +- resources/views/pembida/senlelpembayaranbidaan.blade.php | 2 +- resources/views/pengesahan/senarailelong.blade.php | 2 +- .../views/pengesahan/senarailelongubahmutu.blade.php | 2 +- resources/views/pengesahan/senaraitangguhlelong.blade.php | 2 +- resources/views/serahan/laporanserahan.blade.php | 2 +- resources/views/serahan/senarailelongbayaran.blade.php | 2 +- resources/views/simulasi/senaraisimulasi.blade.php | 2 +- .../views/tangguhlelong/senarailelongtangguh.blade.php | 2 +- .../views/tangguhlelong/senarailelongtangguh.blade00.php | 2 +- .../views/tangguhlelong/senaraimohontangguh.blade.php | 2 +- resources/views/tangguhlelong/senleltangguh.blade.php | 2 +- resources/views/tangguhlelong/senleltlhtangguh.blade.php | 2 +- 93 files changed, 116 insertions(+), 117 deletions(-) diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index b4820721..fbce6251 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -183,7 +183,7 @@ class NotisController extends Controller $pdf = PDF::loadView('pdf.jananotis',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag')) ->setPaper('a4', 'potrait'); - return $pdf->download('Penjanaan Notis Fasa 1: ID Lelong '.$lelong_id.'.pdf'); + return $pdf->download('Penjanaan Notis Fasa 1:Batch Lelong '.$lelong_id.'.pdf'); } @@ -386,7 +386,7 @@ class NotisController extends Controller $pdf = PDF::loadView('pdf.jananotisfasa2',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag')) ->setPaper('a4', 'potrait'); - return $pdf->download('Penjanaan Notis Fasa 2: ID Lelong '.$lelong_id.'.pdf'); + return $pdf->download('Penjanaan Notis Fasa 2:Batch Lelong '.$lelong_id.'.pdf'); } diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php index 78d07568..918cb77d 100644 --- a/resources/views/account/senarailelongan.blade.php +++ b/resources/views/account/senarailelongan.blade.php @@ -15,7 +15,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Fasa diff --git a/resources/views/home.blade copy 2.php b/resources/views/home.blade copy 2.php index f2422eb1..1bb08742 100644 --- a/resources/views/home.blade copy 2.php +++ b/resources/views/home.blade copy 2.php @@ -55,7 +55,7 @@ No - ID Lelong + Batch Lelong Cawangan Tarikh Lelong Harga Emas Asas @@ -138,7 +138,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan @@ -286,7 +286,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export @@ -347,7 +347,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong {{-- Cawangan --}} Nama diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php index 36e85f03..5fbbd5d6 100644 --- a/resources/views/home.blade copy.php +++ b/resources/views/home.blade copy.php @@ -32,7 +32,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 932e769b..ab195b48 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -119,7 +119,7 @@ No - ID Lelong + Batch Lelong Cawangan Tarikh Lelong Harga Emas Asas @@ -202,7 +202,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan @@ -327,7 +327,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export @@ -388,7 +388,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong {{-- Cawangan --}} Nama diff --git a/resources/views/home/senarailelongubahmutu.blade.php b/resources/views/home/senarailelongubahmutu.blade.php index 1d408c52..25011b97 100644 --- a/resources/views/home/senarailelongubahmutu.blade.php +++ b/resources/views/home/senarailelongubahmutu.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Cawangan Tarikh Lelong Harga Emas Asas diff --git a/resources/views/home00.blade.php b/resources/views/home00.blade.php index edfcef44..3213870f 100644 --- a/resources/views/home00.blade.php +++ b/resources/views/home00.blade.php @@ -55,7 +55,7 @@ No - ID Lelong + Batch Lelong Cawangan Tarikh Lelong Harga Emas Asas @@ -138,7 +138,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan @@ -271,7 +271,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export @@ -332,7 +332,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong {{-- Cawangan --}} Nama diff --git a/resources/views/homexxxx.blade.php b/resources/views/homexxxx.blade.php index b0f7f118..3035e448 100644 --- a/resources/views/homexxxx.blade.php +++ b/resources/views/homexxxx.blade.php @@ -55,7 +55,7 @@ No - ID Lelong + Batch Lelong Cawangan Tarikh Lelong Harga Emas Asas @@ -139,7 +139,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan @@ -263,7 +263,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export @@ -326,7 +326,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong {{-- Cawangan --}} Nama diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php index d3c97a34..4ffaba07 100644 --- a/resources/views/jananotis/notislelong.blade.php +++ b/resources/views/jananotis/notislelong.blade.php @@ -16,7 +16,7 @@ {{-- --}} - ID Lelong + Batch Lelong Tarikh Lelong Fasa Bilangan SAG diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php index c96e62fe..5d2c34f9 100644 --- a/resources/views/jurulelong/listcawangan.blade.php +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Nama Cawangan Harga Emas Asas diff --git a/resources/views/jurulelong/listpemenang.blade.php b/resources/views/jurulelong/listpemenang.blade.php index 1130b14e..6815ef3c 100644 --- a/resources/views/jurulelong/listpemenang.blade.php +++ b/resources/views/jurulelong/listpemenang.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Nama Cawangan Fasa diff --git a/resources/views/jurulelong/senaraipemenangbycaw.blade.php b/resources/views/jurulelong/senaraipemenangbycaw.blade.php index 119cff2a..7b7340c4 100644 --- a/resources/views/jurulelong/senaraipemenangbycaw.blade.php +++ b/resources/views/jurulelong/senaraipemenangbycaw.blade.php @@ -20,7 +20,7 @@ No - ID Lelong + Batch Lelong Nama No Kad Pengenalan No Telefon diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php index 91b26cb3..1fcf1161 100644 --- a/resources/views/lelong/brgleldetails.blade.php +++ b/resources/views/lelong/brgleldetails.blade.php @@ -17,7 +17,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan diff --git a/resources/views/lelong/currentlelong.blade.php b/resources/views/lelong/currentlelong.blade.php index a1df1c3f..14df950b 100644 --- a/resources/views/lelong/currentlelong.blade.php +++ b/resources/views/lelong/currentlelong.blade.php @@ -15,7 +15,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan diff --git a/resources/views/lelong/exportData.blade.php b/resources/views/lelong/exportData.blade.php index 38a70b2e..380919e1 100644 --- a/resources/views/lelong/exportData.blade.php +++ b/resources/views/lelong/exportData.blade.php @@ -14,7 +14,7 @@ {{ $message }}
@endif -

ID Lelong: {{$lelong['id']}}

+

Batch Lelong: {{$lelong['id']}}

Tarikh Lelong: {{$lelong['tarikh_lelong']}}

Masa Mula Lelong: {{$lelong['masamula_lelong']}}

Masa Tamat Lelong: {{$lelong['masatamat_lelong']}}

diff --git a/resources/views/lelong/indexbrgleldetailscaw.blade.php b/resources/views/lelong/indexbrgleldetailscaw.blade.php index fccc46ac..cceca29d 100644 --- a/resources/views/lelong/indexbrgleldetailscaw.blade.php +++ b/resources/views/lelong/indexbrgleldetailscaw.blade.php @@ -18,7 +18,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Muat Turun diff --git a/resources/views/lelong/indexbrglelpembidacaw.blade.php b/resources/views/lelong/indexbrglelpembidacaw.blade.php index 24f59b05..bd835699 100644 --- a/resources/views/lelong/indexbrglelpembidacaw.blade.php +++ b/resources/views/lelong/indexbrglelpembidacaw.blade.php @@ -18,7 +18,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Muat Turun diff --git a/resources/views/lelong/indexlelfullcaw.blade.php b/resources/views/lelong/indexlelfullcaw.blade.php index ad430d78..c1768832 100644 --- a/resources/views/lelong/indexlelfullcaw.blade.php +++ b/resources/views/lelong/indexlelfullcaw.blade.php @@ -18,7 +18,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Muat Turun diff --git a/resources/views/lelong/indexnamapembidacaw.blade.php b/resources/views/lelong/indexnamapembidacaw.blade.php index 5d4b98aa..78d3bdee 100644 --- a/resources/views/lelong/indexnamapembidacaw.blade.php +++ b/resources/views/lelong/indexnamapembidacaw.blade.php @@ -18,7 +18,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Muat Turun diff --git a/resources/views/lelong/lapbrglelpembida.blade.php b/resources/views/lelong/lapbrglelpembida.blade.php index 845c6fb3..a0a8269a 100644 --- a/resources/views/lelong/lapbrglelpembida.blade.php +++ b/resources/views/lelong/lapbrglelpembida.blade.php @@ -6,7 +6,7 @@
@foreach ($info as $info) Laporan Barang Lelong Pembida - Lelong ID: {{ $lelong_id}} + Batch Lelong: {{ $lelong_id}} Cawangan: {{ $info->caw_name}} Tarikh Lelong: {{ $info->tarikh_lelong}}
@endforeach diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index e8dd8f1a..d551906f 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -16,7 +16,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan diff --git a/resources/views/lelong/laplelong.blade.php b/resources/views/lelong/laplelong.blade.php index 1a7fc631..57f16dd4 100644 --- a/resources/views/lelong/laplelong.blade.php +++ b/resources/views/lelong/laplelong.blade.php @@ -6,7 +6,7 @@
@foreach ($lelongid as $info) Laporan Lelong Keseluruhan - Lelong ID: {{ $lelong_id}} + Batch Lelong: {{ $lelong_id}} Cawangan: {{ $info->caw_name}} Tarikh Lelong: {{ $info->tarikh_lelong}}
@endforeach @@ -35,7 +35,6 @@ Rugi Harga Asas Nama Pembeli - diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index 61304403..10b589d0 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -16,7 +16,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index 8efbd39e..e8e73282 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -17,7 +17,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php index bec7916c..09d15f52 100644 --- a/resources/views/lelong/laporancawindex.blade.php +++ b/resources/views/lelong/laporancawindex.blade.php @@ -18,7 +18,7 @@ Bil - ID Lelong + Batch Lelong Tarikh Lelong Fasa Muat Turun diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 134e29e2..d503f0ba 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -10,7 +10,7 @@ - + @foreach ($info as $info) - + diff --git a/resources/views/lelong/listsagpindah.blade.php b/resources/views/lelong/listsagpindah.blade.php index b745adc8..774b8024 100644 --- a/resources/views/lelong/listsagpindah.blade.php +++ b/resources/views/lelong/listsagpindah.blade.php @@ -8,10 +8,10 @@ - Senarai Lelong(Pindah ID Lelong) + Senarai Lelong(Pindah Batch Lelong) @foreach ($arrayinfo as $laporan) - ID Lelong : {{ $laporan['laporan']['lelong_id']}} + Batch Lelong : {{ $laporan['laporan']['lelong_id']}}Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $datez = $myDateTime->format('d-m-Y'); @@ -36,9 +36,9 @@
Pindah Ke-
diff --git a/resources/views/lelong/pindahsenarailelong.blade.php b/resources/views/lelong/pindahsenarailelong.blade.php index 34ec1cbe..bb093553 100644 --- a/resources/views/lelong/pindahsenarailelong.blade.php +++ b/resources/views/lelong/pindahsenarailelong.blade.php @@ -16,7 +16,7 @@ - + diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index a17e7685..982a6717 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -52,7 +52,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -185,7 +185,7 @@ - + diff --git a/resources/views/lelong/senarailelongpc.blade.php b/resources/views/lelong/senarailelongpc.blade.php index 3143c380..caef7795 100644 --- a/resources/views/lelong/senarailelongpc.blade.php +++ b/resources/views/lelong/senarailelongpc.blade.php @@ -23,7 +23,7 @@ - + diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php index 95ca068c..5ecce18b 100644 --- a/resources/views/lelong/senarailelongtaklaku.blade.php +++ b/resources/views/lelong/senarailelongtaklaku.blade.php @@ -16,7 +16,7 @@ - + diff --git a/resources/views/lelong/senaraimarhunpc.blade.php b/resources/views/lelong/senaraimarhunpc.blade.php index 7292e859..c909ec38 100644 --- a/resources/views/lelong/senaraimarhunpc.blade.php +++ b/resources/views/lelong/senaraimarhunpc.blade.php @@ -16,7 +16,7 @@ @foreach ($arrayinfo as $laporan) - + @foreach ($arrayinfo as $laporan) - + - + diff --git a/resources/views/lelong/showpindah.blade.php b/resources/views/lelong/showpindah.blade.php index 29d8f15e..13bb1f53 100644 --- a/resources/views/lelong/showpindah.blade.php +++ b/resources/views/lelong/showpindah.blade.php @@ -64,9 +64,9 @@
Pindah Ke-
diff --git a/resources/views/lelong/showrenewxlaku.blade.php b/resources/views/lelong/showrenewxlaku.blade.php index b4887ed3..c76be597 100644 --- a/resources/views/lelong/showrenewxlaku.blade.php +++ b/resources/views/lelong/showrenewxlaku.blade.php @@ -38,7 +38,7 @@
- +
{{$lelong_id}}
@@ -86,7 +86,7 @@
- +
diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php index 5070a62f..96da5b00 100644 --- a/resources/views/lelong/showtukartarikh.blade.php +++ b/resources/views/lelong/showtukartarikh.blade.php @@ -37,7 +37,7 @@
- +
{{$lelong_id}}
@@ -85,7 +85,7 @@
- +
diff --git a/resources/views/lelong/tukartarikhlelong.blade.php b/resources/views/lelong/tukartarikhlelong.blade.php index 9b4c5147..46bffa43 100644 --- a/resources/views/lelong/tukartarikhlelong.blade.php +++ b/resources/views/lelong/tukartarikhlelong.blade.php @@ -16,7 +16,7 @@
- + diff --git a/resources/views/lelongkhas/jadualN.blade.php b/resources/views/lelongkhas/jadualN.blade.php index 1936bc59..59bf7677 100644 --- a/resources/views/lelongkhas/jadualN.blade.php +++ b/resources/views/lelongkhas/jadualN.blade.php @@ -19,7 +19,7 @@ - + diff --git a/resources/views/lelongkhas/jadualO.blade.php b/resources/views/lelongkhas/jadualO.blade.php index cf6dcb4d..7386fc79 100644 --- a/resources/views/lelongkhas/jadualO.blade.php +++ b/resources/views/lelongkhas/jadualO.blade.php @@ -19,7 +19,7 @@ - + diff --git a/resources/views/lelongkhas/laporanlelong.blade.php b/resources/views/lelongkhas/laporanlelong.blade.php index a8dd25bd..6faedc87 100644 --- a/resources/views/lelongkhas/laporanlelong.blade.php +++ b/resources/views/lelongkhas/laporanlelong.blade.php @@ -19,7 +19,7 @@ - + diff --git a/resources/views/lelongkhas/laporantuntutbaki.blade.php b/resources/views/lelongkhas/laporantuntutbaki.blade.php index 2b9643cc..0a7ffbf6 100644 --- a/resources/views/lelongkhas/laporantuntutbaki.blade.php +++ b/resources/views/lelongkhas/laporantuntutbaki.blade.php @@ -19,7 +19,7 @@ - + diff --git a/resources/views/lelongkhas/resitpemenang.blade.php b/resources/views/lelongkhas/resitpemenang.blade.php index 53610a2b..6a3ff866 100644 --- a/resources/views/lelongkhas/resitpemenang.blade.php +++ b/resources/views/lelongkhas/resitpemenang.blade.php @@ -16,7 +16,7 @@ @foreach ($arrayinfo as $laporan) - + - + diff --git a/resources/views/lelongkhas/sandaranpembida.blade.php b/resources/views/lelongkhas/sandaranpembida.blade.php index f4753b61..c6723b4b 100644 --- a/resources/views/lelongkhas/sandaranpembida.blade.php +++ b/resources/views/lelongkhas/sandaranpembida.blade.php @@ -18,7 +18,7 @@ - + diff --git a/resources/views/lelongkhas/senarailelongkhas.blade.php b/resources/views/lelongkhas/senarailelongkhas.blade.php index 8580f681..868148c1 100644 --- a/resources/views/lelongkhas/senarailelongkhas.blade.php +++ b/resources/views/lelongkhas/senarailelongkhas.blade.php @@ -15,7 +15,7 @@ - + diff --git a/resources/views/lelongkhas/senaraimarhunkhas.blade.php b/resources/views/lelongkhas/senaraimarhunkhas.blade.php index 72e7a764..b0649a5d 100644 --- a/resources/views/lelongkhas/senaraimarhunkhas.blade.php +++ b/resources/views/lelongkhas/senaraimarhunkhas.blade.php @@ -16,7 +16,7 @@ @foreach ($arrayinfo as $laporan) - + @foreach ($arrayinfo as $laporan) - + - +
ID Lelong: {{$lelong_id}}Batch Lelong: {{$lelong_id}}Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong ); diff --git a/resources/views/lelong/lelongtebusindex.blade.php b/resources/views/lelong/lelongtebusindex.blade.php index ff662eb1..58e417ec 100644 --- a/resources/views/lelong/lelongtebusindex.blade.php +++ b/resources/views/lelong/lelongtebusindex.blade.php @@ -16,7 +16,7 @@
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
ID Lelong: {{ $laporan['laporan']['lelong_id']}} Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php index 11f3f061..66cc8d97 100644 --- a/resources/views/lelong/senaraimarhunsimulasi.blade.php +++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php @@ -13,7 +13,7 @@
ID Lelong: {{ $laporan['laporan']['lelong_id']}} Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index d55281af..4b05377d 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -17,7 +17,7 @@
NoID LelongBatch Lelong Nama No Kad Pengenalan No Telefon
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
BilID LelongBatch Lelong Tarikh Lelong Fasa Muat Turun
BilID LelongBatch Lelong Tarikh Lelong Fasa Muat Turun
BilID LelongBatch Lelong Tarikh Lelong Fasa Muat Turun
BilID LelongBatch Lelong Tarikh Lelong Fasa Muat Turun
ID Lelong: {{ $laporan['laporan']['lelong_id']}} Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/lelongkhas/sandarankpkt.blade.php b/resources/views/lelongkhas/sandarankpkt.blade.php index 3da80893..fe955939 100644 --- a/resources/views/lelongkhas/sandarankpkt.blade.php +++ b/resources/views/lelongkhas/sandarankpkt.blade.php @@ -19,7 +19,7 @@
BilID LelongBatch Lelong Tarikh Lelong Fasa Muat Turun
BilID LelongBatch Lelong Tarikh Lelong Fasa Muat Turun
BilID LelongBatch Lelong Tarikh Lelong Fasa Cawangan
ID Lelong: {{ $laporan['laporan']['lelong_id']}} Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/lelongkhas/senaraimarhunkhastelahjual.blade.php b/resources/views/lelongkhas/senaraimarhunkhastelahjual.blade.php index e9dfaa2e..11ff9658 100644 --- a/resources/views/lelongkhas/senaraimarhunkhastelahjual.blade.php +++ b/resources/views/lelongkhas/senaraimarhunkhastelahjual.blade.php @@ -16,7 +16,7 @@
ID Lelong: {{ $laporan['laporan']['lelong_id']}} Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/lelongkhas/tambahhargajual.blade.php b/resources/views/lelongkhas/tambahhargajual.blade.php index 24ef58b7..3bcbe79c 100644 --- a/resources/views/lelongkhas/tambahhargajual.blade.php +++ b/resources/views/lelongkhas/tambahhargajual.blade.php @@ -26,7 +26,7 @@ - + diff --git a/resources/views/marhun/ubahmarhun.blade.php b/resources/views/marhun/ubahmarhun.blade.php index 56413f24..a29f3209 100644 --- a/resources/views/marhun/ubahmarhun.blade.php +++ b/resources/views/marhun/ubahmarhun.blade.php @@ -30,7 +30,7 @@ - + diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php index b793aeed..e85ff781 100644 --- a/resources/views/pdf/brglelcaw.blade.php +++ b/resources/views/pdf/brglelcaw.blade.php @@ -91,7 +91,7 @@ tr:nth-child(even) {
@foreach ($info as $info) - + @foreach ($arrayinfo as $laporan) - + - +
ID Lelong: {{$lelongbid->lelong_id}} Batch Lelong: {{$lelongbid->lelong_id}} No.Rujukan: {{$norujukan}}
No CawanganLelong IDBatch lelong No Rujukan Karat Asal Karat Baru
ID Lelong: {{$info['lelong_id']}}Batch Lelong: {{$info['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdf/cetakbdbrglelong.blade.php b/resources/views/pdf/cetakbdbrglelong.blade.php index e9840f1c..6a3323c1 100644 --- a/resources/views/pdf/cetakbdbrglelong.blade.php +++ b/resources/views/pdf/cetakbdbrglelong.blade.php @@ -91,7 +91,7 @@ tr:nth-child(even) {
{{--
ID Lelong : {{$laporan['laporan']['lelong_id']}}Batch Lelong : {{$laporan['laporan']['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdf/cetakkeluarscanbarcode.blade.php b/resources/views/pdf/cetakkeluarscanbarcode.blade.php index 221ceb0b..9d3a9a07 100644 --- a/resources/views/pdf/cetakkeluarscanbarcode.blade.php +++ b/resources/views/pdf/cetakkeluarscanbarcode.blade.php @@ -83,7 +83,7 @@ Cawangan: {{$caw['caw_name']}}
ID Lelong: {{$lelong_id}}Batch Lelong: {{$lelong_id}}
diff --git a/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php b/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php index be918b97..adfda747 100644 --- a/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php +++ b/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php @@ -81,7 +81,7 @@ tr:nth-child(even) { 		Cawangan: {{$caw['caw_name']}}
ID Lelong: {{$lelong_id}}Batch Lelong: {{$lelong_id}}
diff --git a/resources/views/pdf/cetakmasukscanbarcode.blade.php b/resources/views/pdf/cetakmasukscanbarcode.blade.php index b2f4b0c3..2f43fcb3 100644 --- a/resources/views/pdf/cetakmasukscanbarcode.blade.php +++ b/resources/views/pdf/cetakmasukscanbarcode.blade.php @@ -80,7 +80,7 @@ Cawangan: {{$caw['caw_name']}} - ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} diff --git a/resources/views/pdf/cetakterimaserahmarhun.blade.php b/resources/views/pdf/cetakterimaserahmarhun.blade.php index f1b6c5b0..33b590f9 100644 --- a/resources/views/pdf/cetakterimaserahmarhun.blade.php +++ b/resources/views/pdf/cetakterimaserahmarhun.blade.php @@ -81,7 +81,7 @@ tr:nth-child(even) { Cawangan: {{$caw['caw_name']}} - ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php index 1804796b..c8c7f626 100644 --- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php +++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php @@ -92,7 +92,7 @@ tr:nth-child(even) {
@foreach ($arrayinfo as $laporan) - ID Lelong : {{$laporan['laporan']['lelong_id']}} + Batch Lelong : {{$laporan['laporan']['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdf/laporanbrglelpembidacaw.blade.php b/resources/views/pdf/laporanbrglelpembidacaw.blade.php index d2a5677f..95c14b8a 100644 --- a/resources/views/pdf/laporanbrglelpembidacaw.blade.php +++ b/resources/views/pdf/laporanbrglelpembidacaw.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($info as $info) Tarikh Lelong : @php diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php index 900b0777..c87022a9 100644 --- a/resources/views/pdf/laporanlelfullcaw.blade.php +++ b/resources/views/pdf/laporanlelfullcaw.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($info as $info) Tarikh Lelong : @php diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php index 50b0bef8..8ef1e93e 100644 --- a/resources/views/pdf/laporannamapembidacaw.blade.php +++ b/resources/views/pdf/laporannamapembidacaw.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($lelongid as $info) Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index 0b59be50..212fec80 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -91,7 +91,7 @@ tr:nth-child(even) {
@foreach ($arrayinfo as $laporan) - ID Lelong : {{$laporan['laporan']['lelong_id']}} + Batch Lelong : {{$laporan['laporan']['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php index a0b782d8..bc13f395 100644 --- a/resources/views/pdf/listlelongdetails.blade.php +++ b/resources/views/pdf/listlelongdetails.blade.php @@ -91,7 +91,7 @@ tr:nth-child(even) {
@foreach ($arrayinfo as $laporan) - ID Lelong : {{$laporan['laporan']['lelong_id']}} + Batch Lelong : {{$laporan['laporan']['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdf/listubahmarhun.blade.php b/resources/views/pdf/listubahmarhun.blade.php index 9ad9ad5e..14a54c00 100644 --- a/resources/views/pdf/listubahmarhun.blade.php +++ b/resources/views/pdf/listubahmarhun.blade.php @@ -94,7 +94,7 @@ tr:nth-child(even) { No Cawangan - Lelong ID + Batch Lelong No Rujukan Karat Asal Karat Baru diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php index 8ef295fd..ef163c1e 100644 --- a/resources/views/pdf/pdflapbrglelpembida.blade.php +++ b/resources/views/pdf/pdflapbrglelpembida.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($info as $info) Tarikh Lelong: @php diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php index 9c445252..9b719534 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- Lelong ID: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($info as $info) Tarikh Lelong:@php diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php index 750ee69c..25be60f6 100644 --- a/resources/views/pdf/pdflelongreport.blade.php +++ b/resources/views/pdf/pdflelongreport.blade.php @@ -128,7 +128,7 @@ @foreach ($arrayinfo as $laporan) - ID Lelong: {{ $laporan['laporan']['lelong_id']}} + Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/pdf/pdflelongreportpc.blade.php b/resources/views/pdf/pdflelongreportpc.blade.php index 20202164..9e57c4b9 100644 --- a/resources/views/pdf/pdflelongreportpc.blade.php +++ b/resources/views/pdf/pdflelongreportpc.blade.php @@ -128,7 +128,7 @@ @foreach ($arrayinfo as $laporan) - ID Lelong: {{ $laporan['laporan']['lelong_id']}} + Batch Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); diff --git a/resources/views/pdf/pdflelongtaklaku.blade.php b/resources/views/pdf/pdflelongtaklaku.blade.php index a21b33a3..e463d473 100644 --- a/resources/views/pdf/pdflelongtaklaku.blade.php +++ b/resources/views/pdf/pdflelongtaklaku.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- Lelong ID: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($infolelong as $info) Cawangan:{{ $info->caw_name}} Tarikh Lelong:{{ $info->tarikh_lelong}} diff --git a/resources/views/pdf/pdflelongtebus.blade.php b/resources/views/pdf/pdflelongtebus.blade.php index 3f57a145..de81a11d 100644 --- a/resources/views/pdf/pdflelongtebus.blade.php +++ b/resources/views/pdf/pdflelongtebus.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($info as $info) Tarikh Lelong: @php diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php index beede57b..b5351e0b 100644 --- a/resources/views/pdf/pdfsenarailapbidaan.blade.php +++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php @@ -90,7 +90,7 @@ tr:nth-child(even) {
- ID Lelong: {{$lelong_id}} + Batch Lelong: {{$lelong_id}} @foreach ($lelongid as $info) Tarikh Lelong:@php $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong ); diff --git a/resources/views/pdfkhas/cetakjadualN.blade.php b/resources/views/pdfkhas/cetakjadualN.blade.php index b5673887..22ebf102 100644 --- a/resources/views/pdfkhas/cetakjadualN.blade.php +++ b/resources/views/pdfkhas/cetakjadualN.blade.php @@ -105,7 +105,7 @@
@foreach ($info as $info) - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdfkhas/cetakjadualO.blade.php b/resources/views/pdfkhas/cetakjadualO.blade.php index 9a61d5b1..4ed11006 100644 --- a/resources/views/pdfkhas/cetakjadualO.blade.php +++ b/resources/views/pdfkhas/cetakjadualO.blade.php @@ -97,7 +97,7 @@
@foreach ($info as $info) - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdfkhas/cetaklaporanlelong.blade.php b/resources/views/pdfkhas/cetaklaporanlelong.blade.php index 0cf815f1..3eaa6ba3 100644 --- a/resources/views/pdfkhas/cetaklaporanlelong.blade.php +++ b/resources/views/pdfkhas/cetaklaporanlelong.blade.php @@ -61,7 +61,7 @@ PERMODALAN KELANTAN BERHAD LAPORAN LELONGAN - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} diff --git a/resources/views/pdfkhas/cetaklaporantuntutbaki.blade.php b/resources/views/pdfkhas/cetaklaporantuntutbaki.blade.php index 7f000019..a0b8bcf3 100644 --- a/resources/views/pdfkhas/cetaklaporantuntutbaki.blade.php +++ b/resources/views/pdfkhas/cetaklaporantuntutbaki.blade.php @@ -60,7 +60,7 @@ PERMODALAN KELANTAN BERHAD LAPORAN TUNTUT/BELUM LEBIHAN - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} @@ -83,7 +83,7 @@
@foreach ($info as $info) - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdfkhas/cetaksandarankpkt.blade.php b/resources/views/pdfkhas/cetaksandarankpkt.blade.php index 1af35ad4..69512b8c 100644 --- a/resources/views/pdfkhas/cetaksandarankpkt.blade.php +++ b/resources/views/pdfkhas/cetaksandarankpkt.blade.php @@ -89,7 +89,7 @@ tr:nth-child(even) {
@foreach ($info as $info) - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pdfkhas/cetaksandaranpembida.blade.php b/resources/views/pdfkhas/cetaksandaranpembida.blade.php index 61fc3169..cf15e335 100644 --- a/resources/views/pdfkhas/cetaksandaranpembida.blade.php +++ b/resources/views/pdfkhas/cetaksandaranpembida.blade.php @@ -89,7 +89,7 @@ tr:nth-child(even) {
@foreach ($info as $info) - ID Lelong: {{$info['lelong_id']}} + Batch Lelong: {{$info['lelong_id']}} Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php index dd366576..e5a1715e 100644 --- a/resources/views/pembayaran/senarailelongbayaran.blade.php +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -28,7 +28,7 @@ No - ID Lelong + Batch Lelong {{-- Cawangan --}} Fasa Tarikh Lelong diff --git a/resources/views/pembayaran/testbillplz.blade.php b/resources/views/pembayaran/testbillplz.blade.php index 287f5958..d82c402b 100644 --- a/resources/views/pembayaran/testbillplz.blade.php +++ b/resources/views/pembayaran/testbillplz.blade.php @@ -33,7 +33,7 @@
- +
diff --git a/resources/views/pembida/listkebenaranbayarantunai.blade.php b/resources/views/pembida/listkebenaranbayarantunai.blade.php index 21086f50..57364015 100644 --- a/resources/views/pembida/listkebenaranbayarantunai.blade.php +++ b/resources/views/pembida/listkebenaranbayarantunai.blade.php @@ -24,7 +24,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export diff --git a/resources/views/pembida/senlelbelumbayarbidaan.blade.php b/resources/views/pembida/senlelbelumbayarbidaan.blade.php index 5dba6f53..63f0497c 100644 --- a/resources/views/pembida/senlelbelumbayarbidaan.blade.php +++ b/resources/views/pembida/senlelbelumbayarbidaan.blade.php @@ -15,7 +15,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Lelong diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php index b91be5e8..cd4496aa 100644 --- a/resources/views/pembida/senlelpembayaranbidaan.blade.php +++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php @@ -14,7 +14,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php index 5233ade6..f715bac1 100644 --- a/resources/views/pengesahan/senarailelong.blade.php +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Nama Cawangan Harga Emas Asas diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php index 8efdc027..124d1509 100644 --- a/resources/views/pengesahan/senarailelongubahmutu.blade.php +++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php @@ -26,7 +26,7 @@ No - ID Lelong + Batch Lelong {{-- Cawangan --}} Tarikh Lelong Fasa diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php index 9b64f7c1..c823aa4c 100644 --- a/resources/views/pengesahan/senaraitangguhlelong.blade.php +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -20,7 +20,7 @@ Bil Tarikh Tangguh - ID Lelong + Batch Lelong No Rujukan Nota Tindakan diff --git a/resources/views/serahan/laporanserahan.blade.php b/resources/views/serahan/laporanserahan.blade.php index fdb803f9..a47f45a5 100644 --- a/resources/views/serahan/laporanserahan.blade.php +++ b/resources/views/serahan/laporanserahan.blade.php @@ -15,7 +15,7 @@ No - ID Lelong + Batch Lelong Cawangan Fasa Tarikh Lelong diff --git a/resources/views/serahan/senarailelongbayaran.blade.php b/resources/views/serahan/senarailelongbayaran.blade.php index 587386c1..05876f1d 100644 --- a/resources/views/serahan/senarailelongbayaran.blade.php +++ b/resources/views/serahan/senarailelongbayaran.blade.php @@ -15,7 +15,7 @@ No - ID Lelong + Batch Lelong Cawangan Fasa Tarikh Lelong diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 6ad2ed1e..69044d58 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -23,7 +23,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index c814562e..1b183145 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Fasa diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade00.php b/resources/views/tangguhlelong/senarailelongtangguh.blade00.php index 34851c27..94e00558 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade00.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade00.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Fasa Harga Emas Asas diff --git a/resources/views/tangguhlelong/senaraimohontangguh.blade.php b/resources/views/tangguhlelong/senaraimohontangguh.blade.php index 326401ae..942e269b 100644 --- a/resources/views/tangguhlelong/senaraimohontangguh.blade.php +++ b/resources/views/tangguhlelong/senaraimohontangguh.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong No Rujukan Tarikh Mohon / Lulus diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index c040ddcc..11c2c9b4 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Bil SAG diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php index 474b4d73..2b13adc7 100644 --- a/resources/views/tangguhlelong/senleltlhtangguh.blade.php +++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Bil SAG From 3b5e0b193567a69e133d2df27ec94c95956b8051 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:55:08 +0800 Subject: [PATCH 4/5] update laporan, laporan perubahan mutu(operasi) --- app/Http/Controllers/ReportController.php | 74 +++-- app/Models/Lelong.php | 5 + app/Models/Pengesahan.php | 8 +- resources/views/includes/sidebar.blade.php | 8 +- .../views/lelong/brgleldetails.blade.php | 103 +++---- .../lelong/lapbrglelpembidaindex.blade.php | 105 +++---- .../views/lelong/laplelongindex.blade.php | 107 +++---- .../views/lelong/laporanbidaanindex.blade.php | 106 +++---- .../views/lelong/laporanlelong.blade.php | 100 ++++--- .../views/lelong/lelongtebusindex.blade.php | 101 +++---- resources/views/marhun/ubahmarhun.blade.php | 263 +++++++++--------- .../views/marhun/ubahmarhuncaw.blade.php | 92 ++++++ routes/web.php | 4 +- 13 files changed, 635 insertions(+), 441 deletions(-) create mode 100644 resources/views/marhun/ubahmarhuncaw.blade.php diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 7ffe9ca1..9642b25c 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -770,33 +770,71 @@ class ReportController extends Controller // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo')); } + public function lapubahmarhunlelong (){ - public function lapubahmarhunlelongindex (){ - - $arraydetails = []; - - $laporan= Pengesahan::join('lelongbidmarhun','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id') - ->join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan') - ->select('pengesahan.norujukan','pengesahan.lelong_id','lelongbid.caw_id','pengesahan.diminta_pada','pengesahan.disahkan_oleh','pengesahan.disahkan_pada','pengesahan.diminta_oleh','pengesahan.status','pengesahan.status_ubah','lelongbidmarhun.old_karat','lelongbidmarhun.karat','lelongbidmarhun.old_berat','lelongbidmarhun.berat','lelongbid.kodcaw','lelongbid.norujukan','lelongbid.lelong_id') - ->whereNotNull('pengesahan.disahkan_oleh') - ->orderBy('pengesahan.id') + $arraydetails = []; + + $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('pengesahan','lelong.id','=','pengesahan.lelong_id') + ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa') + ->distinct() + ->orderBy('cawangan_lelong.lelong_id') ->get() ->toArray(); + // dd($laporan); - foreach($laporan as $lap) //stop here 01.09.2022 - { - $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$lap['lelong_id']) - ->where('caw_id',$lap['caw_id']) + + foreach($laporan as $brg) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $brg['lelong_id']) ->distinct() ->orderBy('lelong_id') ->get() ->toArray(); - array_push($arraydetails, ['lap' =>$lap,'details' =>$details]); - - } + array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]); + } - return view('marhun.ubahmarhun', compact('laporan','arraydetails')); + + return view('marhun.ubahmarhuncaw', compact('arraydetails')); + + } + + + public function lapubahmarhunlelongindex ($lelong_id, $kodcaw){ + + $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) + ->where('pengesahan.status', 1) + ->whereNotNull('pengesahan.disahkan_oleh') + ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id') + ->orderBy('pengesahan.lelongbid_id') + ->distinct() + ->get(); + + foreach($cawangan as $index1=>$caw) + { + + $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first(); + + $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first(); + $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first(); + + $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id']) + ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') + ->get(); + + + $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id']) + ->get() + ->toArray(); + $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; + $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name']; + $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name']; + $cawangan[$index1]['detailmarhun']=$status; + $cawangan[$index1]['detail']=$marhuns; + } + + return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan')); } public function exportubahmarhun (){ diff --git a/app/Models/Lelong.php b/app/Models/Lelong.php index 63cf76b2..8f12511d 100644 --- a/app/Models/Lelong.php +++ b/app/Models/Lelong.php @@ -40,4 +40,9 @@ class Lelong extends Model { return $this->hasMany(LelKarat::class, 'lelong_id', 'id'); } + + public function pengesahan() + { + return $this->hasMany(Pengesahan::class,'lelong_id','id'); + } } diff --git a/app/Models/Pengesahan.php b/app/Models/Pengesahan.php index a3814af1..c8855205 100644 --- a/app/Models/Pengesahan.php +++ b/app/Models/Pengesahan.php @@ -23,7 +23,13 @@ class Pengesahan extends Model 'status_ubah' ]; - public function lelongbidmarhun(){ + public function lelongbidmarhun() + { return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id'); } + + public function lelong() + { + return $this->belongsTo(Lelong::class,'lelong_id','id'); + } } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 1cdcde72..3bdea217 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -163,7 +163,7 @@
    @@ -499,13 +499,13 @@
    diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php index 1fcf1161..c5f45340 100644 --- a/resources/views/lelong/brgleldetails.blade.php +++ b/resources/views/lelong/brgleldetails.blade.php @@ -3,58 +3,62 @@ @section('content')
    -
    -

    Butiran Laporan Barang Lelong

    +
    +
    - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    +
    +
    + Butiran Laporan Barang Lelong +
    - @endif -
    - - - - - - - - - - {{-- --}} - - - - - @foreach ($arraydetails as $laporan) - - - - - - -{{-- - --}} - - - @endforeach - + +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @endif + + +
    NoBatch LelongTarikh LelongFasaCawanganMuat Turun
    {{ $loop->iteration }}{{ $laporan['brg']['lelong_id']}}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['brg']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{ $laporan['brg']['fasa']}} - @foreach($laporan['detailsbrg'] as $details) - - {{ $details['caw_name']}}
    - @endforeach -     		- -
    + + + + + + + + + + + + @foreach ($arraydetails as $laporan) + + + + + + + + -
    NoID LelongTarikh LelongFasaCawangan
    {{ $loop->iteration }}{{ $laporan['brg']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['brg']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $laporan['brg']['fasa']}} + @foreach($laporan['detailsbrg'] as $details) + + {{ $details['caw_name']}}
    + @endforeach +
    -
    -
    - + @endforeach + + + + +
    +
    +
    @@ -84,4 +88,5 @@ + @endsection diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index d551906f..3ad4c790 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -3,56 +3,63 @@ @section('content')
    -
    -

    Laporan Barang Lelong Pembida

    - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif -
    - - - - - - - - - - {{-- --}} - - - - - @foreach ($arraydetails as $info) - - - - - - - {{-- --}} - - @endforeach - - -
    BilBatch LelongTarikh LelongFasaCawanganMuat Turun
    {{$loop->iteration}}{{ $info['laporan']['lelong_id']}}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{ $info['laporan']['fasa'] }} - @foreach($info['details'] as $details) - - {{ $details['caw_name']}}
    - @endforeach -     		- -
    -
    -
    - + +
    +
    + +
    +
    + Laporan Barang Lelong Pembida +
    +
    + +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @endif + +
    + + + + + + + + + + + + + + @foreach ($arraydetails as $info) + + + + + + + + @endforeach + + +
    BilID LelongTarikh LelongFasaCawangan
    {{$loop->iteration}}{{ $info['laporan']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $info['laporan']['fasa'] }} + @foreach($info['details'] as $details) + + {{ $details['caw_name']}}
    + @endforeach +
    +
    +
    +
    +
    diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index 10b589d0..f19b165c 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -3,57 +3,64 @@ @section('content')
    -
    -

    Laporan Lelong Keseluruhan

    - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif -
    - - - - - - - - - - {{-- --}} - - - - - @foreach ($arraydetails as $bid) - - - - - - - {{-- --}} - - - @endforeach - - -
    BilBatch LelongTarikh LelongFasaCawanganMuat Turun
    {{$loop->iteration}}{{ $bid['laporan']['lelong_id']}}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{ $bid['laporan']['fasa'] }} - @foreach($bid['details'] as $details) - - {{ $details['caw_name']}}
    - @endforeach - -     		- -
    -
    -
    +
    +
    + +
    +
    + Senarai Lelong Keseluruhan +
    +
    + +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @endif + +
    + + + + + + + + + + + + + + @foreach ($arraydetails as $bid) + + + + + + + + + @endforeach + + +
    BilID LelongTarikh LelongFasaCawangan
    {{$loop->iteration}}{{ $bid['laporan']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $bid['laporan']['fasa'] }} + @foreach($bid['details'] as $details) + + {{ $details['caw_name']}}
    + @endforeach + +
    +
    +
    +
    +
    diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index e8e73282..f2cd1a4f 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -3,58 +3,64 @@ @section('content')
    -
    -

    Laporan Nama Pembida

    - - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif -
    - - - - - - - - - - {{-- --}} - - - - - @foreach ($arraydetails as $bid) - - - - -
    BilBatch LelongTarikh LelongFasaCawanganTindakan
    {{$loop->iteration}} - {{ $bid['laporan']['lelong_id']}}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{ $bid['laporan']['fasa']}} - @foreach($bid['details'] as $details) - +
    +
    - {{ $details['caw_name']}}
    +
    +
    + Senarai Keseluruhan Pembida +
    +
    + +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @endif + + + + + + + + + + + + + + + + + @foreach ($arraydetails as $bid) + + + + + + + @endforeach + - @endforeach - - {{-- --}} - - @endforeach - - -
    BilID LelongTarikh LelongFasaCawangan
    {{$loop->iteration}} + {{ $bid['laporan']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $bid['laporan']['fasa']}} + @foreach($bid['details'] as $details) + + + {{ $details['caw_name']}}
    + + @endforeach +
    - -
    - -
    - +
    + +
    +
    +
diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 6e3a84bb..2e6f7440 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -3,54 +3,65 @@ @section('content')
-
-

Laporan Barang Lelong

+
+
- @if ($message = Session::get('success')) -
-

{{ $message }}

+ + +
+
+ Laporan Barang Lelong +
- @endif -
- - - - - - - - - - - - - - @foreach ($arraydetails as $laporan) - - - - - - + +
NoBatch LelongTarikh LelongFasaCawangan
{{ $loop->iteration }}{{ $laporan['laporan']['lelong_id']}}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{ $laporan['laporan']['fasa']}} - @foreach($laporan['details'] as $details) - - {{ $details['caw_name']}}
+
+ @if ($message = Session::get('success')) +
+ {{ $message }} +
+ @endif + + + + + + + + + + + + + + + + @foreach ($arraydetails as $laporan) + + + + + + + + @endforeach - - - - @endforeach - - -
NoBatch LelongTarikh LelongFasaCawangan
{{ $loop->iteration }}{{ $laporan['laporan']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $laporan['laporan']['fasa']}} + @foreach($laporan['details'] as $details) + + {{ $details['caw_name']}}
+ + @endforeach +
- +
+ +
+
-
@@ -59,7 +70,7 @@ $(function () { $('[data-toggle="tooltip"]').tooltip() }) - var tablenotislelong = $('#tablenotislelong').DataTable({ + var tablenotislelong = $('#tablenotislelong').DataTable({ "columnDefs": [ { "targets": 0, @@ -75,7 +86,6 @@ "lengthChange": false, "pageLength": 15, dom: 'Bfrtip', - }); diff --git a/resources/views/lelong/lelongtebusindex.blade.php b/resources/views/lelong/lelongtebusindex.blade.php index 58e417ec..1c4fd8f5 100644 --- a/resources/views/lelong/lelongtebusindex.blade.php +++ b/resources/views/lelong/lelongtebusindex.blade.php @@ -2,57 +2,60 @@ @section('content')
-
-
-

Senarai Lelong Tebus

- @if ($message = Session::get('success')) -
-

{{ $message }}

+
+
+
+
+
+ Senarai Lelong Tebus +
- @endif -
- - - - - - - - - - {{-- --}} - - - - - @foreach ($arraydetails as $info) - - - - - - +
+ @if ($message = Session::get('success')) +
+ {{ $message }} +
+ @endif - {{--
--}} - - @endforeach - - -
BilBatch LelongTarikh LelongFasaCawanganMuat Turun
{{$loop->iteration}}{{ $info['laporan']['batch_no']}}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{ $info['laporan']['fasa'] }} - @foreach($info['details'] as $details) - - {{ $details['caw_name']}}
- @endforeach - 		- -
-
-
- +
+ + + + + + + + + + + + + + @foreach ($arraydetails as $info) + + + + + + + + @endforeach + + +
BilID LelongTarikh LelongFasaCawangan
{{$loop->iteration}}{{ $info['laporan']['batch_no']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $info['laporan']['fasa'] }} + @foreach($info['details'] as $details) + + {{ $details['caw_name']}}
+ @endforeach +
+
+
+
+
diff --git a/resources/views/marhun/ubahmarhun.blade.php b/resources/views/marhun/ubahmarhun.blade.php index a29f3209..0f29e60b 100644 --- a/resources/views/marhun/ubahmarhun.blade.php +++ b/resources/views/marhun/ubahmarhun.blade.php @@ -1,159 +1,172 @@ @extends('layouts.app') @section('content') -
-
- @if ($message = Session::get('success')) +
+
+
+ + + +
+ Senarai SAG Perubahan Marhun: {{$getpengesahan['caw_name']}} +
+
+
+ @if ($message = Session::get('success'))

{{ $message }}

- @endif -
- @csrf -

Senarai Perubahan Marhun

- - - - - - - - - - - - - - - - - - @foreach ($arraydetails as $info) - + @endif +
NoCawanganBatch lelongNo RujukanKarat AsalKarat BaruBerat AsalBerat BaruTarikh MohonTarikh Disahkan
+ - - - @foreach($info['details'] as $details) - - @endforeach - - - - - - - - - + + + + + + + + + + + + + - @endforeach - + + + @forelse($cawangan as $marhun) + + + + + + + + + + + + + + + + + @empty + + + + + @endforelse + +
{{ $loop->iteration }} {{ $details['caw_name'] }}{{ $info['lap']['lelong_id'] }}{{ $info['lap']['norujukan'] }}{{ $info['lap']['old_karat'] }}{{ $info['lap']['karat'] }}{{ number_format($info['lap']['old_berat'], 2, '.', ',') }}{{ number_format($info['lap']['berat'], 2, '.', ',') }}{{ $info['lap']['diminta_pada'] }}{{ $info['lap']['disahkan_pada'] }}BilNo RujukanPerubahanMarhun AsalMarhun BaruMutu AsalMutu BaruBerat Asal (gm)Berat Baru (gm)Diminta OlehDisahkan OlehStatus
{{ $loop->iteration }}{{ $marhun['norujukan'] }}@foreach ($marhun['detailmarhun'] as $item) + @if($item['status_ubah'] == 1) + Mutu + @elseif($item['status_ubah'] == 2) + Pertambahan Marhun + @elseif($item['status_ubah'] == 3) + Hapus Marhun + @elseif($item['status_ubah'] == 4) + Berat + @elseif($item['status_ubah'] == 5) + Mutu & Berat + @elseif($item['status_ubah'] == 7) + Marhun + @elseif($item['status_ubah'] == 8) + Mutu, Berat & Marhun + @elseif($item['status_ubah'] == 9) + Mutu & Marhun + @elseif($item['status_ubah'] == 10) + Berat & Marhun + @endif +
+ @endforeach		@foreach ($marhun['detail'] as $item) + {{$item['old_marhun']}}
+ @endforeach		@foreach ($marhun['detailmarhun'] as $item) + @if($item['request_marhun'] == null) + @else + + @endif {{$item['request_marhun']}}
+ @endforeach		@foreach ($marhun['detail'] as $item) + {{$item['old_karat']}}
+ @endforeach		@foreach ($marhun['detailmarhun'] as $item) + @if($item['request_karat'] == null) + @else + + @endif{{$item['request_karat']}}
+ @endforeach		@foreach ($marhun['detail'] as $item) + {{$item['old_berat']}}
+ @endforeach		@foreach ($marhun['detailmarhun'] as $item) + @if($item['request_berat'] == null) + @else + + @endif{{$item['request_berat']}}
+ @endforeach		{{ $marhun['diminta_oleh'] }}{{ $marhun['disahkan_oleh'] }}
No Data
-
+
+
- - -@endsection \ No newline at end of file + +@endsection diff --git a/resources/views/marhun/ubahmarhuncaw.blade.php b/resources/views/marhun/ubahmarhuncaw.blade.php new file mode 100644 index 00000000..8b5e34c2 --- /dev/null +++ b/resources/views/marhun/ubahmarhuncaw.blade.php @@ -0,0 +1,92 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ +
+
+ Senarai Ubah Marhun +
+
+ +
+ @if ($message = Session::get('success')) +
+ {{ $message }} +
+ @endif +
+ + + + + + + + + + + + + + @foreach ($arraydetails as $laporan) + + + + + + + + + + @endforeach + + +
NoBatch LelongTarikh LelongFasaCawangan
{{ $loop->iteration }}{{ $laporan['brg']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['brg']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $laporan['brg']['fasa']}} + @foreach($laporan['detailsbrg'] as $details) + + {{ $details['caw_name']}}
+ @endforeach +
+
+
+
+
+
+
+ + + +@endsection diff --git a/routes/web.php b/routes/web.php index 115f9771..bfe4fc58 100644 --- a/routes/web.php +++ b/routes/web.php @@ -494,7 +494,9 @@ Route::get('/simulasireport/{simulasi_id}/{cawid}',['as'=>'report.simulasireport Route::get('/lelongreport/{lelongid}/{cawid}',['as'=>'report.lelongreport','uses'=>'ReportController@lelongreport']); -Route::get('/lapubahmarhunlelongindex',['as'=>'report.lapubahmarhunlelongindex','uses'=>'ReportController@lapubahmarhunlelongindex']); +Route::get('/lapubahmarhunlelong',['as'=>'report.lapubahmarhunlelong','uses'=>'ReportController@lapubahmarhunlelong']); +Route::get('/lapubahmarhunlelongindex/{lelong_id}/{kodcaw}',['as'=>'report.lapubahmarhunlelongindex','uses'=>'ReportController@lapubahmarhunlelongindex']); + Route::post('/export',['as'=>'report.exportubahmarhun','uses'=>'ReportController@exportubahmarhun']); }); From e97e7f114ec57921f8045aaf9165fe19acf796b0 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 23 Nov 2022 12:03:59 +0800 Subject: [PATCH 5/5] (PDF) Senarai simulasi mengikut pelanggan --- app/Http/Controllers/ReportController.php | 56 +++- .../views/pdf/simulasireportbycust.blade.php | 278 ++++++++++++++++++ .../views/simulasi/listsagbycust.blade.php | 8 +- routes/web.php | 2 + 4 files changed, 339 insertions(+), 5 deletions(-) create mode 100644 resources/views/pdf/simulasireportbycust.blade.php diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 9642b25c..106353f2 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -33,6 +33,7 @@ use App\Models\Resit; use App\Models\Customer; use App\Models\LelongTebus; use App\Models\Pengesahan; +use App\Models\TransaksiKeuntungan; use Carbon\Carbon; @@ -649,10 +650,63 @@ class ReportController extends Controller ->setPaper('a4','potrait'); return $pdf->download('Laporan Simulasi Cawangan.pdf'); - + } + public function simulasireportbycust($simulasi_id, $cawid) + { + $keuntungan = 0; + $arraylistgadai = 0; + + $simulasilel = Simulasi::with('cawangan')->find($simulasi_id); + $cawname = Cawangan::where('id','=',$cawid)->first(); + + $cawanganDetail = $simulasilel->cawangan->find($cawid); + + $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id') + ->where('simulasi_id','=',$simulasi_id) + ->where('caw_id','=',$cawid); + + $arraynorujukan = $marhun->pluck('norujukan')->toArray(); + $datasimulasi = $marhun->get(); + $marhuns = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) + ->select('nokp') + ->groupBy('nokp')->get(); + // dd($datagadai); + $arraysag = []; + + foreach($marhuns as $index1=>$cal) + { + $customer = Customer::where('kpbaru','=',$cal['nokp']) + ->orWhere('kplama','=',$cal['nokp']) + ->first(); + // dd($customer); + + $listsag = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) + ->where('nokp','=',$cal['nokp']) + ->get(); + // dd($listgadai); + foreach($listsag as $index=>$listing){ + $ktlhbyr = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan'); + // dd($ktlhbyr); + $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('keuntungan_rebet'); + $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan'); + $beza_keuntungan = $total_untung_asal - $total_untung_rebet; + $keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + // dd($keuntungan); + $listsag[$index]['ktlhbyr'] = $ktlhbyr; + $listsag[$index]['keuntungan'] = $keuntungan; + } + $marhuns[$index1]['nama'] = $customer; + $marhuns[$index1]['listsag'] = $listsag; + + } + $pdf = PDF::loadView('pdf.simulasireportbycust',compact('simulasilel','cawanganDetail','marhuns','simulasi_id','cawid','ktlhbyr','cawname')) + ->setPaper('a4','potrait'); + + return $pdf->download('Laporan Simulasi Cawangan by Pelanggan.pdf'); + } public function lelongreport ($lelongid, $cawid){ diff --git a/resources/views/pdf/simulasireportbycust.blade.php b/resources/views/pdf/simulasireportbycust.blade.php new file mode 100644 index 00000000..86a0f8f1 --- /dev/null +++ b/resources/views/pdf/simulasireportbycust.blade.php @@ -0,0 +1,278 @@ + + + + + + + + +
+
LAPORAN SIMULASI CAWANGAN by PELANGGAN: {{$cawname['caw_name']}}
 +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + @foreach ($marhuns as $index=> $marhun) + + + + + + + + + + + + + + + + + + + + + + @endforeach + + +{{-- + + + + + + + + + + --}} + + + +
NoNama PelangganNo.KPNo.RujukanTempohBerat(gm)Keuntungan Telah Bayar (RM)Keuntungan 6 Bulan (RM)Keuntungan Semasa (RM)Pembiayaan Asal (RM)Baki Pembiayaan (RM)Nilai Marhun (RM)
{{$loop->iteration}}{{ $marhun['nama']['nama']}}{{ $marhun['nokp']}}@foreach ($marhun['listsag'] as $item) + {{-- {{$loop->iteration}}.{{ $item['norujukan'] }}
--}} + {{ $item['norujukan'] }}
+ @endforeach		@foreach ($marhun['listsag'] as $item) + {{ $item['tempoh'] }}
+ @endforeach		 + @php $jumberat = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jumberat = $jumberat + $item['berat']; + @endphp + {{ number_format($item['berat'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jumberat, 2, '.', ',') }} + 		+ @php $jumktlhbyr = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr']; + @endphp + {{ number_format($item['ktlhbyr'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jumktlhbyr, 2, '.', ',') }} + + 		+ @php $jum6bulan = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jum6bulan = $jum6bulan + $item['bakiupah']; + @endphp + {{ number_format($item['bakiupah'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jum6bulan, 2, '.', ',') }} + + 		+ @php $jum6bulan = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jum6bulan = $jum6bulan + $item['keuntungan']; + @endphp + {{ number_format($item['keuntungan'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jum6bulan, 2, '.', ',') }} + + 		+ @php $jumpinjasal = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jumpinjasal = $jumpinjasal + $item['pinjaman']; + @endphp + {{ number_format($item['pinjaman'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jumpinjasal, 2, '.', ',') }} + + 		+ @php $jumpinjaman = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jumpinjaman = $jumpinjaman + $item['bakipjm']; + @endphp + {{ number_format($item['bakipjm'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jumpinjaman, 2, '.', ',') }} + + 		+ @php $jumnilaimarhun = 0;@endphp + @foreach ($marhun['listsag'] as $item) + @php + $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun']; + @endphp + {{ number_format($item['nilaimarhun'], 2, '.', ',') }}
+ @endforeach + {{ number_format($jumnilaimarhun, 2, '.', ',') }} + +
Jumlah Keseluruhan{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_cajlelong, 2, '.', ',') }}{{ number_format($total_bakilelong, 2, '.', ',') }}
+ + + + + + + + + diff --git a/resources/views/simulasi/listsagbycust.blade.php b/resources/views/simulasi/listsagbycust.blade.php index 6123b61f..b6f10a1d 100644 --- a/resources/views/simulasi/listsagbycust.blade.php +++ b/resources/views/simulasi/listsagbycust.blade.php @@ -21,10 +21,10 @@

{{ $message }}

@endif - {{--
- Simulasi Lelong - Senarai Mengikut Nama Pelangan -
--}} +
+ Muat Turun PDF + +
@csrf diff --git a/routes/web.php b/routes/web.php index bfe4fc58..e749f39c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -491,6 +491,8 @@ Route::get('/lelongtebusindex',['as'=>'report.lelongtebusindex','uses'=>'ReportC Route::get('/lelongtebus/{lelong_id}/{kodcaw}',['as'=>'report.lelongtebus','uses'=>'ReportController@lelongtebus']); Route::get('/simulasireport/{simulasi_id}/{cawid}',['as'=>'report.simulasireport','uses'=>'ReportController@simulasireport']); +Route::get('/simulasireportbycust/{simulasi_id}/{cawid}',['as'=>'report.simulasireportbycust','uses'=>'ReportController@simulasireportbycust']); + Route::get('/lelongreport/{lelongid}/{cawid}',['as'=>'report.lelongreport','uses'=>'ReportController@lelongreport']);