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

update

Browse Source
This commit is contained in:
faiqahzaman
2022-06-19 14:23:27 +08:00
parent 53b512ab2c
commit 89e20bb31c
12 changed files with 215 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+55 -11
View File
@@ -49,33 +49,68 @@ class MarhunController extends Controller
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
->where('caw_id','=', $caw->id)
->get();
$sag = LelongBid::where('lelong_id', $lelong_id)
$sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak
->where('caw_id', $caw->id)
->where('status_semak', 0)
->get();
// dd($sag);
$sdhdisemak = LelongBid::select('id','norujukan')
->where('lelong_id', $lelong_id)
->where('caw_id', $caw->id)
->where('status_semak', 1)
->distinct()
//Get data filtered which is other than tangguh lelong from PC
$sdhdisemak = LelongBid::join('pengesahan', 'lelongbid.id', '=', 'pengesahan.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.caw_id', $caw->id)
->where('lelongbid.status_semak', 1)
->where('pengesahan.diminta_oleh', $user['id'])
->where('pengesahan.status', 1)
->where('pengesahan.status_ubah', '!=', 6)
->get();
$dalamproses = Pengesahan::select('pengesahan.norujukan')
->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
->where('pengesahan.lelong_id', $lelong_id)
->where('caw_id','=', $caw->id)
->where('lelongbid.caw_id','=', $caw->id)
->where('pengesahan.diminta_oleh', $user['id'])
->where('pengesahan.status', 1)
->where('pengesahan.status_ubah', '!=', 6)
->whereNull('pengesahan.disahkan_oleh')
->distinct()
->get();
$sdhdisahkan = Pengesahan::select('pengesahan.norujukan')
->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
$sdhdisahkan = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
->where('pengesahan.diminta_oleh', $user['id'])
->where('pengesahan.status', 1)
->where('pengesahan.status_ubah', '!=', 6)
->where('pengesahan.lelong_id', $lelong_id)
->whereNotNull('pengesahan.disahkan_oleh')
->where('lelongbid.status_semak', 1)
->get();
// dd($sdhdisahkan);
//Get data filtered which is from PC
$sdhdisemaktangguhlel = LelongBid::join('pengesahan', 'lelongbid.id', '=', 'pengesahan.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.caw_id', $caw->id)
->where('lelongbid.status_semak', 1)
->where('pengesahan.status', 2)
->where('pengesahan.status_ubah', 6)
->get();
$dalamprosestangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
->where('pengesahan.lelong_id', $lelong_id)
->where('lelongbid.caw_id','=', $caw->id)
->where('pengesahan.status', 2)
->where('pengesahan.status_ubah', 6)
->whereNull('pengesahan.disahkan_oleh')
->get();
$sdhdisahkantangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
->where('pengesahan.status', 2)
->where('pengesahan.status_ubah', 6)
->where('pengesahan.lelong_id', $lelong_id)
->where('caw_id','=', $caw->id)
->whereNotNull('pengesahan.disahkan_oleh')
@@ -89,6 +124,13 @@ class MarhunController extends Controller
->where('lelong_id', $lelong_id)
->get();
$statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->where('status_ubah', 6)
->first();
$lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc;
if($sudahdisahkan)
{
foreach($sudahdisahkan as $sahkan)
@@ -111,7 +153,9 @@ class MarhunController extends Controller
}
}
return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan'));
return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel',
'dalamprosestangguhlel', 'sdhdisahkantangguhlel'
));
}
public function kemaskini(Request $request)
app/Http/Controllers/PaymentController.php
+17 -3
View File
@@ -131,12 +131,24 @@ class PaymentController extends Controller
'lelongbidder.status_payment'
)
->get();
// dd($eachbid);
// foreach($gettunai as $index1=>$cash)
// {
// // dd($cash);
// $remarktunai = Payment::where('id', $cash['payment_id'])
// ->where('remark', '=', 'TUNAI')
// ->select('remark')
// ->first();
// // dd($remarktunai);
// $eachbid[$index1]['cash_only'] = $remarktunai;
// }
$getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id')
->where('payment.lelong_id', $lelong_id)
->where('payment.user_id', $user_id)
->get()->toArray();
// dd($getresit);
$array_resit = [];
foreach($getresit as $index1=>$resit)
@@ -172,7 +184,7 @@ class PaymentController extends Controller
'kodcaw' => $user->kodcaw,
'status_payment_opt' => 1,
'status' => 2,
'remark' => 'BAYARAN DI KAUNTER',
'remark' => 'TUNAI',
'resit_id' => $resit->id,
'total_payment' => $request->amaunkiraan,
'1sen' => $request->ambilansen1,
@@ -259,6 +271,8 @@ class PaymentController extends Controller
{
// dd($request->all());
//eachbid = lelongbid_id
$bid_id = implode(",", $request->eachbid);
dd($bid_id);
$paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
->where('payment.lelong_id', $request->lelong_id)
app/Http/Controllers/TangguhLelongController.php
+85 -76
View File
@@ -73,6 +73,7 @@ class TangguhLelongController extends Controller
->where('customer.kpbaru', $request->nokp)
->orWhere('customer.kplama', $request->nokp)
->first();
// dd($checkkodcaw);
if($request->nokp == null)
{
@@ -102,9 +103,12 @@ class TangguhLelongController extends Controller
->get();
// dd($getnorujukan);
$customer_detail = Customer::where('kpbaru', $ic['nokp'])
->orWhere('kplama', $ic['nokp'])
$customer_detail = Customer::join('daerah', 'customer.koddaerah', '=', 'daerah.koddaerah')
->join('negeri', 'customer.kodnegeri', '=', 'negeri.kodnegeri')
->where('customer.kpbaru', $ic['nokp'])
->orWhere('customer.kplama', $ic['nokp'])
->first();
// dd($customer_detail);
// $getic['customer_detail'] = $customer_detail;
// $getic2 = $customer_detail;
@@ -140,15 +144,6 @@ class TangguhLelongController extends Controller
}
}
// $icarray = [];
// foreach($getic->toArray() as $array)
// {
// if(sizeof($array) == 170)
// array_push($icarray, $array);
// }
// dd($getic->toArray());
$lelong_id = $request->lelong_id;
@@ -166,74 +161,88 @@ class TangguhLelongController extends Controller
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
// dd($lelbidmarhun);
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
if($lelbidmarhun == null)
{
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = new Pengesahan();
$pengesahan->lelong_id = $request->lelong_id;
$pengesahan->lelongbid_id = $bidmarhun;
$pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id'];
$pengesahan->norujukan = $lelongbidmarhun[0]['norujukan'];
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status = 2;
$pengesahan->status_ubah = 6;
$pengesahan->save();
$tangguhlelong = new TangguhLelong();
$tangguhlelong->lelong_id = $request->lelong_id;
$tangguhlelong->lelongbid_id = $bidmarhun;
$tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
$tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->remark;
$tangguhlelong->save();
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Klik Pada Kotak Semak');
}
else
{
$lelbidmarhun = $request->checkboxdata;
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
// dd($bidmarhun);
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
$lelbid = LelongBid::where('id', $lelongbidmarhun[0]['lelongbid_id'])->first();
$lelbid->status_semak = 1;
$lelbid->update();
// $updatelelbid = LelongBid::where('id', $lelongbidmarhun[0]['id'])
$pengesahan = new Pengesahan();
$pengesahan->lelong_id = $request->lelong_id;
$pengesahan->lelongbid_id = $bidmarhun;
$pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id'];
$pengesahan->norujukan = $lelongbidmarhun[0]['norujukan'];
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status = 2;
$pengesahan->status_ubah = 6;
$pengesahan->save();
$tangguhlelong = new TangguhLelong();
$tangguhlelong->lelong_id = $request->lelong_id;
$tangguhlelong->lelongbid_id = $bidmarhun;
$tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
$tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->remark;
$tangguhlelong->save();
}
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
}
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
}