From f6490e72a5fed054339d3d5ae88cd9a890de98ac Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Mon, 11 Apr 2022 15:55:47 +0800 Subject: [PATCH] sah mutu operasi --- app/Http/Controllers/MarhunController.php | 69 ++------ .../views/pengesahan/mutumarhun.blade.php | 155 ++++++++++-------- 2 files changed, 98 insertions(+), 126 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index be7daa78..222566f0 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -407,13 +407,15 @@ class MarhunController extends Controller ->get(); $arraylelbidmarhun = []; + $bakilelong = 0; + $rugilelong = 0; foreach($lelbidmarhuns as $lelbidmarhun) { $marhuns = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id) ->where('id', $lelbidmarhun->lelongbidmarhun_id) ->get()->toArray(); - $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->first(); + $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first(); $karat = Lelkarat::where('lelong_id', $id)->get(); foreach($marhuns as $index1=>$marhun) @@ -426,66 +428,25 @@ class MarhunController extends Controller $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) ->where('norujukan', $lelongbid->norujukan) ->first(); - - $karat = $karat->where('karat', $gadaimarhun->karat)->first(); - - $total = $karat->harga * $gadaimarhun->berat; - $hargaasas = round($total); + + if($lelongbid->baki > 0) + { + $bakilelong = $bakilelong + $lelongbid->baki; + } + else + { + $rugilelong = $rugilelong - $lelongbid->baki; + } $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; - $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - $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; + $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['baki_lelong'] = $bakilelong; + $marhuns[$index1]['rugi_lelong'] = $rugilelong; } array_push($arraylelbidmarhun,$marhuns); } - // $pengesahans = Pengesahan::where('lelong_id', $id) - // ->where('norujukan', $norujukan) - // ->get(); - - // $arraypengesahan = []; - // foreach($pengesahans as $pengesahan) - // { - // $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', $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(); - - // $karat = $karat->where('karat', $gadaimarhun->karat)->first(); - - // $total = $karat->harga * $gadaimarhun->berat; - // $hargaasas = round($total); - - // $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; - // $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - // $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; - // $marhuns[$index1]['pengesahanid'] = $pengesahan_id; - // } - // array_push($arraypengesahan,$marhuns); - - - // } return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns')); } diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index cc759657..4c039b8b 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -15,78 +15,89 @@
{{ $message }}
@endif -| Bil | -No Rujukan | -Marhun | -Karat | -Berat | -Harga (RM) | -Nilai Marhun | -Harga Asas | -Status | -
|---|---|---|---|---|---|---|---|---|
| {{ $loop->iteration }} | -{{ $lelongbid->norujukan }} | -- @if($detail[0]['old_marhun'] != $detail[0]['marhun']) - {{ $detail['old_marhun'] }} - @endif - {{ $detail[0]['marhun'] }} - | -- @if($detail[0]['old_karat'] != $detail[0]['karat']) - {{ $detail[0]['old_karat'] }} - @endif - {{ $detail[0]['karat'] }} - | -- @if($detail[0]['old_berat'] != $detail[0]['berat']) - {{ number_format($detail[0]['old_berat'], 2, '.', '') }} - @endif - {{ $detail[0]['berat'] }} - | -- @if($detail[0]['old_harga'] != $detail[0]['harga']) - {{ number_format($detail[0]['old_harga'], 2, '.', '') }} - @endif - {{ $detail[0]['harga'] }} - | -- @if($detail[0]['old_nilaimarhun'] != $detail[0]['n_marhun']) - {{ number_format($detail[0]['old_nilaimarhun'], 2, '.', '') }} - @endif - {{ $detail[0]['n_marhun'] }} - | -- @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) - {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} - @endif - {{ $detail[0]['hargaasas'] }} - | -- @if($detail[0]['status_ubah'] == 1) - - @elseif($detail[0]['status_ubah'] == 2) - - @elseif($detail[0]['status_ubah'] == 3) - - @elseif($detail[0]['status_ubah'] == 4) - - @else - - @endif - | -
Pembiayaan : {{ $marhuns[0]['pembiayaan'] }}
+Keuntungan :
+Baki Lelong : {{ $marhuns[0]['baki_lelong'] }}
+Rugi Lelong : {{ $marhuns[0]['rugi_lelong'] }}
+| Bil | +No Rujukan | +Marhun | +Karat | +Berat | +Harga (RM) | +Nilai Marhun | +Harga Asas | +Status | +
|---|---|---|---|---|---|---|---|---|
| {{ $loop->iteration }} | +{{ $lelongbid->norujukan }} | ++ @if($detail[0]['old_marhun'] != $detail[0]['marhun']) + {{ $detail['old_marhun'] }} + @endif + {{ $detail[0]['marhun'] }} + | ++ @if($detail[0]['old_karat'] != $detail[0]['karat']) + {{ $detail[0]['old_karat'] }} + @endif + {{ $detail[0]['karat'] }} + | ++ @if($detail[0]['old_berat'] != $detail[0]['berat']) + {{ number_format($detail[0]['old_berat'], 2, '.', '') }} + @endif + {{ $detail[0]['berat'] }} + | ++ @if($detail[0]['old_harga'] != $detail[0]['harga']) + {{ number_format($detail[0]['old_harga'], 2, '.', '') }} + @endif + {{ $detail[0]['harga'] }} + | ++ @if($detail[0]['old_nmarhun'] != $detail[0]['n_marhun']) + {{ number_format($detail[0]['old_nmarhun'], 2, '.', '') }} + @endif + {{ $detail[0]['n_marhun'] }} + | ++ @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) + {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} + @endif + {{ $detail[0]['hargaasas'] }} + | ++ @if($detail[0]['status_ubah'] == 1) + + @elseif($detail[0]['status_ubah'] == 2) + + @elseif($detail[0]['status_ubah'] == 3) + + @elseif($detail[0]['status_ubah'] == 4) + + @else + + @endif + | +