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

fix kemaskiini marhun

Browse Source
This commit is contained in:
Amir
2022-09-26 16:19:12 +08:00
parent 4cb1aab426
commit e8714acd5d
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+38 -15
View File
@@ -131,10 +131,9 @@ class MarhunController extends Controller
->first();
$statusSemakMarhun = ScanSemak::where('lelongbid_id', $bid['id'])
->whereNotNull('masa_terima')
->whereNull('masa_serah')
->whereNotNull('scan_keluar')
->whereNull('serah_marhun')
->first();
dd($statusSemakMarhun);
if ($statusSemakMarhun) {
$lelongbid[$index1]['statusterimamarhun'] = 1;
}
@@ -356,7 +355,7 @@ class MarhunController extends Controller
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
// $currentdate = $currentdate->toDateTimeString();
$lelongBidMarhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first();
$lelongbid = LelongBid::where('id','=',$lelongBidMarhun->lelongbid_id)->first();
$lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first();
@@ -365,16 +364,31 @@ class MarhunController extends Controller
$parameterBezaBerat = 0.3; //parameterBezaBerat = (berat sebelum) - (berat selepas)
$bezaBerat = $lelongBidMarhun->berat - $request->berat_emas;
if ($bezaBerat > $parameterBezaBerat) {
if ($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 4;
$pengesahan->request_data = $request->berat_emas;
$pengesahan->diminta_pada = $currentdate->toDateTimeString();
$pengesahan->status_ubah = 5; //ubah mutu & berat
$pengesahan->request_berat = $request->berat_emas;
$pengesahan->request_karat = $request->karat;
$pengesahan->save();
// dd($pengesahan);
}
else if ($bezaBerat > $parameterBezaBerat) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate->toDateTimeString();
$pengesahan->status_ubah = 4; //ubah berat
$pengesahan->request_berat = $request->berat_emas;
$pengesahan->save();
}
else if ($lelongBidMarhun->karat > $request->karat) {
@@ -384,11 +398,11 @@ class MarhunController extends Controller
$pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 1;
$pengesahan->request_data = $request->karat;
$pengesahan->diminta_pada = $currentdate->toDateTimeString();
$pengesahan->status_ubah = 1; //ubah karat
$pengesahan->request_karat = $request->karat;
$pengesahan->save();
}
}
else {
// $lelongBidMarhun->id;
$lelongBidMarhun->marhun = $request->marhun;
@@ -451,7 +465,15 @@ class MarhunController extends Controller
$lelongbid->filemarhun_filename = $filemarhun->filename;
$lelongbid->filemarhun_id = $filemarhun->id;
}
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $id)->get();
$marhun = LelongBidMarhun::with(
// ['pengesahan' => function ($query)
// {
// $query->select('norujukan');
// }
// ]
'pengesahan'
)
->where('lelongbid_id', '=', $id)->get();
foreach ($marhun as $index) {
$eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $index['id'])->first();
if (isset($eachmarhun)) {
@@ -887,8 +909,9 @@ class MarhunController extends Controller
// dd($marhun);
$status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id)
->where('lelongbid_id', $marhun['lelongbid_id'])
->select('status_ubah')
->value('status_ubah');
->select('status_ubah', 'request_karat', 'request_berat', 'request_marhun')
->first();
// dd($status);
// $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
// ->where('norujukan', $lelongbid->norujukan)