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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-06-14 08:56:02 +08:00
parent f9fe6de4f8 06e33f07ce
commit 5e29943f84
43 changed files with 2549 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+90 -43
View File
@@ -64,7 +64,9 @@ class MarhunController extends Controller
->where('status_semak', 1)
->get();
$dalamproses = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
$dalamproses = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
->where('pengesahan.lelong_id', $lelong_id)
->where('caw_id','=', $caw->id)
->whereNull('pengesahan.disahkan_oleh')
->get();
@@ -299,15 +301,13 @@ class MarhunController extends Controller
public function senarailelongmarhun(Request $request){
$user = Auth::user();
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->get()
->toArray();
@@ -408,8 +408,15 @@ class MarhunController extends Controller
public function exportmarhundetails($lelong_id)
{
$user = Auth::user();
//dd($user);
$lelongs= LelongBid::where('lelong_id','=',$lelong_id)
->get()->toArray();
->where('kodcaw','=',$user['kodcaw'])
->get()
->toArray();
//dd($lelongs);
$arraycaw= [];
@@ -466,7 +473,7 @@ class MarhunController extends Controller
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
@@ -520,19 +527,20 @@ class MarhunController extends Controller
{
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
$lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id')
// ->where('sts_lelong', 0)
->whereIn('pengesahan.status_ubah', [1,2,3,4,5])
->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong')
// ->groupBy('pengesahan.lelong_id')
->distinct()
->get()
->toArray();
// dd($lelong);
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
@@ -550,7 +558,8 @@ class MarhunController extends Controller
->whereIn('status_ubah', [1,2,3,4,5])
->selectRaw('count(*) as total, sum(status) as tstat,norujukan')
->groupBy('norujukan')
->get()->toArray();
->get()
->toArray();
foreach($mutumarhun as $index1=>$mutu)
{
@@ -822,15 +831,40 @@ class MarhunController extends Controller
{
$arrayinfo = [];
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
// $lelong = Lelong::join('tangguhlelong','lelong.id','=','tangguhlelong.lelong_id')
// ->select('tangguhlelong.norujukan','tangguhlelong.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong')
// ->distinct()
// ->get()
// ->toArray();
$lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
->select('tangguhlelong.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong')
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
// dd($lelong);
foreach($lelong as $details)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $details['id'])
// $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
// ->where('cawangan_lelong.lelong_id', $details['id'])
// ->distinct()
// ->get()
// ->toArray();
$detailsinfo = CawanganLelong::select('tangguhlelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
->where('tangguhlelong.lelong_id', $details['id'])
// ->where('tangguhlelong.norujukan', $details['norujukan'])
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
// dd($detailsinfo);
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
@@ -838,10 +872,11 @@ class MarhunController extends Controller
return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
}
public function senaraitangguhlelong($id, $caw_name)
public function senaraitangguhlelong($id, $caw_code)
{
// dd($id);
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', 'like', "%$caw_code%")
->whereNotNull('tangguhlelong.tarikhtangguh')
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
@@ -858,19 +893,21 @@ class MarhunController extends Controller
'lelong.sts_lelong'
)
->get();
// dd($tangguhlelong);
//dd($tangguhlelong);
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $id)
->where('kodcaw', $caw_code)
->select('cawangan.caw_name')
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name'));
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_code', 'getkodcaw'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
@@ -907,26 +944,36 @@ class MarhunController extends Controller
}
//Operasi
// public function pcdelete($id, $lelongbid_id)
// {
// $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
// $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
// ->where('pengesahan.lelongbid_id', $lelongbid_id)
// ->select('pengesahan.id as pengesahan_id')
// ->first();
// $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
// ->where('lelongbid_id','=',$lelongbid_id)
// ->get();
public function listsahubahmutu($id){
// $lelongbid = LelongBid::where('id', $lelongbid_id)->first();
// $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
// $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
// $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
// $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
// $lelongbid->save();
$user = Auth::user();
$cawangan = Pengesahan::join('users', 'pengesahan.diminta_oleh', 'users.id')
->where('pengesahan.lelong_id', $id)
->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')
->distinct()
->get();
// dd($cawangan);
foreach($cawangan as $index1=>$caw)
{
// dd($caw);
$getpengesahan = Cawangan::where('caw_code', $caw['kodcaw'])->first();
// dd($getpengesahan);
$getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
$getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
// dd($getdisahkanoleh);
$cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
$cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
$cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
}
return view('pengesahan.listperubahanmutumarhun', compact('cawangan', 'id'));
}
// }
}