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

Merge branch 'main' into atie

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2022-04-21 11:39:47 +08:00
parent 135e323e37 c676ddcf0e
commit e5155e6b41
9 changed files with 155 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+66 -31
View File
@@ -108,10 +108,14 @@ class LelongController extends Controller
$total14K = 0;
$total9K = 0;
$keuntungan = 0;
$total_upahkeuntungan = 0;
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
$packet = 0;
$berat = 0;
@@ -122,69 +126,76 @@ class LelongController extends Controller
$cajlelong = 0;
$rugilelong = 0;
$bakilelong = 0;
$total_nilaimarhun = 0;
foreach($databid as $bid)
foreach($databid as $index1=>$bid)
{
$marhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get();
$berat = $berat + $bid->berat;
$nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
$pinjaman =$pinjaman + $bid->pinjaman;
$upah = $upah + $bid->upah;
$hargaasas = $hargaasas + $bid->hargaasas;
$cajlelong = $cajlelong + $bid->cajlelong;
$marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
$berat = $berat + $bid['berat'];
$nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
$pinjaman =$pinjaman + $bid['pinjaman'];
$upah = $upah + $bid['upah'];
$hargaasas = $hargaasas + $bid['hargaasas'];
$cajlelong = $cajlelong + $bid['cajlelong'];
$keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
$databid[$index1]['keuntungan'] = $keuntungan;
$total_upahkeuntungan = $total_upahkeuntungan + $keuntungan;
if($bid->baki > 0)
if($bid['baki'] > 0)
{
$bakilelong = $bakilelong + $bid->baki;
$bakilelong = $bakilelong + $bid['baki'];
}
else
{
$rugilelong = $rugilelong - $bid->baki;
$rugilelong = $rugilelong - $bid['baki'];
}
$total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','24.0Kgb')
->sum('berat');
$total24K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','24.0K')
->sum('berat');
$total23k += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total23k += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','23.0K')
->sum('berat');
$total22K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total22K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','22.0K')
->sum('berat');
$total21K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total21K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','21.0K')
->sum('berat');
$total20K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total20K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','20.0K')
->sum('berat');
$total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','18.0Kp')
->sum('berat');
$total18K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total18K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','18.0K')
->sum('berat');
$total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','14.0Kp')
->sum('berat');
$total14K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total14K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','14.0K')
->sum('berat');
$total9K += LelongBidMarhun::where('lelongbid_id','=',$bid->id)
$total9K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
->where('karat','=','9.0K')
->sum('berat');
@@ -192,14 +203,14 @@ class LelongController extends Controller
}
array_push($arraycaw,[
'id_cawangan'=> $cawangan->id,
'cawangan'=>$cawangan->caw_name,
't_lelong'=>$lelong->tarikh_lelong,
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],
't_lelong'=>$lelong['tarikh_lelong'],
'bil_marhun'=>sizeof($databid),
'berat'=>$berat,
'n_marhun'=>$nilai_marhun,
'pinjaman'=>$pinjaman,
'upah'=>0,
'upah'=>$total_upahkeuntungan,
'hargaasas'=>$hargaasas,
'cajlelong'=>$cajlelong,
'rugilelong'=>$rugilelong,
@@ -208,13 +219,14 @@ class LelongController extends Controller
$total_marhun = $total_marhun + sizeof($databid);
$total_berat = $total_berat + $berat;
$total_nmarhun = $total_nmarhun + $nilai_marhun;
$total_pinjaman = $total_pinjaman + $pinjaman;
$total_upah = $total_upah + 0;
$total_hargaasas = $total_hargaasas + $hargaasas;
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
$data = Lelong::where('lelong.id','=',$lelong_id)
->get();
@@ -246,7 +258,9 @@ class LelongController extends Controller
'lelkarat',
'lelong_id',
'jeniskarat',
'data'));
'data',
'total_upahkeuntungan',
'total_nilaimarhun'));
}
public function create($id)
@@ -788,7 +802,11 @@ class LelongController extends Controller
public function senaraimarhun($lelongid, $cawid){
// $marhun = LelongBid::->get();
$keuntungan = 0;
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
->select(
'lelongbid.t_lelong',
@@ -803,9 +821,26 @@ class LelongController extends Controller
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.status_jual',
'lelongbid.jbg'
'lelongbid.jbg',
'gadai.bakipjm',
'gadai.bakihargajualan',
'gadai.upah12',
'gadai.ansakhir',
'gadai.tempoh',
'gadai.tempohbayar',
'gadai.kadarupah'
)
->get();
->get()->toArray();
foreach ($marhuns as $index1=> $cal) {
$keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
$marhuns[$index1]['keuntungan'] = $keuntungan;
}
return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid'));
}
app/Http/Controllers/MarhunController.php
+39 -9
View File
@@ -665,6 +665,20 @@ class MarhunController extends Controller
{
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
->where('tangguhlelong.lelong_id', $id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.ditangguh_pada',
'tangguhlelong.ditangguh_oleh',
'tangguhlelong.nota',
'lelong.id as lelong_id',
'lelong.tarikh_lelong',
'lelong.harga_emas_asas',
'lelong.jbg',
'lelong.cajlelong',
'lelong.sts_lelong'
)
->get();
foreach($tangguhlelong as $index1=>$tanguhlel)
@@ -673,22 +687,38 @@ class MarhunController extends Controller
->where('lelong_id', $id)
->first();
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name;
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
}
public function lelbidmarhun($id, $norujukan)
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
->where('tangguhlelong.norujukan', $norujukan)
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->where('gadaimarhun.norujukan', $norujukan)
->where('tangguhlelong.id', $tangguhlelong_id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.pinjaman',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.nota as tangguh_nota',
'tangguhlelong.pinjaman',
'gadaimarhun.id as gadaimarhun_id',
'gadaimarhun.bil',
'gadaimarhun.marhun',
'gadaimarhun.nota as gadai_nota',
'gadaimarhun.karat',
'gadaimarhun.berat',
'gadaimarhun.harga',
'gadaimarhun.n_marhun'
)
->get();
$status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first();
return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status'));
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
}
app/Http/Controllers/SimulasiController.php
+7 -4
View File
@@ -354,14 +354,16 @@ class SimulasiController extends Controller
$keuntungan = 0;
$total_upahkeuntungan = 0;
$total_nilaimarhun = 0;
foreach($databid as $index1=>$bid)
{
$marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
$berat = $berat + $bid['berat'];
$nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
// $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
$nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
$pinjaman =$pinjaman + $bid['pinjaman'];
$upah = $upah + $bid['upahsimpan'];
$hargaasas = $hargaasas + $bid['hargaasas'];
@@ -449,7 +451,7 @@ class SimulasiController extends Controller
$total_marhun = $total_marhun + sizeof($databid);
$total_berat = $total_berat + $berat;
$total_nmarhun = $total_nmarhun + $nilai_marhun;
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
$total_pinjaman = $total_pinjaman + $pinjaman;
$total_hargaasas = $total_hargaasas + $hargaasas;
$total_cazlelong = $total_cazlelong + $cajlelong;
@@ -487,7 +489,8 @@ class SimulasiController extends Controller
'simulasi_id',
'jeniskarat',
'data',
'total_upahkeuntungan'));
'total_upahkeuntungan',
'total_nilaimarhun'));
}
public function delete($id)
resources/views/lelong/senaraimarhun.blade.php
+19 -19
View File
@@ -28,7 +28,7 @@
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Upah Simpan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj Lelong (%)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
@@ -38,34 +38,34 @@
<tbody>
@foreach ($marhuns as $index=> $marhun)
<tr>
<td>{{$index+1}}</td>
<td>{{ $marhun->t_lelong }}</td>
<td class="text-center">{{ $marhun->kodcaw }}</td>
<td>{{ $marhun->caw_name }}</td>
<td>{{ $marhun->norujukan}}</td>
<td>{{ $marhun->pinjaman }}</td>
<td>{{ $marhun->jbg}}</td>
<td>{{ $marhun->berat }}</td>
<td>{{ $marhun->nilaimarhun }}</td>
<td>{{ $marhun->hargaasas }}</td>
<td>{{ $marhun->upahsimpan }}</td>
<td>{{ $marhun->cajlelong }}</td>
<td>{{$loop->iteration}}</td>
<td>{{ $marhun['t_lelong'] }}</td>
<td class="text-center">{{ $marhun['kodcaw'] }}</td>
<td>{{ $marhun['caw_name'] }}</td>
<td>{{ $marhun['norujukan']}}</td>
<td>{{ $marhun['pinjaman'] }}</td>
<td>{{ $marhun['jbg']}}</td>
<td>{{ $marhun['berat'] }}</td>
<td>{{ $marhun['nilaimarhun'] }}</td>
<td>{{ $marhun['hargaasas'] }}</td>
<td>{{ $marhun['keuntungan'] }}</td>
<td>{{ $marhun['cajlelong'] }}</td>
<?php
$rugi = '';
$baki = '';
if(strpos($marhun->baki, '-') !== false)
$rugi = 0;
$baki = 0;
if(strpos($marhun['baki'], '-') !== false)
{
$rugi = $marhun->baki;
$rugi = $marhun['baki'];
}
else {
$baki = $marhun->baki;
$baki = $marhun['baki'];
}
?>
<td>{{$rugi}}</td>
<td>{{$baki}}</td>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun->norujukan }}">
<input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
</td>
</tr>
resources/views/lelong/showlelong.blade.php
+2 -2
View File
@@ -100,9 +100,9 @@
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ $total_marhun }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nmarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_upah, 2, '.', ',') }}</td>
<td>{{ number_format($total_upahkeuntungan, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
resources/views/pengesahan/lelbidmarhun.blade.php
+17 -19
View File
@@ -10,42 +10,40 @@
<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%;">
<p> <b>Norujukan : </b> {{ $tangguhlelong[0]['norujukan'] }}</p>
<p> <b>Pembiayaan : </b> {{ $tangguhlelong[0]['pinjaman'] }}</p>
<p> <b>Remark : </b> {{ $tangguhlelong[0]['tangguh_nota'] }}</p>
</div>
</div>
</div>
<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>Bil</th>
<th>No Rujukan</th>
<th>Marhun</th>
<th>Karat</th>
<th>Berat</th>
<th>Harga (RM)</th>
<th>Nilai Marhun</th>
<th>Nota</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@foreach ($marhuns as $marhun)
@foreach ($tangguhlelong as $index1=>$tangguhlel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $marhun->norujukan }}</td>
<td>{{ $marhun->marhun }}</td>
<td>{{ $marhun->karat }}</td>
<td>{{ $marhun->berat }}</td>
<td>{{ $marhun->harga }}</td>
<td>{{ $marhun->n_marhun }}</td>
<td>{{ $marhun->nota }}</td>
<td>
@if($status->status_ubah == 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif($status->status_ubah == 2)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
@elseif($status->status_ubah == 3)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
@endif
</td>
<td>{{ $tangguhlel->marhun }}</td>
<td>{{ $tangguhlel->karat }}</td>
<td>{{ $tangguhlel->berat }}</td>
<td>{{ $tangguhlel->harga }}</td>
<td>{{ $tangguhlel->n_marhun }}</td>
<td>{{ $tangguhlel->gadai_nota }}</td>
</tr>
@endforeach
</tbody>
resources/views/pengesahan/senaraitangguhlelong.blade.php
+3 -4
View File
@@ -17,23 +17,22 @@
<tr>
<th>Bil</th>
<th>Nama Cawangan</th>
<th>Tarikh Lelong Asal</th>
<th>Tarikh Lelong</th>
<th>Tarikh Tangguh</th>
<th>No Rujukan</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($tangguhlelong as $tangguhlel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tangguhlel['nama_caw'] }}</td>
<td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
<td>{{ $tangguhlel->tarikh_lelong }}</td>
<td>{{ $tangguhlel->tarikhtangguh }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/simulasi/showsimulasi.blade.php
+1 -1
View File
@@ -97,7 +97,7 @@
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ $total_marhun }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nmarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_upahkeuntungan, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
routes/web.php
+1 -1
View File
@@ -193,7 +193,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
});
Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {