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

update kemaskini mutu

Browse Source
This commit is contained in:
faiqahzaman
2022-04-11 15:07:16 +08:00
parent 8a09a33957
commit ea0c0b6355
4 changed files with 162 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+6 -1
View File
@@ -323,10 +323,15 @@ class LelongController extends Controller
$lelongbidmarhun->bil = $simbidmarhun->bil;
$lelongbidmarhun->marhun = $simbidmarhun->marhun;
$lelongbidmarhun->nota = $simbidmarhun->nota;
$lelongbidmarhun->old_karat = $simbidmarhun->karat;
$lelongbidmarhun->old_berat = $simbidmarhun->berat;
$lelongbidmarhun->old_harga = $simbidmarhun->harga;
$lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
$lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
$lelongbidmarhun->karat = $simbidmarhun->karat;
$lelongbidmarhun->berat = $simbidmarhun->berat;
$lelongbidmarhun->harga = $simbidmarhun->harga;
$lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun;
$lelongbidmarhun->nmarhun = $simbidmarhun->n_marhun;
$lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas;
$lelongbidmarhun->save();
app/Http/Controllers/MarhunController.php
+85 -23
View File
@@ -57,6 +57,7 @@ class MarhunController extends Controller
public function kemaskini(Request $request)
{
// dd($request->all());
//idmarhun => lelongbidmarhun_id
$user = Auth::user();
$currentdate = Carbon::now();
@@ -76,10 +77,10 @@ class MarhunController extends Controller
$lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first();
$ubahberatmin = 0.3;
$bezaberat = $marhun->berat - $request->berat_emas;
$bezahargaasas = $marhun->hargaasas - $request->harga_asas;
$bezaberat = $marhun->old_berat - $request->berat_emas;
$bezahargaasas = $marhun->old_hargaasas - $request->harga_asas;
if($request->karat < $marhun->karat)
if($request->karat < $marhun->old_karat)
{
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
@@ -89,15 +90,34 @@ class MarhunController extends Controller
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->lelongbidmarhun_id = $marhun->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 1;
$karat->save();
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->get();
if(isset($pengesahan['id']))
{
$pengesahan->id = $pengesahan->id;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $marhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 1;
$pengesahan->save();
}
else
{
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->lelongbidmarhun_id = $marhun->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 1;
$karat->save();
}
}
else if($bezaberat > $ubahberatmin)
@@ -114,20 +134,40 @@ class MarhunController extends Controller
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
$berat = new Pengesahan;
$berat->lelong_id = $lelong->id;
$berat->lelongbid_id = $lelongbid->id;
$berat->lelongbidmarhun_id = $marhun->id;
$berat->norujukan = $lelongbid->norujukan;
$berat->diminta_oleh = $user->id;
$berat->diminta_pada = $currentdate;
$berat->status_ubah = 4;
$berat->save();
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->get();
if(isset($pengesahan['id']))
{
$pengesahan->id = $pengesahan->id;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $marhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 4;
$pengesahan->save();
}
else
{
$berat = new Pengesahan;
$berat->lelong_id = $lelong->id;
$berat->lelongbid_id = $lelongbid->id;
$berat->lelongbidmarhun_id = $marhun->id;
$berat->norujukan = $lelongbid->norujukan;
$berat->diminta_oleh = $user->id;
$berat->diminta_pada = $currentdate;
$berat->status_ubah = 4;
$berat->save();
}
}
//beza berat kurang daripada 0.30 & penambahan berat (tak perlu pengesahan)
else
{
$marhun->id = $request->idmarhun;
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
$marhun->berat = $request->berat_emas;
@@ -135,7 +175,11 @@ class MarhunController extends Controller
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->delete();
$lelongbid->berat = $lelongbid->berat - ($bezaberat);
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
@@ -175,9 +219,27 @@ class MarhunController extends Controller
public function semak($id, $lelong_id)
{
//$id => lelongbid_id
$lelongbid = LelongBid::where('id','=',$id)
->where('lelong_id', $lelong_id)
->first();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $id)->get();
foreach($lelongbidmarhun as $lelbidmarhun)
{
if($lelbidmarhun['karat'] == null && $lelbidmarhun['berat'] == null && $lelbidmarhun['harga'] == null && $lelbidmarhun['n_marhun'] == null && $lelbidmarhun['hargaasas'] == null)
{
$lelbidmarhun->lelongbid_id = $id;
$lelbidmarhun->karat = $lelbidmarhun['old_karat'];
$lelbidmarhun->berat = $lelbidmarhun['old_berat'];
$lelbidmarhun->harga = $lelbidmarhun['old_harga'];
$lelbidmarhun->n_marhun = $lelbidmarhun['old_nmarhun'];
$lelbidmarhun->hargaasas = $lelbidmarhun['old_hargaasas'];
$lelbidmarhun->save();
}
}
$lelongbid->status_semak = 1;
$lelongbid->save();
@@ -362,7 +424,7 @@ class MarhunController extends Controller
->value('status_ubah');
$gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
->where('norujukan', $lelongbid->norujukan)
->where('norujukan', $lelongbid->norujukan)
->first();
$karat = $karat->where('karat', $gadaimarhun->karat)->first();
database/migrations/2021_12_14_041557_create_lelongs_table.php
+5
View File
@@ -95,10 +95,15 @@ class CreateLelongsTable extends Migration
$table->decimal('bil', $precision = 3, $scale = 0);
$table->string('marhun');
$table->string('nota')->nullable();
$table->string('old_karat');
$table->string('karat');
$table->decimal('old_berat', $precision = 7, $scale = 2);
$table->decimal('berat', $precision = 7, $scale = 2);
$table->decimal('old_harga', $precision = 5, $scale = 2);
$table->decimal('harga', $precision = 5, $scale = 2);
$table->decimal('old_nmarhun', $precision = 9, $scale = 2);
$table->decimal('n_marhun', $precision = 9, $scale = 2);
$table->decimal('old_hargaasas', $precision = 11, $scale = 2);
$table->decimal('hargaasas', $precision = 11, $scale = 2);
$table->integer('status_semak')->default(0)->nullable();
$table->timestamps();
resources/views/marhun/marhun.blade.php
+66 -9
View File
@@ -15,6 +15,14 @@
<input type="hidden" name="type" value="User">
<input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
<input type="hidden" name="lelongbid_id" id="lelongbid_id">
</form>
<form id="formsemak" action="{{ route('marhun.semak', [ $lelongbid, $lelong_id ]) }}" method="GET">
<input type="hidden" name="type" value="User">
<input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
<input type="hidden" name="lelongbid_id" id="lelongbid_id">
</form>
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
@@ -37,26 +45,55 @@
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $item->id }}"></td>
<td>{{ $lelongbid->norujukan }}</td>
<td>{{ $item->marhun }}</td>
<td>{{ $item->karat }}</td>
<td>{{ $item->berat }}</td>
<td>{{ $item->harga }}</td>
<td>{{ $item->n_marhun }}</td>
<td>{{ $item->hargaasas }}</td>
<td>
@if($item->karat != null)
{{ $item->karat }}
@else
{{ $item->old_karat }}
@endif
</td>
<td>
@if($item->berat != null)
{{ $item->berat }}
@else
{{ $item->old_berat }}
@endif
</td>
<td>
@if($item->harga != null)
{{ $item->harga }}
@else
{{ $item->old_harga }}
@endif
</td>
<td>
@if($item->n_marhun != null)
{{ $item->n_marhun }}
@else
{{ $item->old_nmarhun }}
@endif
</td>
<td>
@if($item->hargaasas != null)
{{ $item->hargaasas }}
@else
{{ $item->old_hargaasas }}
@endif
</td>
<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" 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 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>
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
@if($lelongbid->status_semak == 0)
<a href="{{ route('marhun.semak', [ $lelongbid, $lelong_id ]) }}" style="width:7%;" class="btn btn-success">Semak</a>
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
@elseif($lelongbid->status_semak == 1)
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
@endif
@@ -184,6 +221,26 @@
</div>
</div>
<script>
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'green',
typeAnimated: true,
buttons: {
Batal: {
btnClass: 'btn-default',
action: function () {}
},
Sahkan: {
btnClass: 'btn-success',
action: function () {
$("#formsemak").submit();
}
}
}
});
}
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()