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

Merge branch 'main' into amir_dev_2

Browse Source
This commit is contained in:
Amir
2023-01-31 10:55:32 +08:00
parent bf704edb21 877cb2eb43
commit de892b7d7e
9 changed files with 507 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PembidaController.php
+3 -1
View File
@@ -1062,6 +1062,7 @@ class PembidaController extends Controller
{
// dd($detailspayment);
$detailspayment = null;
$scanserah = null;
if($sag['payment_id'] != null)
{
$detailspayment = Payment::where('id', $sag['payment_id'])->first();
@@ -1075,7 +1076,8 @@ class PembidaController extends Controller
}else
{
$total_payment = '0.00';
$scanserah = 'Belum Bayar';
//$scanserah = 'Belum Bayar';
$scanserah = null;
}
}
app/Http/Controllers/TangguhLelongController.php
+29 -47
View File
@@ -279,15 +279,14 @@ class TangguhLelongController extends Controller
{
$arrayinfo = [];
$tangguh = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
->join('lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
$tangguh = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')
->where('tangguhlelong.status','!=',4)
->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')
->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
->distinct()
->get();
// ->toArray();
//display only cwgn yg mohon tangguh 24.01.2023..to be continued..done
foreach($tangguh as $index=>$t)
{
@@ -302,8 +301,6 @@ class TangguhLelongController extends Controller
array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]);
}
return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo'));
}
@@ -911,58 +908,37 @@ class TangguhLelongController extends Controller
{
$arrayinfo = [];
// $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
// ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
// ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
// ->where('lelong.sts_lelong', 0)
// ->where('tangguhlelong.status',4)
// ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong','cawangan.caw_code')
// ->groupBy('cawangan_lelong.lelong_id')
// ->get()
// ->toArray();
$lelong = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
->join('lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
->where('tangguhlelong.status',4)
->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')
$lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')
->where(function($query){
$query->whereNull('tangguhlelong.status')
->orWhere('tangguhlelong.status','=', 4);
})
->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
->distinct()
->orderBy('cawangan_lelong.lelong_id')
->get()
->toArray();
->get();
//display only cwgn yg mohon tangguh 24.01.2023..to be continued ..done
$lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('lelong.sts_lelong',0)
->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong')
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
// dd($lelong);
foreach($lelong as $info)
foreach($lelong as $index=>$info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
$sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
// ->where('kodcaw', $info['caw_code'])
->where('status',4)
->where('kodcaw', $info['caw_code'])
->where(function($query){
$query->whereNull('tangguhlelong.status')
->orWhere('tangguhlelong.status','=', 4);
})
->select('norujukan')
->get()
->count();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo, 'sag'=>$sag]);
// dd($arrayinfo);
$tangguh[$index]['bilsag'] = $sag;
array_push($arrayinfo,['info'=>$info, 'sag'=>$sag]);
}
return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo'));
}
public function operasisenlulustangguh($lelong_id, $caw_code)
{
$caw_code = $caw_code;
@@ -970,8 +946,12 @@ class TangguhLelongController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$tangguh = TangguhLelong::where('status',4)
$tangguh = TangguhLelong::where(function($query){
$query->whereNull('tangguhlelong.status')
->orWhere('tangguhlelong.status','=', 4);
})
->where('kodcaw','=',$caw_code)
->where('lelong_id','=',$lelong_id)
->get();
// dd($tangguh);
@@ -1021,4 +1001,6 @@ class TangguhLelongController extends Controller
]);
}
}