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

pengesahan tambah, ubah, delete marhun

Browse Source
This commit is contained in:
faiqahzaman
2022-03-17 16:22:42 +08:00
parent 5cdbb2c7f0
commit d731a42a47
10 changed files with 191 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+47 -31
View File
@@ -100,6 +100,7 @@ class MarhunController extends Controller
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 1;
$karat->save();
}
}
@@ -124,19 +125,22 @@ class MarhunController extends Controller
// }
return redirect()->route('marhun.show',$lelongbid->id)
return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id])
->with('success','Kemaskini Marhun Berjaya');
}
public function show($id)
public function show($id, $lelong_id)
{
$lelongbid = LelongBid::where('id','=',$id)->first();
$marhun = LelongBidMarhun::where('lelongbid_id','=',$id)->get();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id','=',$id)
->where('lelongbid.lelong_id', $lelong_id)
->get();
$lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get();
$karatall = JenisKarat::all();
$emasall = JenisEmas::all();
// dd($lelkarat);
return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat'));
return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id'));
}
@@ -203,14 +207,12 @@ class MarhunController extends Controller
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 2;
$karat->save();
return redirect()->route('marhun.show',$lelongbid->id)
->with('success','Marhun Berjaya Ditambah');
}
//Operasi
public function exportmarhundetails($lelong_id)
{
@@ -261,37 +263,56 @@ class MarhunController extends Controller
}
public function senarailelongubahmutu()
{
$lelong = Lelong::where('sts_lelong', 0)
->get();
public function sahubahmutu(Request $request)
return view('pengesahan.senarailelongubahmutu',compact('lelong'));
}
public function sahubahmutu($id)
{
// dd($request->all());
$mutumarhun = Pengesahan::join('lelong', 'pengesahan.lelong_id', '=', 'lelong.id')
$mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
->where('lelong.id', $id)
->whereNull('disahkan_oleh')
->select(
'pengesahan.disahkan_oleh',
'pengesahan.id as pengesahan_id',
'pengesahan.norujukan',
'lelong.id',
'lelong.tarikh_lelong',
'pengesahan.norujukan'
'lelong.harga_emas_asas',
'lelong.jbg',
'lelong.cajlelong'
)
->get();
return view('pengesahan.perubahanmutumarhun', compact('mutumarhun'));
return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id'));
}
public function mutumarhun($pengesahan_id, $norujukan)
public function mutumarhun($pengesahan_id, $norujukan, $id)
{
$pengesahan = Pengesahan::where('id', $pengesahan_id)
->where('lelong_id', $id)
->where('norujukan', $norujukan)
->first();
$marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
->where('id', $pengesahan->lelongbidmarhun_id)
->get()->toArray();
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
$karat = Lelkarat::where('lelong_id', $pengesahan->lelong_id)->get();
$karat = Lelkarat::where('lelong_id', $id)->get();
foreach($marhuns as $index1=>$marhun)
{
{
$status = Pengesahan::where('id', $pengesahan_id)
->where('lelongbid_id', $marhun['lelongbid_id'])
->select('status_ubah')
->value('status_ubah');
$gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
->where('norujukan', $lelongbid->norujukan)
->first();
@@ -300,23 +321,16 @@ class MarhunController extends Controller
$total = $karat->harga * $gadaimarhun->berat;
$hargaasas = round($total);
// if($gadaimarhun->karat == $marhun['karat'])
// {
// $status = 0;
// }
// else
// {
// $status = 1;
// }
$marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
$marhuns[$index1]['old_karat'] = $gadaimarhun->karat;
// $marhun[$index1]['status_perubahan'] = $status;
$marhuns[$index1]['old_berat'] = $gadaimarhun->berat;
$marhuns[$index1]['old_harga'] = $karat->harga;
$marhuns[$index1]['old_nilaimarhun'] = $total;
$marhuns[$index1]['old_hargaasas'] = $hargaasas;
$marhuns[$index1]['status_ubah'] = $status;
}
return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan'));
return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id'));
}
public function terimaperubahan(Request $request)
@@ -362,26 +376,28 @@ class MarhunController extends Controller
return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
}
public function submitdelete($id){
public function submitdelete($id, $lelong_id){
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$id)
->get();
->where('lelongbid.lelong_id', $lelong_id)
->first();
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $marhun->lelong_id;
$pengesahan->lelongbid = $id;
$pengesahan->lelong_id = $lelong_id;
$pengesahan->lelongbid_id = $id;
$pengesahan->norujukan = $marhun->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 3;
$pengesahan->save();
return redirect()->route('pengesahan.pcdelete',$lelongbid->id)
return redirect()->route('pengesahan.pcdelete',[$id, $lelong_id])
->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar');
}
app/Models/Pengesahan.php
+2 -1
View File
@@ -19,6 +19,7 @@ class Pengesahan extends Model
'disahkan_pada',
'diminta_oleh',
'diminta_pada',
'status'
'status',
'status_ubah'
];
}
database/migrations/2022_03_07_061858_create_pengesahan_table.php
+6
View File
@@ -17,12 +17,14 @@ class CreatePengesahanTable extends Migration
$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
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun
$table->timestamps();
$table->foreign('lelong_id')
@@ -32,6 +34,10 @@ class CreatePengesahanTable extends Migration
$table->foreign('lelongbid_id')
->references('id')->on('lelongbid')
->onDelete('cascade');
$table->foreign('lelongbidmarhun_id')
->references('id')->on('lelongbidmarhun')
->onDelete('cascade');
});
}
resources/views/includes/sidebar.blade.php
+2 -2
View File
@@ -115,8 +115,8 @@
<li class="{{ (request()->is('Pengesahan/*')) ? 'active' : '' }}">
<a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false" style="">Pengesahan</a>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/perubahanmutumarhun/*') || request()->is('pengesahan/perubahanmutumarhun') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/perubahanmutumarhun')}}">Perubahan Mutu Marhun</a>
<li class="{{ (request()->is('pengesahan/senarailelongubahmutu/*') || request()->is('pengesahan/senarailelongubahmutu') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelongubahmutu')}}">Senarai Perubahan Mutu Marhun</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
resources/views/marhun/marhun.blade.php
+2 -2
View File
@@ -44,7 +44,7 @@
<td>{{ $item->nota }}</td>
<td class="text-center">
<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" href="{{ route('marhun.submitdelete',$item->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
<a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $item->lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@@ -53,7 +53,7 @@
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('marhun.senaraimarhun', $lelongbid) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
<a href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
<a href="{{ route('marhun.semak', $lelongbid) }}" style="width:7%;" class="btn btn-success">Semak</a>
</div>
</div>
resources/views/marhun/senaraimarhun.blade.php
+1 -1
View File
@@ -29,7 +29,7 @@
<td>{{ $bid->norujukan }}</td>
<td>{{ $bid->t_lelong }}</td>
<td class="text-center">
<a href="{{ route('marhun.show',$bid->id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Marhun" ><i class="far fa-edit"></i></a>
<a href="{{ route('marhun.show', [$bid->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Marhun" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/pengesahan/mutumarhun.blade.php
+12 -1
View File
@@ -8,6 +8,7 @@
@csrf
<input type="hidden" name="pengesahan_id" value="{{ $pengesahan_id }}" />
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
<input type="hidden" name="id" value="{{ $id }}" />
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -25,6 +26,7 @@
<th>Harga (RM)</th>
<th>Nilai Marhun</th>
<th>Harga Asas</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@@ -68,12 +70,21 @@
@endif
{{ $marhun['hargaasas'] }}
</td>
<td>
@if($marhun['status_ubah'] == 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif($marhun['status_ubah'] == 2)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
@elseif($marhun['status_ubah'] == 3)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.perubahanmutumarhun') }}" class="btn btn-primary">Kembali</a>
<a href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-success" onclick="functerima()" >Sahkan</button>
</div>
</form>
resources/views/pengesahan/perubahanmutumarhun.blade.php
+10 -3
View File
@@ -14,8 +14,10 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th></th>
<th>JBG</th>
<th>Caj Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -23,15 +25,20 @@
@foreach($mutumarhun as $marhun)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $marhun['tarikh_lelong'] }}</td>
<td>{{ $marhun['norujukan'] }}</td>
<td>{{ $marhun['harga_emas_asas'] }}</td>
<td>{{ $marhun['jbg'] }}</td>
<td>{{ $marhun['cajlelong'] }}</td>
<td>
<a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id'], 'norujukan'=>$marhun['norujukan'] ] ) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
<a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id'], 'norujukan'=>$marhun['norujukan'], 'id'=>$marhun['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senarailelongubahmutu') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
resources/views/pengesahan/senarailelongubahmutu.blade.php
+104
View File
@@ -0,0 +1,104 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@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%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($lelong as $lel)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
<td>{{ $lel->tarikh_lelong }}</td>
<td>{{ $lel->harga_emas_asas }}</td>
<td>{{ $lel->jbg }}</td>
<td>{{ $lel->cajlelong }}</td>
<td>
<a href="{{ route('pengesahan.perubahanmutumarhun', $lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablelelong = $('#tablelelong').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 5,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
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) {
tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
routes/web.php
+5 -4
View File
@@ -122,8 +122,8 @@ Route::group(['prefix'=>'lelong'], function () {
Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']);
Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']);
Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']);
Route::get('/submitdelete/{id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']);
Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']);
Route::post('/submitdelete/{id}/{lelong_id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']);
Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']);
Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']);
@@ -148,8 +148,9 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
});
Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {
Route::get('/perubahanmutumarhun',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']);
Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
Route::get('/senarailelongubahmutu',['as'=>'pengesahan.senarailelongubahmutu','uses'=>'MarhunController@senarailelongubahmutu']);
Route::get('/perubahanmutumarhun/{id}',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']);
Route::get('/mutumarhun/{pengesahan_id}/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);