From e699373d89bc85e59c78e91183714d83ff343f63 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 27 Nov 2022 22:28:48 +0800 Subject: [PATCH 1/7] update scanbarcode pembida by nama --- app/Http/Controllers/LelongController.php | 45 +++-- app/Http/Controllers/MarhunController.php | 154 +++++++++++++++++- .../views/marhun/scanbarcodejual.blade.php | 9 +- .../marhun/scanbarcodejualbycust.blade.php | 145 +++++++++++++++++ .../marhun/senarailelongscanjual.blade.php | 20 ++- ...cetakkeluarscanbarcodejualbycust.blade.php | 116 +++++++++++++ routes/web.php | 4 +- 7 files changed, 467 insertions(+), 26 deletions(-) create mode 100644 resources/views/marhun/scanbarcodejualbycust.blade.php create mode 100644 resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8d9b35df..c31956aa 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -4779,6 +4779,7 @@ class LelongController extends Controller $total_bakiupah = 0; $total_nilaimarhun = 0; $keuntungan = 0; + $total_cazlelong = 0; $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) @@ -4804,6 +4805,9 @@ class LelongController extends Controller ->get()->toArray(); // dd($marhuns); $arraymarhun = []; + $cajlelong = 0; + $rugilelong = 0; + $bakilelong = 0; foreach ($marhuns as $index1=> $cal) { // dd($cal); $gadai = Gadai::on($cal['kodcaw']) @@ -4814,10 +4818,13 @@ class LelongController extends Controller ->orWhere('kplama','=',$gadai['nokp']) ->first(); // dd($customer); - - // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + $lelonglel = Lelong::where('id','=',$lelongid)->first(); + $sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100); + $cajlelongnew = round($sumcajlelong,1,1); + $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; + $marhuns[$index1]['cajlelong'] = $cajlelongnew; + $marhuns[$index1]['baki'] = $totalbaki; $marhuns[$index1]['keuntungan'] = $keuntungan; - $marhuns[$index1]['nama'] = $customer; array_push($arraymarhun,[ 'norujukan' => $cal['norujukan'], @@ -4831,8 +4838,8 @@ class LelongController extends Controller 'pinjaman' => $cal['pinjaman'], 'pinjasal' => $gadai['pinjaman'], 'bakiupah' => $cal['bakiupah'], - 'cajlelong' => $cal['cajlelong'], - 'baki' => $cal['baki'], + 'cajlelong' => $cajlelongnew, + 'baki' => $totalbaki, 'upah6bulan' => $gadai['bakiupah'] ]); // $total_marhun = $total_marhun + sizeof($databid); @@ -4841,6 +4848,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 += $cajlelongnew; } $arrayinfo = []; @@ -4861,12 +4869,14 @@ class LelongController extends Controller ->toArray(); array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); } - return view('lelong.senaraimarhunpc',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat', + return view('lelong.senaraimarhunpc',compact('totalbaki','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat', 'total_pinjaman', 'total_upah', 'total_hargaasas', 'total_bakiupah', - 'total_nilaimarhun')); + 'total_nilaimarhun', + 'total_cazlelong', + )); } public function showlelongpc(Request $request, $id) @@ -4935,20 +4945,21 @@ class LelongController extends Controller $pinjaman =$pinjaman + $bid['pinjaman']; $bakiupah = $bakiupah + $bid['bakiupah']; $hargaasas = $hargaasas + $bid['hargaasas']; - $cajlelong = $cajlelong + $bid['cajlelong']; + // $cajlelong = $cajlelong + $bid['cajlelong']; $lelongsim = Lelong::where('id',$id)->get(); $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); - $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); - $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + $cajlelongnew = round($sumcajlelong, 1, 1); + // $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1); + $cajlelong = $cajlelong + $cajlelongnew; + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew; - if($totalbaki > 0) - { - $bakilelong = $bakilelong + $totalbaki; - } - else - { - $rugilelong = $rugilelong - $totalbaki; + if (strpos($totalbaki, '-') !== false) { + $rugi = -$totalbaki; + $rugilelong += $rugi; + } else { + $baki = $totalbaki; + $bakilelong += $baki; } diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index bd357345..691f083a 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -2045,15 +2045,33 @@ class MarhunController extends Controller ->select('lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong') ->get() ->toArray(); - + if($lelong){ foreach ($lelong as $info) { + $lelong_id = $info['lelong_id']; + // dd( $lelong_id ); + + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.kodcaw',$user->kodcaw) + // ->where('lelongbid.lelong_id', $info->lelong_id) + ->select('lelongbidder.user_id') + ->groupBy('lelongbidder.user_id') + ->get()->toArray(); + + foreach($listwinner as $index1=>$winner){ + + $userdetails = User::where('id', $winner['user_id'])->first(); + $listwinner[$index1]['details'] = $userdetails; + } + } + $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('lelong_id', $info['lelong_id']) ->where('cawangan.caw_code', $user->kodcaw) ->get() ->toArray(); - array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]); - } + array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]); + } return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo')); } @@ -2369,6 +2387,136 @@ class MarhunController extends Controller return $pdf->download('Senarai Marhun Pembida.pdf'); } + public function scanbarcodejualbycust($lelong_id,$userid) + { + $user = Auth::user(); + $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); + + $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('status_payment', '=', '1') + ->where('nopembeli', '=', $userid) + ->where('caw_id', '=', $caw->id) + ->select('id') + ->get() + ->keyBy('id'); + foreach ($lelongbid as $index => $value) { + $namabidder = LelongBidder:: + where('lelongbid_id', '=', $value['id']) + // ->where('lelongbid.kodcaw', '=', $user->kodcaw) + ->where('lelongbidder.status_bidder','=','1') + ->where('user_id', '=', $userid) + ->select('lelongbidder.lelongbid_id','lelongbidder.nama_bidder') + ->get(); + // dump($namabidder); + foreach ($namabidder as $namabid) { + $userdetails = User::where('id', $userid)->first(); + // dd($userdetails); + } + $lelongbid[$index]['nama_bidder'] = $namabidder; + $lelongbid[$index]['namabid'] = $userdetails; + } + // dd($namabidder); + $senaraiScanKeluar = ScanSemak::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'scan_semak.lelongbid_id') + ->where('scan_semak.lelong_id', '=', $lelong_id) + ->where('lelongbidder.status_bidder', '=', 1) + ->where('scan_semak.kodcaw', '=', $caw->caw_code) + ->where('lelongbidder.user_id', '=', $userid) + ->where('scan_semak.serahkpdpembida', '=', '1') + // ->whereNull('scan_masuk') + ->get(); + + $pluckLelongBid = $lelongbid->pluck('id')->toArray(); + $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray(); + $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar); + + $new_lelong_bid = LelongBid::with('scanSemakSelesaiJual') + ->whereIn('id', $diff_lelong_bid) + // ->whereIn('nopembeli', $userid) + ->get(); + // dd($new_lelong_bid); + + return view('marhun.scanbarcodejualbycust', compact('userid','userdetails','namabidder','new_lelong_bid','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar')); + } + + + public function scanKeluarMarhunjualbycust(Request $request) + { + $user = Auth::user(); + $current = Carbon::now(); + + $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) + ->where('serahkpdpembida', '=', '1') + ->get(); + + if ($checkExisting->isEmpty()) { + $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first(); + + $scanKeluar = new ScanSemak(); + $scanKeluar->kodcaw = $lelongbidItem['kodcaw']; + $scanKeluar->lelong_id = $lelongbidItem['lelong_id']; + $scanKeluar->lelongbid_id = $lelongbidItem['id']; + $scanKeluar->norujukan = $lelongbidItem['norujukan']; + $scanKeluar->khazanah_id = $user['id']; + $scanKeluar->scan_keluar = $current->toDateTimeString(); + $scanKeluar->serahkpdpembida = 1; + $scanKeluar->save(); + + $scanJualKeluar = new ScanJual(); + $scanJualKeluar->kodcaw = $lelongbidItem['kodcaw']; + $scanJualKeluar->lelong_id = $lelongbidItem['lelong_id']; + $scanJualKeluar->lelongbid_id = $lelongbidItem['id']; + $scanJualKeluar->norujukan = $lelongbidItem['norujukan']; + $scanJualKeluar->khazanah_id = $user['id']; + $scanJualKeluar->scan_keluar = $current->toDateTimeString(); + $scanJualKeluar->serah_marhun = $current->toDateTimeString(); + $scanJualKeluar->serahkpdpembida = 1; + $scanJualKeluar->save(); + + return redirect() + ->route('marhun.scanbarcodejualbycust', ['lelong_id'=>$request->lelong_id,'userid'=>$request->userid]) + ->with('success', 'Marhun Berjaya Di Scan Keluar Serahan Kepada Pembida.'); + } else { + return redirect() + ->route('marhun.scanbarcodejualbycust', ['lelong_id'=>$request->lelong_id,'userid'=>$request->userid]) + ->with('failed', 'Maaf,Marhun Telah Serah Kepada Pembida.'); + } + } + + public function cetakkeluarscanbarcodejualbycust($lelong_id,$userid) + { + $user = Auth::user(); + $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); + + $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('status_payment', '=', '1') + ->where('caw_id', '=', $caw->id) + ->get(); + + $userdetails = User::where('id', $userid)->first(); + + // $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id) + // ->where('kodcaw', '=', $caw->caw_code) + // ->where('serahkpdpembida', '=', '1') + // ->orderBy('id', 'desc') + // ->get(); + $senaraiScanKeluar = ScanSemak::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'scan_semak.lelongbid_id') + ->where('scan_semak.lelong_id', '=', $lelong_id) + ->where('lelongbidder.status_bidder', '=', 1) + ->where('scan_semak.kodcaw', '=', $caw->caw_code) + ->where('lelongbidder.user_id', '=', $userid) + ->where('scan_semak.serahkpdpembida', '=', '1') + // ->whereNull('scan_masuk') + ->get(); + // dd($senaraiScanKeluar); + // return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw')); + $pdf = PDF::loadView('pdf.cetakkeluarscanbarcodejualbycust', compact('caw', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar','userdetails'))->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai SAG Telah Serah Kepada Pembida.pdf'); + } + + } diff --git a/resources/views/marhun/scanbarcodejual.blade.php b/resources/views/marhun/scanbarcodejual.blade.php index 17b66d44..acda254d 100644 --- a/resources/views/marhun/scanbarcodejual.blade.php +++ b/resources/views/marhun/scanbarcodejual.blade.php @@ -67,7 +67,7 @@ - @foreach($new_lelong_bid as $index) + @forelse($new_lelong_bid as $index) {{$loop->iteration}} {{$index->norujukan}} @@ -81,7 +81,12 @@ --}} - @endforeach + @empty + + No Data + + + @endforelse diff --git a/resources/views/marhun/scanbarcodejualbycust.blade.php b/resources/views/marhun/scanbarcodejualbycust.blade.php new file mode 100644 index 00000000..bc5c921e --- /dev/null +++ b/resources/views/marhun/scanbarcodejualbycust.blade.php @@ -0,0 +1,145 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
+ + + +
+ Scan Barcode Keluar Kepada Pembida +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @elseif ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif + {{-- Kembali --}} + +

