Merge branch 'atie' into 'main'

update semakan marhun dan cutomize table

See merge request online-sistem1/lelong!279
This commit is contained in:
Nur Izzati Zulkifli
2022-11-21 13:26:38 +00:00
24 changed files with 1237 additions and 284 deletions
+2 -1
View File
@@ -310,7 +310,8 @@ class LelongController extends Controller
'data',
'total_bakiupah',
'total_nilaimarhun',
'tarikhkemaskini'
'tarikhkemaskini',
'lelong'
));
}
+330 -44
View File
@@ -26,6 +26,7 @@ use App\Models\ScanSemak;
use App\Models\TangguhLelong;
use Carbon\Carbon;
use App\Models\ScanJual;
use App\Models\TempPengesahan;
use DateTime;
class MarhunController extends Controller
@@ -150,6 +151,7 @@ class MarhunController extends Controller
// dd($sahkan);
$lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id'])
->where('pengesahan.status', '0')
->select('pengesahan.disahkan_oleh',
'pengesahan.disahkan_pada'
)
@@ -364,10 +366,12 @@ class MarhunController extends Controller
$lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first();
// $perluPengesahan = false;
$parameterBezaBerat = 0.3; //parameterBezaBerat = (berat sebelum) - (berat selepas)
$parameterBezaBerat = 0.0; //parameterBezaBerat = (berat sebelum) - (berat selepas)
$bezaBerat = $lelongBidMarhun->berat - $request->berat_emas;
// dd($request->marhun);
if($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
// if($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
if($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
@@ -383,7 +387,7 @@ class MarhunController extends Controller
// dd($pengesahan);
}
else if($lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
else if($lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
@@ -398,7 +402,7 @@ class MarhunController extends Controller
// dd($pengesahan);
}
else if($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->marhun != $request->marhun) {
else if($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->marhun != $request->marhun) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
@@ -413,7 +417,7 @@ class MarhunController extends Controller
// dd($pengesahan);
}
else if ($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat) {
else if ($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
@@ -428,7 +432,7 @@ class MarhunController extends Controller
// dd($pengesahan);
}
else if ($bezaBerat > $parameterBezaBerat) {
else if ($lelongBidMarhun->berat != $request->berat_emas) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
@@ -440,7 +444,7 @@ class MarhunController extends Controller
$pengesahan->request_berat = $request->berat_emas;
$pengesahan->save();
}
else if ($lelongBidMarhun->karat > $request->karat) {
else if ($lelongBidMarhun->karat != $request->karat) {
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
@@ -540,26 +544,27 @@ class MarhunController extends Controller
$lelongbid->filemarhun_filename = $filemarhun->filename;
$lelongbid->filemarhun_id = $filemarhun->id;
}
$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();
$marhun = LelongBidMarhun::with('pengesahan')->where('lelongbid_id', '=', $id)->get();
// dd($marhun);
foreach ($marhun as $index=>$data) {
$eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $data['id'])->first();
if (isset($eachmarhun)) {
$index->eachmarhun_filename = $eachmarhun->filename;
$index->eachmarhun_id = $eachmarhun->id;
$data->eachmarhun_filename = $eachmarhun->filename;
$data->eachmarhun_id = $eachmarhun->id;
}
$status = Pengesahan::where('lelongbid_id', $id)
->where('lelong_id', $lelongbid['lelong_id'])
->first();
// dd($status);
$marhun[$index]['status'] = $status;
// dd($status);
}
$lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get();
$karatall = JenisKarat::all();
$emasall = JenisEmas::all();
return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id'));
return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id','status'));
}
@@ -841,7 +846,7 @@ class MarhunController extends Controller
->join('lelongbid','lelongbid.id','=','pengesahan.lelongbid_id')
->where('sts_lelong', 0)
->where('lelongbid.kodcaw', $user->kodcaw)
->whereIn('pengesahan.status_ubah', [1,2,3,4,5])
->whereIn('pengesahan.status_ubah', [1,2,3,4,5,7,8,9,10])
->select('lelong.fasa','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')
@@ -1006,7 +1011,7 @@ class MarhunController extends Controller
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1);
$newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']);
// dump($lelbidmarhun->lelongbidmarhun_id);
}
else if($status->status_ubah == 10)//jika berat dan marhun
@@ -1017,7 +1022,7 @@ class MarhunController extends Controller
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($status['request_berat'] * $marhun['harga'], 1);
$newhargaasas = round($status['request_berat'] * $marhun['harga'], 1);
// dd($newhargaasas);
}
else if($status->status_ubah == 9)//jika mutu dan marhun
@@ -1028,7 +1033,7 @@ class MarhunController extends Controller
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($marhun['berat'] * $getkaratnew['harga2'], 1);
$newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']);
// dd($newhargaasas);
}
@@ -1038,7 +1043,7 @@ class MarhunController extends Controller
->where('lelong_id', $id)
->first();
// dd($getkaratnew);
$newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
// dd($newhargaasas);
}
elseif($status->status_ubah == 5)//jika mutu dan berat berubah
@@ -1049,7 +1054,7 @@ class MarhunController extends Controller
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1);
$newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']);
// dd($newhargaasas);
}
elseif($status->status_ubah == 1)//jika karat berubah
@@ -1057,21 +1062,21 @@ class MarhunController extends Controller
$getkaratnew = LelKarat::where('karat', $status['request_karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($getkaratnew['harga2'] * $marhun['berat'], 1);
$newhargaasas = round($getkaratnew['harga2'] * $marhun['berat']);
}
elseif($status->status_ubah == 4)//jika berat berubah
{
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($status['request_berat'] * $marhun['harga'], 1);
$newhargaasas = round($status['request_berat'] * $marhun['harga']);
}elseif ($status->status_ubah == 2) //jika add marhun
{
// dd($marhun['berat']);
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
}elseif ($status->status_ubah == 3) //jika hapus marhun
{
@@ -1086,7 +1091,7 @@ class MarhunController extends Controller
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
}
$marhuns[$index1]['status_ubah'] = $status;
@@ -1095,7 +1100,7 @@ class MarhunController extends Controller
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
}
// dump($newhargaasas);
@@ -1137,6 +1142,241 @@ class MarhunController extends Controller
return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai'));
}
public function lihatubahmutumarhun($norujukan, $id)
{
$totalnewhargaasas = '0';
$lelbidmarhuns = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.lelong_id', $id)
->where('lelongbid.norujukan', $norujukan)
->select(
'lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbid.id as lelongbid_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.karat',
'lelongbidmarhun.berat',
'lelongbidmarhun.harga',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.hargaasas',
'lelongbidmarhun.status_semak',
'lelongbid.lelong_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.bakiupah',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.percent'
)
->get();
$arraygadai = $lelbidmarhuns->pluck('norujukan')->toArray();
$datagadai = $lelbidmarhuns;
$gadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai)
->get()->toArray();
foreach ($gadai as $index2 => $gadai2) {
$listgadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai)
->get();
// dd($listgadai);
$gadai[$index2]['listgadai'] = $listgadai;
}
// dd($gadai);
$arraylelbidmarhun = [];
$bakilelong = 0;
$rugilelong = 0;
foreach ($lelbidmarhuns as $lelbidmarhun) {
$marhuns = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id)
->where('id', $lelbidmarhun->lelongbidmarhun_id)
->get()->toArray();
$marhunsdet = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id)
// ->where('id', $lelbidmarhun->lelongbidmarhun_id)
->get();
// dd($marhunsdet);
$totalhargaasas = $marhunsdet->sum('hargaasas');
$tothargaasas = bcdiv($totalhargaasas, 1);
// dd($totalhargaasas);
// $marhunsgadai = GadaiMarhun::where('norujukan', $norujukan)
// // ->where('karat', $lelbidmarhun->karat)
// // ->where('id', $lelbidmarhun->idgadaimarhun)
// ->first();
// // dd($lelbidmarhun->idgadaimarhun);
$lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id)
->where('lelongbid.lelong_id', $id)
->first();
$karat = Lelkarat::where('lelong_id', $id)->get();
// dd($id);
foreach ($marhuns as $index1 => $marhun) {
// dd($lelbidmarhun);
$status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id)
->where('lelongbid_id', $marhun['lelongbid_id'])
->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
{
// dd($status['request_karat']);
// if($status['request'])
$getkaratnew = LelKarat::where('karat', $status['request_karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']);
// dump($lelbidmarhun->lelongbidmarhun_id);
}
else if($status->status_ubah == 10)//jika berat dan marhun
{
// dd($status['request_karat']);
// if($status['request'])
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($status['request_berat'] * $marhun['harga'], 1);
// dd($newhargaasas);
}
else if($status->status_ubah == 9)//jika mutu dan marhun
{
// dd($status['request_karat']);
// if($status['request'])
$getkaratnew = LelKarat::where('karat', $status['request_karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']);
// dd($newhargaasas);
}
elseif ($status->status_ubah == 7) //jika ubah marhun
{
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
// dd($getkaratnew);
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
// dd($newhargaasas);
}
elseif($status->status_ubah == 5)//jika mutu dan berat berubah
{
// dd($status['request_karat']);
// if($status['request'])
$getkaratnew = LelKarat::where('karat', $status['request_karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']);
// dd($newhargaasas);
}
elseif($status->status_ubah == 1)//jika karat berubah
{
$getkaratnew = LelKarat::where('karat', $status['request_karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($getkaratnew['harga2'] * $marhun['berat']);
}
elseif($status->status_ubah == 4)//jika berat berubah
{
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($status['request_berat'] * $marhun['harga']);
}elseif ($status->status_ubah == 2) //jika add marhun
{
// dd($marhun['berat']);
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
}elseif ($status->status_ubah == 3) //jika hapus marhun
{
// dd($marhun['berat']);
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = 0.00;
}
else
{
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
}
$marhuns[$index1]['status_ubah'] = $status;
}
else{ //jika tiada $status
$getkaratnew = LelKarat::where('karat', $marhun['karat'])
->where('lelong_id', $id)
->first();
$newhargaasas = round($marhun['berat'] * $marhun['harga']);
}
// dump($newhargaasas);
$totalnewhargaasas = $totalnewhargaasas + $newhargaasas;
$lelong = Lelong::where('id', $id)->get();
$sumcajlelong = $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100);
$totalbaki = $totalnewhargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong, 1, 1);
// dd($totalnewhargaasas);
if ($totalbaki > 0) {
$bakilelong = $totalbaki;
$rugilelong = 0.00;
} else if ($totalbaki < 0) {
$rugilelong = $totalbaki;
$bakilelong = 0.00;
}
$marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun'];
$marhuns[$index1]['old_marhun'] = $marhun['marhun'];
$marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
$marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
$marhuns[$index1]['karatnew'] = $getkaratnew;
$marhuns[$index1]['newhargaasas'] = $newhargaasas;
$marhuns[$index1]['totalnewhargaasas'] = $totalnewhargaasas;
$marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
$marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
$marhuns[$index1]['baki_lelong'] = $bakilelong;
$marhuns[$index1]['rugi_lelong'] = $rugilelong;
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong, 1, 1);
}
array_push($arraylelbidmarhun, $marhuns);
// dd($arraylelbidmarhun);
}
// dd($lelbidmarhun->lelongbidmarhun_id);
// dd($totalnewhargaasas);
return view('marhun.lihatubahmutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai'));
}
public function terimaperubahan(Request $request)
{
//update mutu marhun - gadaimarhun
@@ -1181,7 +1421,7 @@ class MarhunController extends Controller
->where('lelong_id', $request->lelong_id)
->first();
$nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat->harga2;
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = $lelongbidmarhuns;
$updatemarhun->karat = $terimalel->request_karat;
@@ -1196,7 +1436,7 @@ class MarhunController extends Controller
->where('lelong_id', $request->lelong_id)
->first();
$nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = $lelongbidmarhuns;
$updatemarhun->berat = $terimalel->request_berat;
@@ -1211,7 +1451,7 @@ class MarhunController extends Controller
->first();
// dd($getkarat['harga2']);
$nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
$updatemarhun->berat = $terimalel->request_berat;
@@ -1228,7 +1468,7 @@ class MarhunController extends Controller
->first();
// dd($getkarat['harga2']);
$nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
$updatemarhun->marhun = $terimalel->request_marhun;
@@ -1244,7 +1484,7 @@ class MarhunController extends Controller
->first();
// dd($getkarat['harga2']);
$nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
$updatemarhun->marhun = $terimalel->request_marhun;
@@ -1262,7 +1502,7 @@ class MarhunController extends Controller
->first();
// dd($getkarat['harga2']);
$nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
$updatemarhun->marhun = $terimalel->request_marhun;
@@ -1279,7 +1519,7 @@ class MarhunController extends Controller
->first();
// dd($getkarat['harga2']);
$nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
$updatemarhun->marhun = $terimalel->request_marhun;
@@ -1296,7 +1536,7 @@ class MarhunController extends Controller
->first();
// dd($getkarat['harga2']);
$nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2'];
$hargaasasnew = bcdiv($nilaimarhunnew, 1);
$hargaasasnew = round($nilaimarhunnew);
$updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
$updatemarhun->harga = $getkarat['harga2'];
@@ -1317,6 +1557,7 @@ class MarhunController extends Controller
->first();
$updatelelongbid->berat = $itemmarhun->sum('berat');
$updatelelongbid->hargaasas = $itemmarhun->sum('hargaasas');
$updatelelongbid->status_semak = '1';
$updatelelongbid->update();
}
@@ -1533,12 +1774,24 @@ class MarhunController extends Controller
->where('lelong_id', $lelong_id)
->orderBy('id', 'desc')
->get();
foreach ($sedangDinilai as $key => $dinilai) {
$sdhdisemak = LelongBid::where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.caw_id', $caw->id)
->where('lelongbid.status_semak', 1)
->where('lelongbid.norujukan', $dinilai->norujukan)
->first();
$sedangDinilai[$key]['sdhdisemak'] = $sdhdisemak;
// dd($dinilai->norujukan);
}
$sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code)
->whereNotNull('serah_marhun')
->where('lelong_id', $lelong_id)
->orderBy('id', 'desc')
->get();
// dd($sedangDinilai->norujukan);
if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) {
return view('marhun.terimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id'));
@@ -1629,7 +1882,7 @@ class MarhunController extends Controller
public function scanKeluarMarhun(Request $request)
{
$user = Auth::user();
// $user = Auth::user();
$current = Carbon::now();
$checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
@@ -1638,16 +1891,49 @@ class MarhunController extends Controller
if ($checkExisting->isEmpty()) {
$lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
// dd($request->norujukan_barcode);
$pengesahan = Pengesahan::where('norujukan', $lelongbidItem['norujukan'])
->where('lelong_id', $request->lelong_id)
->get();
// dd($pengesahan);
foreach ($pengesahan as $temppengesahan) {
$addpengesahan = new TempPengesahan();
$addpengesahan->lelong_id = $temppengesahan->lelong_id;
$addpengesahan->lelongbid_id = $temppengesahan->lelongbid_id;
$addpengesahan->lelongbidmarhun_id = $temppengesahan->lelongbidmarhun_id;
$addpengesahan->norujukan = $temppengesahan->norujukan;
$addpengesahan->disahkan_oleh = $temppengesahan->disahkan_oleh;
$addpengesahan->disahkan_pada = $temppengesahan->disahkan_pada;
$addpengesahan->diminta_oleh = $temppengesahan->diminta_oleh;
$addpengesahan->diminta_pada = $temppengesahan->diminta_pada;
$addpengesahan->status = $temppengesahan->status;
$addpengesahan->status_ubah = $temppengesahan->status_ubah;
$addpengesahan->request_berat = $temppengesahan->request_berat;
$addpengesahan->request_karat = $temppengesahan->request_karat;
$addpengesahan->request_marhun = $temppengesahan->request_marhun;
$addpengesahan->save();
}
$deletepengesahan = Pengesahan::where('lelong_id', $request->lelong_id)
->where('norujukan', $lelongbidItem['norujukan'])
->delete();
$scanKeluar = new ScanSemak();
$scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
$scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
$scanKeluar->lelongbid_id = $lelongbidItem['id'];
$scanKeluar->norujukan = $lelongbidItem['norujukan'];
$scanKeluar->khazanah_id = $user['id'];
$scanKeluar->khazanah_id = Auth::user()->id;
$scanKeluar->scan_keluar = $current->toDateTimeString();
$scanKeluar->save();
$lelongbidItem->status_semak = 0;
$lelongbidItem->save();
return redirect()->route('marhun.scanbarcode', $request->lelong_id)
->with('success', 'Marhun Berjaya Di Scan Keluar Dari Peti Besi.');
} else {
@@ -1671,10 +1957,10 @@ class MarhunController extends Controller
if ($scanMasuk) {
$scanMasuk->scan_masuk = $current->toDateTimeString();
$scanMasuk->update();
return redirect()->route('marhun.scanbarcode', $request->lelong_id)
return redirect()->route('marhun.scanbarcodemasuk', $request->lelong_id)
->with('success', 'Marhun Berjaya Di Scan Masuk Ke Peti Besi.');
} else {
return redirect()->route('marhun.scanbarcode', $request->lelong_id)
return redirect()->route('marhun.scanbarcodemasuk', $request->lelong_id)
->with('failed', 'Gagal Scan, Marhun Belum Diserah Oleh Penilai.');
}
}
+5
View File
@@ -71,4 +71,9 @@ class LelongBid extends Model
{
return $this->hasMany(ScanSemak::class, 'lelongbid_id', 'id')->whereNotNull('scan_masuk');
}
public function pengesahan()
{
return $this->belongsTo(Pengesahan::class, 'id', 'lelongbid_id');
}
}
+1 -1
View File
@@ -29,6 +29,6 @@ class LelongBidMarhun extends Model
];
public function pengesahan() {
return $this->hasOne(Pengesahan::class, 'lelongbidmarhun_id');
return $this->hasOne(Pengesahan::class, 'lelongbidmarhun_id', 'id');
}
}
+4
View File
@@ -22,4 +22,8 @@ class Pengesahan extends Model
'status',
'status_ubah'
];
public function lelongbidmarhun(){
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
}
}
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TempPengesahan extends Model
{
use HasFactory;
protected $table = 'temppengesahan';
protected $fillable = [
'lelong_id',
'lelongbid_id',
'norujukan',
'disahkan_oleh',
'disahkan_pada',
'diminta_oleh',
'diminta_pada',
'status',
'status_ubah'
];
public function lelongbidmarhun(){
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
}
}
@@ -61,6 +61,24 @@ class CreatePengesahanTable extends Migration
$table->timestamps();
});
Schema::create('temppengesahan', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('lelong_id')->unsigned();
$table->unsignedBigInteger('lelongbid_id')->unsigned();
$table->unsignedBigInteger('lelongbidmarhun_id')->unsigned();
$table->string('norujukan');
$table->integer('disahkan_oleh')->nullable();
$table->datetime('disahkan_pada')->nullable();
$table->integer('diminta_oleh');
$table->datetime('diminta_pada');
$table->integer('status')->default(0); //1 = terima, 2 = tangguh lelong
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat, 6 = tangguh lelong pc, 7 = ubah marhun,8 = ubah mutu, berat dan marhun,9=ubah mutu dan marhun,10=ubah berat dan marhun
$table->string('request_berat')->nullable();
$table->string('request_karat')->nullable();
$table->string('request_marhun')->nullable();
$table->timestamps();
});
}
/**
@@ -73,5 +91,6 @@ class CreatePengesahanTable extends Migration
Schema::dropIfExists('pengesahan');
Schema::dropIfExists('scan_semak');
Schema::dropIfExists('scan_jual');
Schema::dropIfExists('temppengesahan');
}
}
@@ -7,12 +7,12 @@
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
</div>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+185 -120
View File
@@ -2,91 +2,178 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
<div class="row">
<div class="col">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('lelong.senarailelong') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
@php
$today = date('d-m-Y');
$kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
@endphp
butiran simulasi : {{$t_lelong}}
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<nav>
<div class="nav mb-3 nav-tabs" id="nav-tab" role="tablist">
<a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
<a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a>
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
<br>
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="{{route('lelong.exportlelong')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
<input type="hidden" name="lelongid" value="{{ $lelong_id }}">
<div class="row">
<div class="col-md-5">
<table class="table table-striped table-xl" id="conclusion" style="width:100%">
<tr>
<td>Bilangan Lelong : {{$total_marhun}}</td>
</tr>
<tr>
<td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Tarikh Lelong :
@php
$today = date('d-m-Y');
$kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
</td>
</tr>
</table>
<div class="row">
<div class="col-md-12 col-lg">
<div class="form-group row">
<label class="col-6 col-form-label">Tarikh Lelong</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$t_lelong}}">
</div>
</div>
</div>
<div class="col-md-2"></div>
<div class="col-md-5">
<div class=""></div>
<table class="table table-striped table-xl" id="conclusion2" style="width:100%">
<td>
{{-- {{dd($kemaskini)}} --}}
@if($kemaskini == $today)
<button class="btn btn-success btn-sm" disabled>Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@else
<button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@endif
</td>
<tr>
<td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Baki Lelong Keseluruhan : RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Tempoh : {{$data['jbg'] }}</td>
</tr>
</table>
<div class="form-group row">
<label class="col-6 col-form-label">JBG</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$data['jbg']}}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Bilangan SAG</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$total_marhun}}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Harga Emas Per Gram</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{$lelong->harga_emas_asas}}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
</div>
</div>
</div>
</div>
<div class="col-lg-1"></div>
<div class="col-md-12 col-lg">
<div class="form-group row">
<div class="col-6">
<div class="input-group">
@if($kemaskini == $today)
<button class="btn btn-success btn-sm" disabled>Harga Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
{{-- Harga Emas Per Gram (916) : RM{{$simulasi->harga_emas_asas}} --}}
@else
<button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>
{{-- <strong>Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}</strong> --}}
@endif
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Harga Asas Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_hargaasas, 2, '.', ',') }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Caj Lelong Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_cazlelong, 2, '.', ',') }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Baki Lelong Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakilelong, 2, '.', ',') }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 col-form-label">Rugi Lelong Keseluruhan</label>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">RM</div>
</div>
<input type="text" readonly class="form-control bg-light" value="{{ number_format($total_rugilelong, 2, '.', ',') }}">
</div>
</div>
</div>
</div>
</div>
<table class="table table-striped table-xl" id="simulasi" style="width:100%">
<thead class="bg-primary text-white">
<table class="table text-right table-bordered" id="simulasi">
<thead class="bg-primary text-center text-white">
<tr class="text-center">
<th>No</th>
<th>Cawangan</th>
@@ -135,20 +222,21 @@
</tfoot>
</table>
<table class="table table-striped table-xl" id="jumlahberat" style="width:80%">
<thead class="bg-primary text-white">
<tr class="text-center">
<h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
<table class="table table-bordered text-center" id="jumlahberat">
<thead class="bg-light">
<!-- <tr class="text-center">
<th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
</tr> -->
<tr>
<th>MUTU</th>
@foreach ($lelkarat as $index=>$karat)
<th>{{$karat->karat}}</th>
@endforeach
</tr>
</thead>
<tbody>
<tr>
<td>MUTU</td>
@foreach ($lelkarat as $index=>$karat)
<td>{{$karat->karat}}</td>
@endforeach
</tr>
<tr>
<td>BERAT (gm)</td>
<td>{{$total24Kgb}}</td>
@@ -161,11 +249,10 @@
<td>{{$total18K}}</td>
<td>{{$total14Kp}}</td>
<td>{{$total14K}}</td>
{{-- <td>{{$total9K}}</td> --}}
</tr>
</tbody>
</table>
</form>
<div class="row">
@@ -195,7 +282,7 @@
<form action="{{ route('lelong.kemaskinihargaasas') }}" method="POST" id="formhargaasas">
@csrf
<input type="hidden" name="idlelong" value="{{$lelong_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:100%" >
<table class="table table-bordered" id="kemaskinikarat" style="width:100%" >
<thead class="bg-primary text-white">
<tr class="text-center">
<th>Karat</th>
@@ -378,42 +465,20 @@
}
});
var tablesimulasi = $('#simulasi').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
}
],
"scrollX": true,
order: [[0, 'asc']],
// "ordering": false,
"searching":false,
"info": false,
"lengthChange": false,
"pageLength": 9999,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-filter"></i>',
// titleAttr: 'Filter By',
// action: function ( e, dt, node, config ) {
// $('#modalfilter').modal("show");
// }
// },
{
className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export',
titleAttr: 'Muat Turun PDF',
text: '<h8><b>PDF</b></h8>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
var tablesimulasi = $('#simulasi').DataTable({
"scrollX": true,
"pageLength": 50,
});
var tableJumlahBerat = $('#jumlahberat').DataTable({
"scrollX": true,
"info": false,
"paging": false,
"searching": false,
"ordering": false
});
$('.addsim').tooltip();
$('.export').tooltip();
@@ -0,0 +1,419 @@
@extends('layouts.app')
@section('content')
<env name="TELESCOPE_ENABLED" value="false"/>
<div class="container-fluid">
<div class="row ">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Perubahan Semakan Marhun
</div>
</div>
<div class="card-body">
<form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formmutumarhun">
@csrf
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
<input type="hidden" name="lelong_id" value="{{ $id }}" />
<input type="hidden" name="lelongbid_id" value="{{ $lelongbid['id'] }}" />
<input type="hidden" name="jenis_button" value="terima" id="jenis_button" />
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<div class="container">
{{-- <a href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a> --}}
<div class="row">
<div class="col-6 col-sm-4">
<p> <b>No Rujukan : </b> {{ $lelongbid->norujukan }}</p>
<p> <b>Tempoh : </b> {{ $lelongbid->jbg }}</p>
<p> <b>Kod Cawangan : </b> {{ $lelongbid->kodcaw }}</p>
</div>
<div class="col-6 col-sm-4">
<p> <b>Harga Asas(RM) : </b>{{ number_format($marhuns[0]['totalnewhargaasas'], 2, '.', ',') }}</p>
<p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
<p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p>
{{-- <p> <b>Caj Lelong(RM) : </b> {{ number_format($marhuns[0]['cajlelong'], 2, '.', ',') }}</p>
<p> <b>Baki Lelong(RM) : </b>{{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}</p>
<p> <b>Rugi Lelong(RM) : </b>{{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}</p> --}}
</div>
<div class="col-6 col-sm-4">
{{-- <p> <b>Hargaasas(RM) : </b>{{ number_format($marhuns[0]['totalnewhargaasas'], 2, '.', ',') }}</p>
<p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
<p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p> --}}
<p> <b>Caj Lelong(RM) : </b> {{ number_format($marhuns[0]['cajlelong'], 2, '.', ',') }}</p>
<p> <b>Baki Lelong(RM) : </b>{{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}</p>
<p> <b>Rugi Lelong(RM) : </b>{{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}</p>
</div>
</div>
</div>
<table class='table text-center table-bordered table-hover' id="tablemutumarhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Marhun</th>
<th>Karat </th>
<th>Berat (gm)</th>
{{-- <th>Harga Gadai (RM)/gm</th> --}}
<th>Harga Lelong p/gm</th>
<th>N. Marhun Asal</th>
{{-- <th>N. Marhun Lelong</th> --}}
<th>Harga Asas</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@php $sumhargaasas = 0 @endphp
@foreach($arraylelbidmarhun as $index1=>$detail)
{{-- {{dd($detail[0]['marhun'])}} --}}
<tr>
<td>{{ $loop->iteration }}</td>
<td>
@if(empty($detail[0]['status_ubah']['status_ubah']))
{{ $detail[0]['old_marhun'] }}
@elseif(!empty($detail[0]['status_ubah']['status_ubah']))
@if($detail[0]['status_ubah']['request_marhun'] == NULL)
{{ $detail[0]['old_marhun'] }}
@elseif($detail[0]['old_marhun'] != $detail[0]['status_ubah']['request_marhun'])
{{ $detail[0]['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>{{ $detail[0]['status_ubah']['request_marhun'] }}
@elseif($detail[0]['old_marhun'] == $detail[0]['status_ubah']['request_marhun'])
{{ $detail[0]['old_marhun'] }}
@else
{{ $detail[0]['old_marhun'] }}
@endif
@endif
{{-- {{ $detail[0]['status_ubah'] }} --}}
</td>
<td class="col-2">
@if(empty($detail[0]['status_ubah']['status_ubah']))
{{ $detail[0]['old_karat'] }}
@elseif(!empty($detail[0]['status_ubah']['status_ubah']))
@if($detail[0]['status_ubah']['request_karat'] == NULL)
{{ $detail[0]['old_karat'] }}
@elseif($detail[0]['old_karat'] != $detail[0]['status_ubah']['request_karat'])
{{ $detail[0]['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ $detail[0]['status_ubah']['request_karat'] }}
@elseif($detail[0]['old_karat'] == $detail[0]['status_ubah']['request_karat'])
{{ $detail[0]['old_karat'] }}
@endif
@endif
{{-- {{ $detail[0]['karat'] }} --}}
</td>
<td class="col-2">
@if(empty($detail[0]['status_ubah']['status_ubah']))
{{ $detail[0]['old_berat'] }}
@elseif(!empty($detail[0]['status_ubah']['status_ubah']))
@if($detail[0]['status_ubah']['request_berat'] == NULL)
{{ $detail[0]['old_berat'] }}
@elseif($detail[0]['old_berat'] != $detail[0]['status_ubah']['request_berat'])
{{ $detail[0]['old_berat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ $detail[0]['status_ubah']['request_berat'] }}
@elseif($detail[0]['old_berat'] == $detail[0]['status_ubah']['request_berat'])
{{ $detail[0]['old_berat'] }}
@endif
@endif
{{-- {{ $detail[0]['berat'] }} --}}
</td>
{{-- <td>
@if(empty($gadai[$index1]['harga']))
-
@elseif(!empty($gadai[$index1]['harga']))
{{ number_format ($gadai[$index1]['harga'], 2, '.', ',') }}
@endif
</td> --}}
<td>
{{-- {{dd($detail[0]['karatnew']['harga2'])}} --}}
@if(empty($detail[0]['status_ubah']['status_ubah']))
{{number_format($detail[0]['harga'], 2, '.', ',') }}
@elseif(!empty($detail[0]['status_ubah']['status_ubah']))
@if($detail[0]['status_ubah']['status_ubah'] == 8)
{{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 9)
{{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 10)
{{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{number_format($detail[0]['harga'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 5)
{{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 1)
{{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 4)
{{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{number_format($detail[0]['harga'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 7)
{{number_format($detail[0]['harga'], 2, '.', ',') }}
@else
{{number_format($detail[0]['harga'], 2, '.', ',') }}
@endif
@endif
</td>
<td>@if(empty($gadai[$index1]['n_marhun']))
-
@elseif(!empty($gadai[$index1]['n_marhun']))
{{ number_format($gadai[$index1]['n_marhun'], 2, '.', ',') }}
@endif
</td>
<td>
{{-- {{dd($detail[0]['karatnew']['harga2'])}} --}}
@if(empty($detail[0]['status_ubah']['status_ubah']))
{{ number_format($detail[0]['hargaasas'], 2, '.', ',') }}
@elseif(!empty($detail[0]['status_ubah']['status_ubah']))
@if($detail[0]['status_ubah']['status_ubah'] == 8)
{{-- @php
$newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1);
@endphp --}}
{{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 9)
{{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 10)
{{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 5)
{{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 1)
{{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 4)
{{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> --}}
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 7)
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@elseif($detail[0]['status_ubah']['status_ubah'] == 3)
{{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }}
@else
{{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
@endif
@endif
</td>
<td>
{{-- {{dd($detail[$index1]['status_ubah']['status_ubah'])}} --}}
@if(empty($detail[0]['status_ubah']['status_ubah']))
<button class="btn btn-info btn-sm hovernone-info" disabled>TIADA PERUBAHAN</button>
@elseif(!empty($detail[0]['status_ubah']['status_ubah']))
@if($detail[0]['status_ubah']['status_ubah'] == 8)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU,BERAT & MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 10)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN BERAT & MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 9)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU & MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 5)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU & BERAT</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 4)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN BERAT</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 7)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 3)
<button class="btn btn-danger btn-sm hovernone-danger" disabled>MOHON HAPUS MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 2)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
@else
<button class="btn btn-warning btn-sm hovernone-warning" disabled>TIADA PERUBAHAN</button>
@endif
@endif
</td>
{{-- <td>
@if(isset($detail[0]['status_ubah']['status_ubah']) == 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif(isset($detail[0]['status_ubah']['status_ubah']) == 2)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
@elseif(isset($detail[0]['status_ubah']['status_ubah'])== 3)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
@elseif(isset($detail[0]['status_ubah']['status_ubah']) == 4)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN BERAT</button>
@elseif(isset($detail[0]['status_ubah']['status_ubah']) == 5)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN MUTU & BERAT</button>
@else
<button class="btn btn-warning btn-sm hovernone-warning" disabled>TIADA PERUBAHAN</button>
@endif
</td> --}}
</tr>
{{-- @php $sumhargaasas += $newhargaasas @endphp --}}
{{-- {{ $sumhargaasas }} --}}
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
{{-- <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>
</div>
<div class="modal fade" data-backdrop="static" tabindex="-1" id="modalremark">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Tangguh Lelong</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formremark">
@csrf
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
<input type="hidden" name="kodcaw" value="{{ $lelongbid->kodcaw }}" />
<input type="hidden" name="lelong_id" value="{{ $id }}" />
<input type="hidden" name="lelongbid_id" value="{{ $lelongbid->id }}" />
<input type="hidden" name="jenis_button" value="tangguhlelong" id="jenis_button" />
<div class="form-group">
<label for="message-text" class="col-form-label" style="font-color:red;* "><b>Sila Pilih Sebab Tangguh Lelong:</b></label>
<br>
<br>
<input type="radio" checked onclick="selectRugiBesar()" id="mutu" name="nota" value="Perubahan Mutu Tinggi">
<label for="mutu">Perubahan Mutu Tinggi</label><br>
<input type="radio" onclick="selectRugiBesar()" id="berat" name="nota" value="Perubahan Berat Besar">
<label for="berat">Perubahan Berat Besar</label><br>
<input type="radio" onclick="selectRugiBesar()" id="rugi" name="nota" value="Rugi Besar">
<label for="rugi">Rugi Besar</label><br>
<input type="radio" name="nota" onclick="selectLain()">
<label for="lainlain">Lain-lain</label><br>
<textarea class="form-control" name="nota" disabled id="lainlain" style="width: 100%;" rows="3"></textarea>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" style="width:15%;" onclick="selectRugiBesar()" data-dismiss="modal">Batal</button>
<button type="button" class="btn btn-primary" style="width:15%;" onclick="submit(this)">Sahkan</button>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
function selectLain() {
$("#lainlain").attr("disabled", false);
}
function selectRugiBesar() {
$("#lainlain").attr("disabled", true);
$("#lainlain").val("");
}
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function functerima(e){
let jenis=event.target.id;
if(jenis == "terima")
{
$('#jenis_button').val(jenis);
$("#formmutumarhun").submit();
}
else if(jenis == "tangguhlelong")
{
$('#jenis_button').val(jenis);
$('#modalremark').modal('show');
let idmarhun = $(e).data('idmarhun');
let norujukan = $(e).data('norujukan');
$('#idmarhun').val(idmarhun);
$('#norujukan').val(norujukan);
console.log(idmarhun, norujukan);
// $("#formmutumarhun").submit();
}
else if(jenis == "tidaksah")
{
$('#jenis_button').val(jenis);
$("#formmutumarhun").submit();
}
}
function submit(e)
{
let idmarhun = $(e).data('idmarhun');
let norujukan = $(e).data('norujukan');
$('#idmarhun').val(idmarhun);
$('#norujukan').val(norujukan);
$("#formremark").submit();
}
var tablemutumarhun = $('#tablemutumarhun').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 9,
"orderable": true
}
],
order: [[0, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
// "pageLength": 15,
"paginate" : false,
// dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
// $('.addsim').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addsim').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
// function selectall(cb) {
// tablemutumarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
// $(this).prop('checked', cb.checked);
// })
// }
</script>
@endsection
+60 -30
View File
@@ -3,10 +3,17 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="row">
<a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$lelongbid->lelong_id]) }}" class="btn ml-3 btn-secondary">Kembali</a>
</div>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$lelongbid->lelong_id]) }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
No Rujukan : {{ $lelongbid->norujukan }}
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert mt-2 alert-success">
<p>{{ $message }}</p>
@@ -31,8 +38,8 @@
<input type="hidden" name="lelongbid_id" id="lelongbid_id">
</form>
<br>
<h4> No Rujukan : <td>{{ $lelongbid->norujukan }}</td>
</h4>
{{-- <h4> No Rujukan : <td>{{ $lelongbid->norujukan }}</td>
</h4> --}}
<div class="row justify-content-center">
<div class="col-6">
<div class="card">
@@ -51,7 +58,7 @@
</div>
</div>
<br>
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<table class='table table-bordered table-hover' id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th class="text-center">Barang</th>
@@ -114,29 +121,37 @@
<td>{{ $item->nota }}</td>
<td class="text-center">
@if($lelongbid->status_semak == 1)
@elseif(isset($item->pengesahan))
@if($item->pengesahan['status_ubah'] == 1)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu</i></span>
@elseif($item->pengesahan['status_ubah'] == 2)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Tambah Marhun</i></span>
@elseif($item->pengesahan['status_ubah'] == 3)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Hapus Marhun</i></span>
@elseif($item->pengesahan['status_ubah'] == 4)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Berat</i></span>
@elseif($item->pengesahan['status_ubah'] == 5)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu & Berat</i></span>
@elseif($item->pengesahan['status_ubah'] == 7)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Marhun</i></span>
@elseif($item->pengesahan['status_ubah'] == 8)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu, Berat & Marhun</i></span>
@elseif($item->pengesahan['status_ubah'] == 9)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu & Marhun</i></span>
@elseif($item->pengesahan['status_ubah'] == 10)
<span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Berat & Marhun</i></span>
<span class="badge badge-success">Telah Semak<br></span>
@elseif($lelongbid->status_semak == 0)
@if(isset($item->pengesahan['status']))
@if($item->pengesahan['status_ubah'] == 1 )
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 2)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Tambah Marhun</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 3)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Hapus Marhun</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 4)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Berat</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 5)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu & Berat</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 7)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Marhun</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 8)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu, Berat & Marhun</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 9)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu & Marhun</i></span></a>
@elseif($item->pengesahan['status_ubah'] == 10)
<a href="{{ route('marhun.lihatubahmutumarhun', ['norujukan'=>$lelongbid->norujukan, $lelong_id]) }}"><span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Berat & Marhun</i></span></a>
@elseif($item->pengesahan['status'] == 1)
<span class="badge badge-warning">Telah Sah</i></span>
@endif
@else
<a class="btn m-1 btn-primary" onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
@endif
@else
<a onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
<a class="btn m-1 btn-primary" onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
{{-- <a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a> --}}
@endif
</td>
</tr>
@@ -145,13 +160,28 @@
</table>
<div class="modal-footer" style="margin-top:2%;">
{{-- {{dump($status['status'])}} --}}
@if($lelongbid->status_semak == 0)
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
@if(isset($status['status']))
@if($status['status'] == 0)
<button style="width:20%;" class="btn btn-warning">Dalam Proses Pengesahan</button>
@elseif($status['status'] == 1)
<button style="width:7%;" class="btn btn-info" >Telah Sah</button>
@else
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak1</button>
@endif
@else
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak2</button>
@endif
{{-- <button style="width:7%;" class="btn btn-warning">Dalam Proses Pengesahan</button> --}}
@elseif($lelongbid->status_semak == 1)
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
@endif
</div>
</div>
</div>
<div class="modal fade" tabindex="-1" id="modalkemaskini">
+14 -6
View File
@@ -3,9 +3,16 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header">Scan Barcode</div>
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongscan') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Scan Barcode Keluar
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert mt-2 alert-success">
@@ -16,8 +23,8 @@
{{ $message }}
</div>
@endif
<a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
<a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
{{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
<a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a> --}}
<p>Tarikh Lelong:
@php
@@ -48,8 +55,9 @@
</form>
</div>
</div>
<table class='table table-bordered table-hover' id='table-scan-keluar'>
<div style="text-align: left;"> <a href="{{ route('marhun.cetakkeluarscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Keluar Semasa</a>
<table class="table text-right table-bordered" id='table-scan-keluar'>
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
@@ -3,9 +3,16 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header">Scan Barcode</div>
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongscan') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Scan Barcode Masuk
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert mt-2 alert-success">
@@ -16,8 +23,8 @@
{{ $message }}
</div>
@endif
<a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
<a class="btn btn-primary" href="{{route('marhun.scanbarcode',$lelong_id)}}">Senarai SAG Masuk Peti Besi</a>
{{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
<a class="btn btn-primary" href="{{route('marhun.scanbarcode',$lelong_id)}}">Senarai SAG Masuk Peti Besi</a> --}}
<p>Tarikh Lelong:
@@ -46,7 +53,7 @@
</div>
</div>
<div style="text-align: left;"> <a href="{{ route('marhun.cetakkeluarscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Keluar Semasa</a>
<div style="text-align: left;">
<a href="{{ route('marhun.cetakmasukscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Masuk Semasa</a></div>
<table class="table table-bordered table-hover" id="table-scan-masuk" style="width: 100%;">
<thead class="bg-primary text-white">
@@ -4,14 +4,23 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongmarhun') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai Lelongan Marhun
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<h4> Senarai Lelongan Marhun </h4>
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<table class='table table-bordered table-hover' id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -46,8 +55,8 @@
<button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
@endif
</td>
<td><a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px" ><i class="fas fa-download"></i></a>
<a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun" ><i class="far fa-edit"></i></a></td>
<td><a class="confirmrefresh btn m-1 btn-warning" href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px" ><i class="fas fa-download"></i></a>
<a class="btn m-1 btn-primary" href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun" ><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
@@ -4,9 +4,18 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h4> Senarai Lelongan Scan</h4>
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongscan') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai Lelongan Scan
</div>
</div>
<div class="card-body">
<table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -35,17 +44,17 @@
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
<a class="btn btn-warning btn-sm" href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href=" {{ route('marhun.scanbarcode', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
<a class="btn btn-info btn-sm" href=" {{ route('marhun.scanbarcode', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href=" {{ route('marhun.scanbarcodemasuk', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
<a class="btn btn-info btn-sm" href=" {{ route('marhun.scanbarcodemasuk', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
@endif
</td>
</tr>
@@ -4,10 +4,18 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-11 mx-auto p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongterimaserah') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Terima/Serah Marhun
</div>
</div>
<div class="card-body">
<h4> Terima Serah Marhun </h4>
@if ($message = Session::get('success'))
<div class="alert mt-2 alert-success">
<p>{{ $message }}</p>
@@ -17,7 +25,7 @@
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped text-center" id="table-lelong">
<table class='table table-bordered table-hover' id="table-lelong">
<thead class="bg-primary text-white">
<th>Bil</th>
<th>Batch Lelong</th>
@@ -37,7 +45,7 @@
</td>
@endif
<td>
<a href="{{route('marhun.terimaserahmarhun', ['lelong_id'=>$index->lelong_id])}}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="far fa-edit"></i></a>
<a class="btn m-1 btn-primary" href="{{route('marhun.terimaserahmarhun', ['lelong_id'=>$index->lelong_id])}}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
+36 -23
View File
@@ -2,11 +2,18 @@
@section('content')
<div class="container-fluid">
<div class="card">
<div class="card-header">Semakan Marhun</div>
<div class="card-body">
<div class="row ">
<div class="col">
<div class="row ">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongmarhun') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Semakan Marhun
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -20,15 +27,15 @@
<p>
<p><b>Keseluruhan : {{ sizeof($lelongbid) }}</b> </p>
{{-- <p><b>Belum Disemak : {{ sizeof($sag) }}</b></p> --}}
<p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
{{-- <p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p> --}}
<p><b>Sudah Disemak : {{ sizeof($sdhdisemak) }}</b></p>
<p><b>Sudah Disahkan Oleh PC : {{ sizeof($sdhdisahkan) }}</b></p>
{{-- <p><b>Sudah Disahkan Oleh PC : {{ sizeof($sdhdisahkan) }}</b></p> --}}
</div>
<div class="col-6 col-sm-4">
<p><b><u> Tangguh Lelong Oleh Pengurus Cawangan </u></b></p>
<p><b>Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }}</b></p>
<p><b>Dalam Proses : {{ sizeof($dalamprosestangguhlel) }}</b></p>
<p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkantangguhlel) }}</b></p>
<p><b><u> Pengesahan Oleh PC :</u></b></p>
{{-- <p><b>Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }}</b></p> --}}
<p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
<p><b>Sudah Disahkan : {{ sizeof($sdhdisahkan) }}</b></p>
</div>
</div>
</div>
@@ -41,7 +48,7 @@
<th>No Rujukan</th>
<th>Tarikh Lelong</th>
<th>Status Semak</th>
<th>Pengesahan</th>
{{-- <th>Pengesahan</th> --}}
<th class="text-center">Semakan Marhun</th>
</tr>
</thead>
@@ -53,22 +60,28 @@
<td>{{ $bid->t_lelong }}</td>
<td>
@if($bid->status_semak == 0)
<button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button>
{{-- <button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button> --}}
{{-- @if(isset($bid['pengesahan']['disahkan_oleh'])) --}}
@if(!empty($bid['pengesahan'] !== null))
<button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
@else
<button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button>
@endif
@elseif(($bid['pengesahan'] !== null) && ($bid->status_semak == 1))
@if($bid['pengesahan']['disahkan_oleh'] !== null)
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISAHKAN</button>
@else
<button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
@endif
@if($bid['pengesahan']['disahkan_oleh'] !== null)
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISAHKAN</button>
@else
<button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
@endif
@elseif(($bid->status_semak == 1) && ($bid['pengesahan'] === null))
<button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
<button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
@endif
</td>
<td>
{{-- <td>
@if($bid['statustangguhlel'] != null)
<button class="btn btn-secondary btn-sm hovernone-secondary" disabled>TANGGUH LELONG PC</button>
@endif
</td>
</td> --}}
<td class="text-center">
@if($bid['statusterimamarhun'] == 1)
<!-- <button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal"><i class="far fa-edit"></i></button> -->
@@ -80,9 +93,9 @@
</tbody>
</table>
</form>
<div class="row justify-content-end">
{{-- <div class="row justify-content-end">
<a href="{{ route('marhun.senarailelongmarhun') }}" class="btn m-3 btn-primary">Kembali</a>
</div>
</div> --}}
</div>
</div>
</div>
@@ -4,9 +4,16 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header">Terima/Serah Marhun</div>
<div class="card-header header-style">
<a href="{{ route('marhun.senarailelongscan') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Terima/Serah Marhun
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert mt-2 alert-success">
@@ -17,7 +24,7 @@
<p>{{ $message }}</p>
</div>
@endif
<a href="{{route('marhun.senarailelongterimaserah')}}" class="btn mb-2 btn-secondary">Kembali</a>
{{-- <a href="{{route('marhun.senarailelongterimaserah')}}" class="btn mb-2 btn-secondary">Kembali</a> --}}
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="belum-diterima-tab" data-toggle="tab" href="#belum-diterima" role="tab" aria-controls="belum-diterima" aria-selected="true">Belum Diterima</a>
@@ -82,7 +89,15 @@
<td>{{$index->norujukan}}</td>
<td>{{$index->scan_keluar}}</td>
<td>{{$index->terima_marhun}}</td>
<td><span class="badge badge-pill badge-success">Sedang Dinilai</span></td>
@if (isset($index['sdhdisemak']['status_semak']))
@if(($index['sdhdisemak']['status_semak']) == 1)
<td><span class="badge badge-pill badge-success">Telah Dinilai</span></td>
@else
<td><a href="{{route('marhun.show',[$index->lelongbid_id, $index->lelong_id])}}"><span class="badge badge-pill badge-warning">Sedang Dinilai</span></a></td>
@endif
@else
<td><a href="{{route('marhun.show',[$index->lelongbid_id, $index->lelong_id])}}"><span class="badge badge-pill badge-warning">Sedang Dinilai</span></a></td>
@endif
</tr>
@endforeach
</tbody>
@@ -4,6 +4,8 @@
<div class="container-fluid">
<div class="row ">
<div class="col">
<div class="card">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -22,7 +24,7 @@
@endforeach
</div>
</div>
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -3,10 +3,16 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div><br>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('pengesahan.senarailelongubahmutu') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai SAG: Pengesahan Oleh PC
</div>
</div>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
+15 -10
View File
@@ -5,12 +5,17 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="{{ route('pengesahan.perubahanmutumarhun', $id) }}"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<br>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Pengesahan Semakan Marhun
</div>
</div>
<div class="card-body">
<form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formmutumarhun">
@csrf
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
@@ -36,7 +41,7 @@
<p> <b>Kod Cawangan : </b> {{ $lelongbid->kodcaw }}</p>
</div>
<div class="col-6 col-sm-4">
<p> <b>Hargaasas(RM) : </b>{{ number_format($marhuns[0]['totalnewhargaasas'], 2, '.', ',') }}</p>
<p> <b>Harga Asas(RM) : </b>{{ number_format($marhuns[0]['totalnewhargaasas'], 2, '.', ',') }}</p>
<p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
<p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p>
{{-- <p> <b>Caj Lelong(RM) : </b> {{ number_format($marhuns[0]['cajlelong'], 2, '.', ',') }}</p>
@@ -55,7 +60,7 @@
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="tablemutumarhun" style="width:100%">
<table class='table text-center table-bordered table-hover' id="tablemutumarhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
@@ -220,11 +225,11 @@
@elseif($detail[0]['status_ubah']['status_ubah']== 9)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU & MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 5)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN MUTU & BERAT</button>
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU & BERAT</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 4)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN BERAT</button>
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN BERAT</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 7)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MARHUN</button>
@elseif($detail[0]['status_ubah']['status_ubah']== 3)
@@ -3,18 +3,24 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('pengesahan.senarailelongubahmutu') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Pengesahan Perubahan Mutu Marhun
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<h4 class="pt-3" style="margin-left:1%;">Pengesahan Perubahan Mutu Marhun</h4>
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
{{-- <h4 class="pt-3" style="margin-left:1%;">Pengesahan Perubahan Mutu Marhun</h4> --}}
<table class='table table-bordered table-hover' id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
@@ -39,7 +45,7 @@
</td>
<td>
@if($marhun['total'] !== intval($marhun['tstat']))
<a href=" {{ route('pengesahan.mutumarhun', ['norujukan'=>$marhun['norujukan'], $id]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
<a class="btn m-1 btn-primary" href=" {{ route('pengesahan.mutumarhun', ['norujukan'=>$marhun['norujukan'], $id]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
@else
<button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button>
@endif
@@ -3,9 +3,16 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header">Kelulusan Kemaskini Marhun</div>
<div class="card-header header-style">
<a href="{{ route('pengesahan.senarailelongubahmutu') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Pengesahan Semakan Marhun
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
@@ -15,7 +22,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<table class='table table-bordered table-hover' id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -57,10 +64,10 @@
@endif
</td>
<td>
<a href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
<a class="confirmrefresh btn m-1 btn-primary" href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
<td>
<a href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
<a class="btn m-1 btn-success" href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
</td>
</tr>
@endforeach
+1 -1
View File
@@ -288,7 +288,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
Route::get('/cetakterimaserahmarhun/{lelong_id}',['as'=>'marhun.cetakterimaserahmarhun','uses'=>'MarhunController@cetakterimaserahmarhun']);
Route::get('/senaraiterimaserah',['as'=>'marhun.senaraiterimaserah','uses'=>'MarhunController@senaraiterimaserah']);
Route::post('/cetakterimaserah',['as'=>'marhun.cetakterimaserah','uses'=>'MarhunController@cetakterimaserah']);
Route::get('/lihatubahmutumarhun/{norujukan}/{id}',['as'=>'marhun.lihatubahmutumarhun','uses'=>'MarhunController@lihatubahmutumarhun']);
//khazanah
Route::get('/cetakkeluarscanbarcode/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcode','uses'=>'MarhunController@cetakkeluarscanbarcode']);