KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 15/11/2022

Browse Source
This commit is contained in:
Amirah22
2022-11-15 16:16:23 +08:00
parent ae8135989b
commit 0918122d39
7 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+14 -7
View File
@@ -663,7 +663,7 @@ class LelongController extends Controller
$simulasi->delete();
return redirect()->route('lelong.senarailelong')
->with('success','Create Lelong Berjaya');
->with('success','Pendaftaran Lelong Berjaya');
}
@@ -678,6 +678,7 @@ class LelongController extends Controller
$currentdate = Carbon::now();
$currentdate2 = $currentdate->toDateString();
$lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at')
@@ -689,12 +690,19 @@ class LelongController extends Controller
foreach($lelong as $laporan)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
///////////// lelong belum mula
$lelong2 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
@@ -715,6 +723,7 @@ class LelongController extends Controller
////////// lelong selesai
$lelong3 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at')
->groupBy('lelong_id')
@@ -750,6 +759,7 @@ class LelongController extends Controller
/////////////// lelong jana pemenang
$lelong5 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at')
->groupBy('lelong_id')
@@ -764,9 +774,6 @@ class LelongController extends Controller
->toArray();
array_push($arraydetails5,['laporan5' => $laporan5,'details5' => $details5]);
}
return view('lelong.senarailelong',compact('lelong', 'arraydetails',
'lelong2','arraydetails2',
@@ -3103,7 +3110,7 @@ class LelongController extends Controller
}
return redirect()->route('lelong.senarailelong')
->with('success','Create Lelong Berjaya');
->with('success','Pendaftaran Lelong Berjaya');
}
public function listsagbycust($lelongid, $cawid)
app/Http/Controllers/NotisController.php
+2 -15
View File
@@ -144,6 +144,7 @@ class NotisController extends Controller
$datalelong = $marhun->get();
$marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->select('nokp','norujukan')
->orderBy('nokp', 'asc')
->get();
// dd($marhuns);
$arraysag = [];
@@ -172,20 +173,6 @@ class NotisController extends Controller
}
// dd($marhuns->toArray());
// $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
// $datacustomer = $gadaicaw2->get();
// $customer = Customer::query()
// ->whereIn('kpbaru',$arraycustomer)
// ->orWhereIn('kplama',$arraycustomer)
// ->join('daerah','customer.koddaerah','=','daerah.koddaerah')
// ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri')
// ->join('poskod','customer.poskod','=','poskod.poskod')
// ->get()->toArray();
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code','=',$user->kodcaw)
@@ -204,7 +191,7 @@ class NotisController extends Controller
$lelong_id = $request->lelong_id;
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();