Tarikh Lelong: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp +

+

Nama Pembida: + {{$userdetails['name']}} +

+ + +
+
+
+
+
+ @csrf + +
Scan Barcode Marhun Untuk Serah Kepada Pembida
+ + + +
+
+
+ + + + + + + + + {{-- --}} + + + + @forelse($new_lelong_bid as $index) + + + + + + + {{-- --}} + + + @empty + + + + + @endforelse + +
BilNo RujukanMarhunN. MarhunBeratNama Pembida
{{$loop->iteration}}{{$index->norujukan}}{{$index->marhun}}{{ number_format($index->nilaimarhun, 2, '.', ',')}}{{$index->berat}} + @foreach($namabidder as $index=>$nama) + {{ $namabidder[0]['nama_bidder']}} + @endforeach +
No Data
+
+
+
+
+ {{--
+ @csrf + +
Scan Barcode Marhun Serahan Kepada Pembida
+ + +
--}} +
+
+ + + + + + + + + + + + @foreach ($senaraiScanKeluar as $index) + + + + + + + @endforeach + +
BilNo RujukanTarikh/Masa Scan KeluarStatus
{{$loop->iteration}}{{$index->norujukan}}{{$index->scan_keluar}}Telah Serah Kepada Pembida
+
+ +
+
+
+
+
+
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php index b4b29d7c..48ff25c1 100644 --- a/resources/views/marhun/senarailelongscanjual.blade.php +++ b/resources/views/marhun/senarailelongscanjual.blade.php @@ -28,12 +28,13 @@ No Batch Lelong Tarikh Lelong + Nama Pembida Status Lelong Tindakan - @foreach($arrayinfo as $lel) + @forelse($arrayinfo as $lel) {{$loop->iteration}} {{ $lel['info']['lelong_id']}} @@ -42,6 +43,14 @@ $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp + + {{-- @if(!empty($listwinner)) --}} + @foreach($lel['listwinner'] as $winner) + + {{ $winner['details']['name']}}
+ @endforeach + {{-- @endif --}} + @if($lel['info']['sts_lelong'] == 3) @@ -50,11 +59,16 @@ @if($lel['info']['sts_lelong'] == 3) - + {{-- --}} @endif - @endforeach + @empty + + No Data + + + @endforelse diff --git a/resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php b/resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php new file mode 100644 index 00000000..f3e08a0f --- /dev/null +++ b/resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + +

PERMODALAN KELANTAN BERHAD

LAPORAN SERAHAN KEPADA PEMBIDA
Cawangan: {{$caw['caw_name']}}
Batch Lelong: {{$lelong_id}}
Nama Pembida: {{$userdetails['name']}}
+ +
+ + + + + + + + + + + + @foreach ($senaraiScanKeluar as $index) + + + + + + + @endforeach + +
BilNo RujukanTarikh/Masa Scan KeluarStatus
{{$loop->iteration}}{{$index->norujukan}}{{$index->scan_keluar}}Telah Serah Kepada Pembida
+ + + + diff --git a/routes/web.php b/routes/web.php index 344f5a6e..66d3e91e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -282,7 +282,9 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::get('/cetakkeluarscanbarcodejual/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcodejual','uses'=>'MarhunController@cetakkeluarscanbarcodejual']); Route::get('/senaraiscanbarcode',['as'=>'marhun.senaraiscanbarcode','uses'=>'MarhunController@senaraiscanbarcode']); Route::post('/cetakscanbarcode',['as'=>'marhun.cetakscanbarcode','uses'=>'MarhunController@cetakscanbarcode']); - + Route::get('/scanbarcodejualbycust/{lelong_id}/{userid}',['as'=>'marhun.scanbarcodejualbycust','uses'=>'MarhunController@scanbarcodejualbycust']); + Route::post('/scankeluarmarhunjualbycust',['as'=>'marhun.scankeluarmarhunjualbycust','uses'=>'MarhunController@scankeluarmarhunjualbycust']); + Route::get('/cetakkeluarscanbarcodejualbycust/{lelong_id}/{userid}',['as'=>'marhun.cetakkeluarscanbarcodejualbycust','uses'=>'MarhunController@cetakkeluarscanbarcodejualbycust']); //Penilai Route::post('/addphotomarhun',['as'=>'marhun.addphotomarhun','uses'=>'MarhunController@addPhotoMarhun']); From 0d93ae085ac1d05f27214cc5ecb305c35ba95fa3 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 28 Nov 2022 12:14:26 +0800 Subject: [PATCH 2/7] update senleltangguh --- .../Controllers/TangguhLelongController.php | 10 ++++++---- .../tangguhlelong/senactionoperasi.blade.php | 19 +++++++++++++------ .../tangguhlelong/senleltangguh.blade.php | 4 +++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index fba19143..eeee2f25 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -286,10 +286,10 @@ class TangguhLelongController extends Controller ->where('lelong.sts_lelong',0) ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') ->distinct() - ->get() - ->toArray(); + ->get(); + // ->toArray(); - foreach($tangguh as $t) + foreach($tangguh as $index=>$t) { $sag = TangguhLelong::where('lelong_id', $t['lelong_id']) ->where('kodcaw', $t['caw_code']) @@ -298,12 +298,13 @@ class TangguhLelongController extends Controller ->get() ->count(); + $tangguh[$index]['bilsag'] = $sag; array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]); } - return view('tangguhlelong.senleltangguh',compact('tangguh','sag')); + return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo')); } @@ -726,6 +727,7 @@ class TangguhLelongController extends Controller $tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw) ->get(); + // dd($tangguh); foreach($tangguh as $index1=>$t) { diff --git a/resources/views/tangguhlelong/senactionoperasi.blade.php b/resources/views/tangguhlelong/senactionoperasi.blade.php index f4f79507..eec663dc 100644 --- a/resources/views/tangguhlelong/senactionoperasi.blade.php +++ b/resources/views/tangguhlelong/senactionoperasi.blade.php @@ -3,11 +3,18 @@ @section('content')
-
-

Senarai Permohonan Tangguh Lelong

- +
+
+
+ + + +
+ Senarai Permohonan Tangguh Lelong + +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -15,7 +22,7 @@ @endif
- +
diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index a481fc35..7fe8dae1 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -49,7 +49,9 @@ {{$lel['caw_name']}}
- +
No {{$sag}} + {{$lel['bilsag']}} + {{$lel['jbg']}} From 9afab6580785644e000658bbec0ad3fd75b444ae Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 28 Nov 2022 15:51:36 +0800 Subject: [PATCH 3/7] update tukar tarikh lelong --- app/Http/Controllers/LelongController.php | 45 +++++++++---------- .../views/lelong/showtukartarikh.blade.php | 4 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c31956aa..e69be024 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -2588,7 +2588,7 @@ class LelongController extends Controller $tarikhlelongbaru = $request->tarikhlelongbaru; // dd($tarikhlelongbaru); $lelongidasal = $request->lelongidasal; - $lelongidbaru = $request->lelongidbaru; + // $lelongidbaru = $request->lelongidbaru; // dd($request->caw); $lelkarat = LelKarat::where('lelong_id','=',$lelongidasal)->get(); @@ -2601,26 +2601,26 @@ class LelongController extends Controller // dd($cawanganasal); // dd( $lelongidbaru); - $lelongnew = new Lelong(); - $lelongnew->tarikh_lelong = $tarikhlelongbaru; - $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas; - $lelongnew->jbg = $lelongasal->jbg; - $lelongnew->cajlelong = $lelongasal->cajlelong; - $lelongnew->fasa = $lelongasal->fasa; - $lelongnew->kali = $lelongasal->kali; - $lelongnew->save(); + // $lelongnew = new Lelong(); + // $lelongnew->tarikh_lelong = $tarikhlelongbaru; + // $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas; + // $lelongnew->jbg = $lelongasal->jbg; + // $lelongnew->cajlelong = $lelongasal->cajlelong; + // $lelongnew->fasa = $lelongasal->fasa; + // $lelongnew->kali = $lelongasal->kali; + // $lelongnew->save(); - foreach($lelkarat as $lelongKarat) - { - $lelkarat = new LelKarat; - $lelkarat->lelong_id = $lelongnew->id; - $lelkarat->karat = $lelongKarat->karat; - $lelkarat->keterangan = $lelongKarat->keterangan; - $lelkarat->harga = $lelongKarat->harga; - $lelkarat->harga2 = $lelongKarat->harga2; - $lelkarat->save(); - } + // foreach($lelkarat as $lelongKarat) + // { + // $lelkarat = new LelKarat; + // $lelkarat->lelong_id = $lelongnew->id; + // $lelkarat->karat = $lelongKarat->karat; + // $lelkarat->keterangan = $lelongKarat->keterangan; + // $lelkarat->harga = $lelongKarat->harga; + // $lelkarat->harga2 = $lelongKarat->harga2; + // $lelkarat->save(); + // } //tukartarikh ID lelong @@ -2635,10 +2635,8 @@ class LelongController extends Controller // dd($cawtukartarikh->caw_id); - $caw_tukartarikh = CawanganLelong::where('caw_id', $cawtukartarikh->id) - ->where('lelong_id', $request->lelongidasal)->first(); - // dd($caw_tukartarikh); - $caw_tukartarikh->lelong_id = $request->lelongidbaru; + $caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first(); + $caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru; $caw_tukartarikh->update(); $surat = LelongBid::where('lelong_id','=',$lelongidasal) @@ -2654,7 +2652,6 @@ class LelongController extends Controller { // dd($request->lelongidbaru); $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first(); - $caw_pindahsag->lelong_id = $request->lelongidbaru; $caw_pindahsag->t_lelong = $tarikhlelongbaru; $caw_pindahsag->update(); } diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php index f26ba272..2721e49e 100644 --- a/resources/views/lelong/showtukartarikh.blade.php +++ b/resources/views/lelong/showtukartarikh.blade.php @@ -85,13 +85,13 @@ -
+ {{--
-
+
--}} From 9e4fcd02757cd966d0e7d791ac35151d964436ac Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 28 Nov 2022 21:30:02 +0800 Subject: [PATCH 4/7] update back button --- .../Controllers/TangguhLelongController.php | 20 +++++----- app/Mail/ResetPassword.php | 4 +- .../views/lelong/listsagpindah.blade.php | 40 ++++++++++--------- .../views/pembida/senaraipembida.blade.php | 13 ++++-- .../senaraipembidakeseluruhan.blade.php | 15 +++++-- .../simulasi/tempbycawsimulasi.blade.php | 2 +- .../tangguhlelong/senleltlhtangguh.blade.php | 13 ++++-- .../tangguhlelong/sentangguhoperasi.blade.php | 33 +++++++++------ 8 files changed, 86 insertions(+), 54 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index eeee2f25..65c38c9d 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -965,17 +965,19 @@ class TangguhLelongController extends Controller ->where('kodcaw','=',$caw_code) ->get(); - // dd($pengesahan); + // dd($tangguh); + if($tangguh){ + foreach($tangguh as $index1=>$sah) + { + $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->where('lelong.id', $sah->lelong_id) + ->get(); + // dd($lelongbid); - foreach($tangguh as $index1=>$sah) - { - $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->where('lelong.id', $sah->lelong_id) - ->get(); - // dd($lelongbid); - - $tangguh[$index1]['bid_details'] = $lelongbid; + $tangguh[$index1]['bid_details'] = $lelongbid; + $tangguh[$index1]['status'] = $sah['status']; + } } // $filter_null = function($x){ diff --git a/app/Mail/ResetPassword.php b/app/Mail/ResetPassword.php index 668d5b9d..4932239a 100644 --- a/app/Mail/ResetPassword.php +++ b/app/Mail/ResetPassword.php @@ -36,8 +36,8 @@ class ResetPassword extends Mailable $user['name'] = $this->name; $user['token'] = $this->token; - return $this->from("masterlelongpkb@gmail.com", "Admin Lelong") - ->subject('Sistem Lelong Online PKB-Tukar Katalaluan') + return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid") + ->subject('ArrahnBid -Tukar Katalaluan') ->view('template.reset-password', ['user' => $user]); } } diff --git a/resources/views/lelong/listsagpindah.blade.php b/resources/views/lelong/listsagpindah.blade.php index 774b8024..f1f50317 100644 --- a/resources/views/lelong/listsagpindah.blade.php +++ b/resources/views/lelong/listsagpindah.blade.php @@ -4,25 +4,27 @@
-
- - Senarai Lelong(Pindah Batch Lelong) - @foreach ($arrayinfo as $laporan) +
+
+
+ + + + @foreach ($arrayinfo as $laporan) +
+ Senarai SAG(Pindah Batch Lelong) : @foreach($laporan['details'] as $details) + {{ $details['caw_name']}} + @endforeach +
+
+
- Batch 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'); echo($datez); - @endphp - @foreach($laporan['details'] as $details) - Nama Cawangan : {{ $details['caw_name']}} - Kod Cawangan : {{ $details['caw_code']}} - @endforeach - @endforeach @if ($message = Session::get('success')) @@ -34,15 +36,15 @@ @csrf -
Pindah Ke-
+
+ - +
@@ -51,10 +53,10 @@ - + @@ -67,7 +69,7 @@ - + diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php index 3d829a63..a46bd3e6 100644 --- a/resources/views/pembida/senaraipembida.blade.php +++ b/resources/views/pembida/senaraipembida.blade.php @@ -3,8 +3,15 @@ @section('content')
-
- +
+
+
+ +
+ Senarai Pembida +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -16,7 +23,7 @@
@csrf -
PilihTempoh Berat (gm) Nilai Marhun (RM)Harga Asas (RM) Pembiayaan (RM) Keuntungan (RM) Caj Lelong (%)Harga Asas (RM) Rugi Lelong (RM) Baki Lelong (RM) {{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['norujukan']}} {{ $marhun['jbg']}} {{ $marhun['berat'] }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}
+
diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php index dfae7378..bd63563c 100644 --- a/resources/views/pembida/senaraipembidakeseluruhan.blade.php +++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php @@ -3,8 +3,15 @@ @section('content')
-
- +
+
+
+ +
+ Senarai pembida +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -16,7 +23,7 @@ @csrf -
+
@@ -49,7 +56,7 @@ @endif @endforeach diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php index 59bf443f..551818dc 100644 --- a/resources/views/simulasi/tempbycawsimulasi.blade.php +++ b/resources/views/simulasi/tempbycawsimulasi.blade.php @@ -51,8 +51,8 @@ - + diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php index 2b13adc7..56dcd5bc 100644 --- a/resources/views/tangguhlelong/senleltlhtangguh.blade.php +++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php @@ -3,8 +3,15 @@ @section('content')
-
-

