Merge branch 'atie' into 'main'
update tidak sah semakan marhun oleh pc See merge request online-sistem1/lelong!244
This commit is contained in:
@@ -991,8 +991,9 @@ class MarhunController extends Controller
|
||||
|
||||
$status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id)
|
||||
->where('lelongbid_id', $marhun['lelongbid_id'])
|
||||
->select('status_ubah', 'request_karat', 'request_berat', 'request_marhun')
|
||||
->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
|
||||
->first();
|
||||
// dd($status);
|
||||
// dump($lelbidmarhun->lelongbidmarhun_id);
|
||||
if($status){
|
||||
if($status->status_ubah == 8 )//jika mutu,berat dan marhun
|
||||
@@ -1316,9 +1317,15 @@ class MarhunController extends Controller
|
||||
$updatelelongbid->hargaasas = $itemmarhun->sum('hargaasas');
|
||||
$updatelelongbid->update();
|
||||
}
|
||||
|
||||
}
|
||||
elseif ($request->jenis_button == "tidaksah"){
|
||||
$deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id)
|
||||
->where('lelong_id', $request->lelong_id)
|
||||
->where('norujukan', $request->norujukan)
|
||||
->delete();
|
||||
|
||||
}
|
||||
// $lelongbids = LelongBid::where('id', $request->lelongbid_id)->first();
|
||||
// $lelongbids->marhun = str_replace($txtmarhun, "", $lelongbids->marhun);
|
||||
|
||||
|
||||
return redirect()->route('pengesahan.senarailelongubahmutu')->with('success', 'Pengesahan Mutu Marhun Berjaya');
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
</table>
|
||||
<div class="modal-footer" style="margin-top:2%;">
|
||||
|
||||
<button type="button" class="btn btn-danger">Tidak Sah</button>
|
||||
<button type="button" class="btn btn-danger" onclick="functerima(this)" id="tidaksah" >Tidak Sah</button>
|
||||
<button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Sahkan</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -328,6 +328,11 @@
|
||||
console.log(idmarhun, norujukan);
|
||||
// $("#formmutumarhun").submit();
|
||||
}
|
||||
else if(jenis == "tidaksah")
|
||||
{
|
||||
$('#jenis_button').val(jenis);
|
||||
$("#formmutumarhun").submit();
|
||||
}
|
||||
}
|
||||
function submit(e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user