Merge branch 'main' into amirah

This commit is contained in:
Amirah22
2022-04-27 14:02:21 +08:00
6 changed files with 33 additions and 22 deletions
+13 -7
View File
@@ -57,7 +57,7 @@ class SimulasiController extends Controller
public function janadata(Request $request)
{
// dd($request->all());
//dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
@@ -185,22 +185,27 @@ class SimulasiController extends Controller
}
elseif($request->caw && $request->caw != 'all')
{
// dd($request->caw);
$caw = Cawangan::where('id','=',$request->caw)->first();
//dd($request->caw);
$caw = Cawangan::whereIn('id',$request->caw)->get();
// dd($caw);
foreach($caw as $index=>$cawsimulasi){
// dd($cawsimulasi->id);
$caw_simulasi = new CawanganSimulasi;
$caw_simulasi->simulasi_id = $simulasi->id;
$caw_simulasi->caw_id = $caw->id;
$caw_simulasi->caw_id = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->save();
// dd($caw_simulasi);
$suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
// $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
foreach($suratcaw as $data)
{
$simulasibid = new SimulasiBid;
$simulasibid->simulasi_id = $simulasi->id;
$simulasibid->caw_id = $caw->id;
$simulasibid->caw_id = $cawsimulasi->id;
$simulasibid->kodcaw = $data->kodcaw;
$simulasibid->norujukan = $data->norujukan;
$simulasibid->t_lelong = $request->tarikh_lelong;
@@ -267,6 +272,7 @@ class SimulasiController extends Controller
$updatesimbid->save();
}
}
}
else
{
dd('error');