Senarai Telah Tangguh Lelong

+
+
+
+ +
+ Senarai Telah Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +19,7 @@ @endif -
- +
{{ $surat['list_norujukan'][0]['norujukan'] }} {{ $surat['list_norujukan'][0]['nokp'] }} {{ $surat['list_norujukan'][0]['tempoh'] }}{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }} {{ number_format($surat['list_norujukan'][0]['berat'] , 2, '.', ',') }}{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }} {{ number_format($surat['list_norujukan'][0]['pinjaman'] , 2, '.', ',') }} {{ number_format($surat['list_norujukan'][0]['bakipjm'] , 2, '.', ',') }} {{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}
+
diff --git a/resources/views/tangguhlelong/sentangguhoperasi.blade.php b/resources/views/tangguhlelong/sentangguhoperasi.blade.php index 6816144a..cbc209d6 100644 --- a/resources/views/tangguhlelong/sentangguhoperasi.blade.php +++ b/resources/views/tangguhlelong/sentangguhoperasi.blade.php @@ -3,10 +3,17 @@ @section('content')
-
- +
+
+
+ + + +
+ Pengesahan Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -14,7 +21,7 @@ @endif -
No
+
@@ -31,7 +38,7 @@ - @foreach ($tangguh as $index1=>$sah) + @forelse ($tangguh as $index1=>$sah) @@ -71,16 +78,16 @@ - @endforeach + @empty + + + + + @endforelse
No
No Data
-
- - -
+
From 65024489b1d44d497e7bd67cc07f1834dc6fa451 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 29 Nov 2022 00:21:15 +0800 Subject: [PATCH 5/7] update page laporan role caw --- .../Controllers/ReportCawanganController.php | 3 +- .../views/account/listbayaranonline.blade.php | 23 ++- .../views/account/senarailelongan.blade.php | 18 +- .../views/home/listbayaranonline.blade.php | 6 +- .../lelong/indexbrgleldetailscaw.blade.php | 19 +- .../lelong/indexbrglelpembidacaw.blade.php | 19 +- .../views/lelong/indexlelfullcaw.blade.php | 19 +- .../lelong/indexnamapembidacaw.blade.php | 19 +- .../views/lelong/laporancawindex.blade.php | 20 +- resources/views/pdf/brglelcaw.blade.php | 41 ++-- .../pdf/laporanbrgleldetailscaw.blade.php | 132 +++++++++---- .../pdf/laporanbrglelpembidacaw.blade.php | 97 +++++++--- .../views/pdf/laporanlelfullcaw.blade.php | 177 +++++++++++------- .../views/pdf/laporannamapembidacaw.blade.php | 98 +++++++--- 14 files changed, 468 insertions(+), 223 deletions(-) diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 0a9024ac..a15d9e0e 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -252,6 +252,7 @@ class ReportCawanganController extends Controller $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->select('lelongbid_id','norujukan','hargaasas') ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbid.kodcaw','=',$user['kodcaw']) ->groupBy('lelongbid_id') ->get() ->toArray(); @@ -350,7 +351,7 @@ class ReportCawanganController extends Controller $pdf = PDF::loadView('pdf.laporanlelfullcaw',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan', 'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw')) - ->setPaper('a4', 'potrait'); + ->setPaper('a4', 'landscape'); return $pdf->download('Laporan Lelong Keseluruhan.pdf'); diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php index 08015fcb..68141115 100644 --- a/resources/views/account/listbayaranonline.blade.php +++ b/resources/views/account/listbayaranonline.blade.php @@ -4,10 +4,17 @@
-
-
+
+
+
+ + + +
+ Senarai Bayaran Atas Talian +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -15,7 +22,7 @@ @endif

Senarai Bayaran Atas Talian

{{ $getkodcaw['caw_name'] }}

- +
@@ -39,17 +46,17 @@ @endforeach
No{{ number_format($winner['totalPay'], 2, '.', ',')}} {{ number_format($winner['totalBid'], 2, '.', ',')}} - +
-
+ {{--
Kembali
-
+
--}}