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

Merge branch 'amirah' into 'main'

Browse Source 
update index -> laporan

See merge request online-sistem1/lelong!22
This commit is contained in:
Nur Izzati Zulkifli
2022-04-27 01:15:30 +00:00
parent ef91c9de5c 03d396d8d4
commit 8f903b337c
7 changed files with 178 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+1 -1
View File
@@ -128,7 +128,7 @@ class AccountController extends Controller
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', '3,2')
->where('payment.status_payment_opt', '3,2')
->where('lelongbidder.status_payment', 2)
->select(
'lelongbid.id as lelongbid_id',
app/Http/Controllers/LelongController.php
+48 -10
View File
@@ -984,14 +984,26 @@ class LelongController extends Controller
public function lapbidaanpembidaindex (Request $request){
$arraydetails = [];
$lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
foreach($lelongid as $laporan){
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.laporanbidaanindex',compact('lelongid'));
return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails'));
}
@@ -1068,12 +1080,25 @@ class LelongController extends Controller
}
Public function laplelongindex (Request $request){
$arraydetails =[];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
return view('lelong.laplelongindex',compact('lelongid'));
foreach($lelongid as $laporan){
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.laplelongindex',compact('lelongid','arraydetails'));
}
@@ -1168,11 +1193,24 @@ class LelongController extends Controller
Public function lapbrglelpembidaindex (Request $request){
$arraydetails = [];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
return view ('lelong.lapbrglelpembidaindex',compact('lelongid'));
foreach($lelongid as $laporan){
$details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]);
}
return view ('lelong.lapbrglelpembidaindex',compact('lelongid','arraydetails'));
}
app/Http/Controllers/MarhunController.php
+82 -111
View File
@@ -521,83 +521,72 @@ class MarhunController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get();
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)
->first();
$pengesahan->id = $pengesahan['id'] ;
$pengesahan->disahkan_oleh = $user['id'];
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->save();
// dd($pengesahan);
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
if($request->jenis_button == "terima")
{
foreach($pengesahan as $index1=>$sah)
{
$savepengesahan = Pengesahan::where('id', $sah['id'])
->first();
$savepengesahan->disahkan_oleh = $user['id'];
$savepengesahan->disahkan_pada = $currentdate;
$savepengesahan->status = 1;
$savepengesahan->save();
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get();
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
->where('pengesahan.lelongbid_id', $sah->lelongbid_id)
->where('pengesahan.id', $sah->id)
->get();
$total_berat = 0;
$total_hargaasas = 0;
foreach($lelongbidmarhuns as $index2=>$bidmarhuns)
{
if($bidmarhuns->status_ubah == 3)
{
$bidmarhuns->delete();
}
else
{
//
}
$lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first();
$txtmarhun = ",1 " . $bidmarhuns->marhun ;
$lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']);
$lelongbids->berat = $total_berat += $bidmarhuns->berat ;
$lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas;
$lelongbids->save();
}
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->where('pengesahan.id', $pengesahan->id)
->get();
dd($lelongbidmarhuns['marhun']);
foreach($lelongbidmarhuns as $bidmarhuns)
{
if($bidmarhuns->status_ubah == 3)
{
$bidmarhuns->delete();
}
else
{
//
}
}
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$pengesahan->lelongbid_id)
->get();
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
$txtmarhun = ",1 " . $lelongbidmarhuns->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas;
$lelongbid->save();
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
foreach($pengesahan as $index1=>$sah)
{
$savepengesahan = Pengesahan::where('id', $sah['id'])
->first();
$savepengesahan->disahkan_oleh = $user['id'];
$savepengesahan->disahkan_pada = $currentdate;
$savepengesahan->status = 1;
$savepengesahan->save();
$lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first();
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $sah->lelong_id;
$tangguhlelong->lelongbid_id = $sah->lelongbid_id;
$tangguhlelong->norujukan = $sah->norujukan;
$tangguhlelong->pinjaman = $lelongbidasal['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
$marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete();
}
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
$tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
$tangguhlelong->norujukan = $pengesahan->norujukan;
$tangguhlelong->pinjaman = $lelongbid[0]['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
// dd($tangguhlelong);
$marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
}
@@ -641,29 +630,38 @@ class MarhunController extends Controller
}
public function pcdelete($id, $lelongbid_id)
{
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$lelongbid_id)
->get();
$lelongbid = LelongBid::where('id', $lelongbid_id)->first();
$txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
}
public function senarailelong()
{
$arrayinfo = [];
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
->get();
foreach($lelong as $details)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $details['id'])
->get()
->toArray();
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
return view('pengesahan.senarailelong',compact('lelong'));
}
public function senaraitangguhlelong($id)
{
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
->where('tangguhlelong.lelong_id', $id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
@@ -681,41 +679,14 @@ class MarhunController extends Controller
)
->get();
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $id)
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$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'
)
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', $norujukan)
->get();
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
app/Http/Controllers/SimulasiController.php
+5 -1
View File
@@ -460,6 +460,10 @@ class SimulasiController extends Controller
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
$simulasi = new Simulasi;
$simulasi->harga_emas_asas = $request->hargaasas;
$simulasi->save();
}
@@ -479,7 +483,7 @@ class SimulasiController extends Controller
'total23k',
'total22K',
'total21K',
'total20K',
'total20K',
'total18Kp',
'total18K',
'total14Kp',
resources/views/lelong/lapbrglelpembidaindex.blade.php
+13 -7
View File
@@ -15,7 +15,7 @@
<table class="table table-striped table-xl" id="tablenotislelong" 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>Bil</th>
<th>Lelong ID</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
@@ -24,14 +24,20 @@
</thead>
<tbody>
@foreach ($lelongid as $info)
@foreach ($arraydetails as $info)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $info->id }}"></td>
<td>{{ $info->lelong_id}}</td>
<td>{{ $info->caw_name}}</td>
<td>{{ $info->tarikh_lelong }}</td>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['lelong_id']}}</td>
<td>
@foreach($info['details'] as $details)
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $info['laporan']['tarikh_lelong'] }}</td>
<td class="text-center">
<a href="{{ route('lelong.lapbrglelpembida',$info->lelong_id,$info->caw_name) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="far fa-edit"></i></a>
<a href="{{ route('lelong.lapbrglelpembida',$info['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/lelong/laplelongindex.blade.php
+14 -8
View File
@@ -15,7 +15,7 @@
<table class="table table-striped table-xl" id="tablenotislelong" 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>Bil</th>
<th>Lelong ID</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
@@ -24,15 +24,21 @@
</thead>
<tbody>
@foreach ($lelongid as $bid)
@foreach ($arraydetails as $bid)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->caw_name}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td class="text-center">
<a href="{{ route('lelong.laplelong',$bid->lelong_id,$bid->caw_name) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong Keseluruhan" ><i class="far fa-edit"></i></a>
<td>{{$loop->iteration}}</td>
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>
@foreach($bid['details'] as $details)
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $bid['laporan']['tarikh_lelong'] }}</td>
<td class="text-center">
<a href="{{ route('lelong.laplelong',$bid['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong Keseluruhan" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
resources/views/lelong/laporanbidaanindex.blade.php
+15 -7
View File
@@ -4,6 +4,7 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Laporan Nama Pembida </h3>
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -15,7 +16,7 @@
<table class="table table-striped table-xl" id="tablenotislelong" 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>Bil</th>
<th>Lelong ID</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
@@ -24,14 +25,21 @@
</thead>
<tbody>
@foreach ($lelongid as $bid)
@foreach ($arraydetails as $bid)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->caw_name}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td>{{$loop->iteration}}
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>
@foreach($bid['details'] as $details)
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $bid['laporan']['tarikh_lelong'] }}</td>
<td class="text-center">
<a href="{{ route('lelong.senarailapbidaan',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="far fa-edit"></i></a>
<a href="{{ route('lelong.senarailapbidaan',$bid['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach