From e0f0317b9476f22d4607c35dd805ae9c48ffed2e Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Tue, 26 Apr 2022 16:00:56 +0800 Subject: [PATCH 01/13] tangguh lelong by pc --- app/Http/Controllers/PaymentController.php | 7 +- .../Controllers/TangguhLelongController.php | 160 ++++++++++++++++++ app/Models/Customer.php | 60 +++++++ ...2_03_07_061858_create_pengesahan_table.php | 2 +- database/seeders/RolesSeeder.php | 6 +- resources/views/includes/sidebar.blade.php | 3 + .../views/pembayaran/SAGBidItem.blade.php | 1 + .../views/tangguhlelong/carian.blade.php | 39 +++++ .../views/tangguhlelong/searchbyic.blade.php | 157 +++++++++++++++++ .../senarailelongtangguh.blade.php | 142 ++++++++++++++++ routes/web.php | 6 + 11 files changed, 578 insertions(+), 5 deletions(-) create mode 100644 app/Http/Controllers/TangguhLelongController.php create mode 100644 app/Models/Customer.php create mode 100644 resources/views/tangguhlelong/carian.blade.php create mode 100644 resources/views/tangguhlelong/searchbyic.blade.php create mode 100644 resources/views/tangguhlelong/senarailelongtangguh.blade.php diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index b0c37542..acb14560 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -128,6 +128,7 @@ class PaymentController extends Controller $user = Auth::user(); $bid_id = explode(",", $request->eachbid); + dd($bid_id); $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) @@ -222,14 +223,14 @@ class PaymentController extends Controller public function banktransfer(Request $request) { - // dd($request->all()); + dd($request->all()); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); $user = Auth::user(); // dd($user); - + // dd($request->checkboxdata); $totalcheck = implode(",", $request->checkboxdata); $resit = Resit::where('lelong_id', $request->lelong_id) @@ -245,7 +246,7 @@ class PaymentController extends Controller $payment->status = 2; $payment->remark = 'BAYARAN CDM'; $payment->resit_id = $resit->id; - $payment->total_payment = $totalcheck; + $payment->total_payment = sum($totalcheck->valueOf()); $payment->diminta_pada = $currentdate; $payment->diminta_oleh = $user->id; $payment->save(); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php new file mode 100644 index 00000000..b99657f4 --- /dev/null +++ b/app/Http/Controllers/TangguhLelongController.php @@ -0,0 +1,160 @@ +join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + // dd($arrayinfo); + + } + + return view('tangguhlelong.senarailelongtangguh',compact('lelong', 'arrayinfo')); + } + + public function carian($lelong_id) + { + return view('tangguhlelong.carian', compact('lelong_id')); + } + + public function searchbyic(Request $request) + { + $user = Auth::user(); + + if($request->nokp == null) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Masukkan No Kad Pengenalan'); + } + else if($request->nokp != null) + { + $lelong = Lelong::where('id', $request->lelong_id)->first(); + + $getic = Customer::join('gadai', 'customer.nopelanggan', '=', 'gadai.nopelanggan') + ->where('customer.kpbaru', $request->nokp) + ->where('gadai.tempoh', $lelong->jbg) + ->get(); + + foreach($getic as $index1=>$ic) + { + $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('norujukan', $ic->norujukan) + ->where('jbg', $ic->tempoh) + ->get(); + + $getic[$index1]['user_details'] = $getnorujukan; + // dd($getic[$index1]['user_details']); + } + $lelong_id = $request->lelong_id; + + return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id' )); + + } + + } + + public function tangguhlelong(Request $request) + { + // dd($request->all()); + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $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('lelongbidmarhun.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 = $lelongbidmarhun[0]['lelongbid_id']; + $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; + + $deletemarhun = LelongBidMarhun::where('id', $lelongbidmarhun[0]['lelongbidmarhun_id']) + ->delete(); + } + + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Tangguh Lelong Berjaya'); + + } +} diff --git a/app/Models/Customer.php b/app/Models/Customer.php new file mode 100644 index 00000000..06013a88 --- /dev/null +++ b/app/Models/Customer.php @@ -0,0 +1,60 @@ +integer('diminta_oleh'); $table->datetime('diminta_pada'); $table->integer('status')->default(0); //1 = terima, 2 = tangguh lelong - $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat + $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat, 6 = tangguh lelong pc $table->timestamps(); // $table->foreign('lelong_id') diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 09d9ee98..e46824e5 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -71,6 +71,10 @@ class RolesSeeder extends Seeder 'name' => 'serahan', 'description' => 'Penyerahan Marhun Kepada Pembida Yang Menang' ]); + Permission::create([ + 'name' => 'tangguhlelong', + 'description' => 'Penangguhan Lelong Cawangan' + ]); //jurulelong Permission::create([ @@ -152,7 +156,7 @@ class RolesSeeder extends Seeder $role4->givePermissionTo('jananotis'); $role4->givePermissionTo('pengesahanbayarancash'); $role4->givePermissionTo('serahan'); - + $role4->givePermissionTo('tangguhlelong'); $role5 = Role::create(['name' => 'jurulelong']); $role5->givePermissionTo('pendaftaranbatch'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index c2fc6fb1..6a47270a 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -83,6 +83,9 @@ +
  • + Tangguh Lelong +
  • Pembayaran Pemenang
    • diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 6c1b8cf6..6831b28f 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -215,6 +215,7 @@ $('#eachbid').val(arraylelongbid); $("#formbanktransfer").submit(); var total_sum = parseFloat($('#total').val()); + $('#total').val(parseFloat(total_sum).toFixed(2)); } } } diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php new file mode 100644 index 00000000..66f1eab2 --- /dev/null +++ b/resources/views/tangguhlelong/carian.blade.php @@ -0,0 +1,39 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + @if ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif +

    Sila Masukkan No Kad Pengenalan

    + +
    + @csrf + +
    + +
    + +
    +
    + +
    + Kembali + +
    +
    +
    +
    +
    + + +@endsection diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php new file mode 100644 index 00000000..8eb7544d --- /dev/null +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -0,0 +1,157 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + @csrf + + + + + + + + + + + + + + + + + + @foreach ($getic as $ic) + + + + + + + + + + + + + @endforeach + +
    NoTarikh LelongNo RujukanJBGNarhunNilai Marhun (RM)Pembiayaan (RM)BeratAction
    {{$loop->iteration}}{{$ic['user_details'][0]['t_lelong']}}{{$ic['norujukan']}}{{$ic['jbg']}}{{$ic['marhun']}}{{$ic['nilaimarhun']}}{{$ic['pinjaman']}}{{$ic['berat']}} + +
    +
    + Kembali + + +
    +
    +
    +
    + + +@endsection diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php new file mode 100644 index 00000000..419f1958 --- /dev/null +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -0,0 +1,142 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + + @endforeach + +
    NoTarikh LelongCawanganHarga Emas AsasJBGCaj LelongStatus LelongAction
    {{$loop->iteration}}{{ $lel['info']['tarikh_lelong']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}}{{$lel['info']['cajlelong']}} + @if($lel['info']['sts_lelong'] == 0) + + @elseif($lel['info']['sts_lelong'] == 1) + + @elseif($lel['info']['sts_lelong'] == 2) + + @elseif($lel['info']['sts_lelong'] == 3) + + @endif + + @if($lel['info']['sts_lelong'] == 0) + + @endif +
    +
    +
    + +
    +
    + + +@endsection diff --git a/routes/web.php b/routes/web.php index 21c2360a..dc287198 100644 --- a/routes/web.php +++ b/routes/web.php @@ -221,6 +221,12 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']); }); +Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlelong'], function () { + Route::get('/senleluntuktangguh', ['as'=>'tangguhlelong.senleluntuktangguh','uses'=>'TangguhLelongController@senleluntuktangguh']); + Route::get('/carian/{lelong_id}', ['as'=>'tangguhlelong.carian','uses'=>'TangguhLelongController@carian']); + Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']); + Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']); +}); // Pengurus Cawangan // Account From 1e2485e48af98b0c5680456c2019c7b189add176 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Wed, 27 Apr 2022 15:14:19 +0800 Subject: [PATCH 02/13] update pengesahan tangguh lelong PC --- .../Controllers/TangguhLelongController.php | 29 ++++++++++++------- .../views/tangguhlelong/carian.blade.php | 4 +-- .../views/tangguhlelong/searchbyic.blade.php | 4 +-- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index b99657f4..3571e114 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -54,6 +54,7 @@ class TangguhLelongController extends Controller public function searchbyic(Request $request) { + // dd($request->all()); $user = Auth::user(); if($request->nokp == null) @@ -71,13 +72,24 @@ class TangguhLelongController extends Controller foreach($getic as $index1=>$ic) { - $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('norujukan', $ic->norujukan) + $getnorujukan = LelongBid::where('norujukan', $ic->norujukan) ->where('jbg', $ic->tempoh) ->get(); + foreach($getnorujukan as $norujukan) + { + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id) + ->where('lelongbid_id', $norujukan->lelongbid_id) + ->where('norujukan', $norujukan->norujukan) + ->get()->toArray(); + + if($pengesahan) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Telah Dibuat'); + } + } + $getic[$index1]['user_details'] = $getnorujukan; - // dd($getic[$index1]['user_details']); } $lelong_id = $request->lelong_id; @@ -95,7 +107,7 @@ class TangguhLelongController extends Controller $currentdate = $currentdate->toDateTimeString(); $lelbidmarhun = $request->checkboxdata; - + $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray(); foreach($lelbidmarhun as $bidmarhun) @@ -138,7 +150,6 @@ class TangguhLelongController extends Controller 'lelongbid.marhun', ) ->get()->toArray(); - // dd($lelongbidmarhun); $pengesahan = new Pengesahan(); $pengesahan->lelong_id = $request->lelong_id; @@ -149,12 +160,10 @@ class TangguhLelongController extends Controller $pengesahan->diminta_pada = $currentdate; $pengesahan->status = 2; $pengesahan->status_ubah = 6; - - $deletemarhun = LelongBidMarhun::where('id', $lelongbidmarhun[0]['lelongbidmarhun_id']) - ->delete(); + $pengesahan->save(); + } - - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Tangguh Lelong Berjaya'); + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya'); } } diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php index 66f1eab2..810867d2 100644 --- a/resources/views/tangguhlelong/carian.blade.php +++ b/resources/views/tangguhlelong/carian.blade.php @@ -4,8 +4,8 @@
    - @if ($message = Session::get('failed')) -
    + @if ($message = Session::get('success')) +

    {{ $message }}

    @endif diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index 8eb7544d..e2f30a38 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -10,6 +10,7 @@

    {{ $message }}

    @endif +
    @csrf @@ -40,9 +41,8 @@ {{$ic['pinjaman']}} {{$ic['berat']}} - + - @endforeach From b08fbf28964dd5906be54d934af506b778c29e78 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Thu, 28 Apr 2022 13:33:47 +0800 Subject: [PATCH 03/13] pengesahan lelong tangguh pc --- .../Controllers/TangguhLelongController.php | 139 +++++++++++++++ resources/views/includes/sidebar.blade.php | 9 +- .../tangguhlelong/senleltangguh.blade.php | 142 ++++++++++++++++ .../views/tangguhlelong/sensahpc.blade.php | 158 ++++++++++++++++++ routes/web.php | 3 + 5 files changed, 449 insertions(+), 2 deletions(-) create mode 100644 resources/views/tangguhlelong/senleltangguh.blade.php create mode 100644 resources/views/tangguhlelong/sensahpc.blade.php diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 3571e114..87ec1faa 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -13,10 +13,12 @@ use App\Models\Lelong; use App\Models\LelongBid; use App\Models\LelongBidMarhun; use App\Models\CawanganLelong; +use App\Models\TangguhLelong; use App\Models\Pengesahan; class TangguhLelongController extends Controller { + //PC public function senleluntuktangguh() { $user = Auth::user(); @@ -166,4 +168,141 @@ class TangguhLelongController extends Controller return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya'); } + + //Operasi + public function senarailelongtangguh() + { + $arrayinfo = []; + + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + // dd($arrayinfo); + } + + return view('tangguhlelong.senleltangguh',compact('lelong', 'arrayinfo')); + + } + + public function senaraisahtangguh($lelong_id, $caw_code) + { + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $pengesahan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) + ->whereNull('disahkan_oleh') + ->whereNull('disahkan_pada') + ->get(); + + foreach($pengesahan as $index1=>$sah) + { + $lelongbid = LelongBid::where('id', $sah->lelongbid_id) + ->where('norujukan', $sah->norujukan) + ->where('kodcaw', $caw_code) + ->get(); + // dd($lelongbid[0]['jbg']); + + $pengesahan[$index1]['bid_details'] = $lelongbid; + } + + return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code')); + } + + public function sahkantangguhlel(Request $request) + { + // dd($request->all()); + + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $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(); + // dd($lelongbidmarhun); + + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $lelongbidmarhun[0]['lelongbidmarhun_id']) + ->where('lelongbid_id', $lelongbidmarhun[0]['lelongbid_id']) + ->where('norujukan', $lelongbidmarhun[0]['norujukan']) + ->first(); + $pengesahan->disahkan_oleh = $user->id; + $pengesahan->disahkan_pada = $currentdate; + $pengesahan->save(); + + $tangguhlelong = new TangguhLelong(); + $tangguhlelong->lelong_id = $request->lelong_id; + $tangguhlelong->lelongbid_id = $lelongbidmarhun[0]['lelongbid_id']; + $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan']; + $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman']; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = 'Tangguh Lelong PC'; + $tangguhlelong->save(); + + $biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('lelongbid.id', $tangguhlelong->lelongbid_id) + ->where('lelongbid.norujukan', $tangguhlelong->norujukan) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->delete(); + + $caw_code = $request->kodcaw; + + } + return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya'); + } } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 6a47270a..d123f589 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -130,12 +130,17 @@ + diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php new file mode 100644 index 00000000..57deba77 --- /dev/null +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -0,0 +1,142 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + + @endforeach + +
    NoTarikh LelongCawanganHarga Emas AsasJBGCaj LelongStatus LelongAction
    {{$loop->iteration}}{{ $lel['info']['tarikh_lelong']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}}{{$lel['info']['cajlelong']}} + @if($lel['info']['sts_lelong'] == 0) + + @elseif($lel['info']['sts_lelong'] == 1) + + @elseif($lel['info']['sts_lelong'] == 2) + + @elseif($lel['info']['sts_lelong'] == 3) + + @endif + + @if($lel['info']['sts_lelong'] == 0) + + @endif +
    + +
    + +
    +
    + + +@endsection diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php new file mode 100644 index 00000000..fb6ff618 --- /dev/null +++ b/resources/views/tangguhlelong/sensahpc.blade.php @@ -0,0 +1,158 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + +
    + @csrf + + + + + + + + + + + + + + + + + + + @foreach ($pengesahan as $sah) + + + + + + + + + + + + @endforeach + +
    NoTarikh LelongNo RujukanJBGNarhunNilai Marhun (RM)Pembiayaan (RM)BeratAction
    {{$loop->iteration}}{{$sah['bid_details'][0]['t_lelong']}}{{$sah['norujukan']}}{{$sah['bid_details'][0]['jbg']}}{{$sah['bid_details'][0]['marhun']}}{{$sah['bid_details'][0]['nilaimarhun']}}{{$sah['bid_details'][0]['pinjaman']}}{{$sah['bid_details'][0]['berat']}} + +
    +
    + Kembali + + +
    +
    +
    +
    + + +@endsection diff --git a/routes/web.php b/routes/web.php index e591c577..d3ce7033 100644 --- a/routes/web.php +++ b/routes/web.php @@ -195,6 +195,9 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']); Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); + Route::get('/senarailelongtangguh',['as'=>'pengesahan.senarailelongtangguh','uses'=>'TangguhLelongController@senarailelongtangguh']); + Route::get('/senaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.senaraisahtangguh','uses'=>'TangguhLelongController@senaraisahtangguh']); + Route::post('/sahkantangguhlel',['as'=>'pengesahan.sahkantangguhlel','uses'=>'TangguhLelongController@sahkantangguhlel']); }); Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () { From b78a75f7eaf1f3d83be9397cc53eecb9395fa19c Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Sun, 8 May 2022 11:46:29 +0800 Subject: [PATCH 04/13] update sah tangguh lelong pc & operasi --- app/Http/Controllers/MarhunController.php | 52 ++++++++++++++++--- .../Controllers/TangguhLelongController.php | 10 ++-- .../views/tangguhlelong/searchbyic.blade.php | 10 ++-- .../views/tangguhlelong/sensahpc.blade.php | 7 +-- 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7528eddd..35a404fe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -399,6 +399,7 @@ class MarhunController extends Controller $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') ->where('lelong.id', $id) ->whereNull('disahkan_oleh') + ->where('pengesahan.status_ubah', [1,2,3,4,5]) ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') ->groupBy('pengesahan.norujukan') ->get()->toArray(); @@ -653,10 +654,22 @@ class MarhunController extends Controller public function senarailelong() { - $lelong = Lelong::where('sts_lelong', 0) - ->get(); + $arrayinfo = []; - return view('pengesahan.senarailelong',compact('lelong')); + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + 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')); } public function senaraitangguhlelong($id) @@ -679,14 +692,41 @@ 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) { - $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') - ->where('tangguhlelong.lelong_id', $id) - ->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(); return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan')); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 87ec1faa..76431cac 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -92,6 +92,7 @@ class TangguhLelongController extends Controller } $getic[$index1]['user_details'] = $getnorujukan; + // dd($getic[$index1]['user_details']); } $lelong_id = $request->lelong_id; @@ -109,14 +110,14 @@ 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) { - // dd($bidmarhun); $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbidmarhun.id', $bidmarhun) + ->where('lelongbid.id', $bidmarhun) ->select('lelongbidmarhun.id as lelongbidmarhun_id', 'lelongbidmarhun.bil', 'lelongbidmarhun.marhun', @@ -152,10 +153,11 @@ class TangguhLelongController extends Controller 'lelongbid.marhun', ) ->get()->toArray(); + // dd($lelongbidmarhun); $pengesahan = new Pengesahan(); $pengesahan->lelong_id = $request->lelong_id; - $pengesahan->lelongbid_id = $lelongbidmarhun[0]['lelongbid_id']; + $pengesahan->lelongbid_id = $bidmarhun; $pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id']; $pengesahan->norujukan = $lelongbidmarhun[0]['norujukan']; $pengesahan->diminta_oleh = $user->id; @@ -285,7 +287,7 @@ class TangguhLelongController extends Controller $tangguhlelong = new TangguhLelong(); $tangguhlelong->lelong_id = $request->lelong_id; - $tangguhlelong->lelongbid_id = $lelongbidmarhun[0]['lelongbid_id']; + $tangguhlelong->lelongbid_id = $bidmarhun; $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan']; $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman']; $tangguhlelong->tarikhtangguh = $currentdate; diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index e2f30a38..4db10ef4 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -11,10 +11,10 @@
    @endif -
    + @csrf - +
    @@ -48,10 +48,10 @@
    No
    - Kembali + Kembali +
    -
    @@ -101,7 +101,7 @@ } - var tabletangguhlelong = $('#tangguhlelong').DataTable( { + var tabletangguhlel = $('#tangguhlel').DataTable( { "columnDefs": [ { "targets": 0, diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php index fb6ff618..ab9b2f11 100644 --- a/resources/views/tangguhlelong/sensahpc.blade.php +++ b/resources/views/tangguhlelong/sensahpc.blade.php @@ -25,12 +25,13 @@ Narhun Nilai Marhun (RM) Pembiayaan (RM) - Berat + Berat Action + @foreach ($pengesahan as $sah) {{$loop->iteration}} @@ -51,8 +52,8 @@
    Kembali +
    - @@ -138,7 +139,7 @@ // $("#formtangguhlelong").submit(); // } // } - ] + // ] }); $('.addsim').tooltip(); From 03d06ab355599a6a545169a6d3149b25d99eddf0 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Sun, 8 May 2022 15:09:40 +0800 Subject: [PATCH 05/13] update senarai tangguh lelong --- app/Http/Controllers/MarhunController.php | 21 +++++-- .../views/pengesahan/lelbidmarhun.blade.php | 2 +- .../views/pengesahan/senarailelong.blade.php | 2 +- .../pengesahan/senaraitangguhlelong.blade.php | 56 +++++++++++-------- routes/web.php | 2 +- 5 files changed, 50 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 35a404fe..bdb0cd69 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -672,10 +672,12 @@ class MarhunController extends Controller return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); } - public function senaraitangguhlelong($id) + public function senaraitangguhlelong($id, $caw_name) { - $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id') ->where('tangguhlelong.lelong_id', $id) + // ->join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + // ->where('tangguhlelong.lelong_id', $id) ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelongbid_id', 'tangguhlelong.norujukan', @@ -691,6 +693,7 @@ class MarhunController extends Controller 'lelong.sts_lelong' ) ->get(); + // dd($tangguhlelong); foreach($tangguhlelong as $index1=>$tanguhlel) { @@ -702,7 +705,7 @@ class MarhunController extends Controller $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; } - return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name')); } public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) @@ -710,6 +713,7 @@ class MarhunController extends Controller $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') ->where('gadaimarhun.norujukan', $norujukan) ->where('tangguhlelong.id', $tangguhlelong_id) + ->where('tangguhlelong.lelong_id', $id) ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelong_id', 'tangguhlelong.lelongbid_id', @@ -718,7 +722,6 @@ class MarhunController extends Controller 'tangguhlelong.tarikhtangguh', 'tangguhlelong.nota as tangguh_nota', 'tangguhlelong.pinjaman', - 'gadaimarhun.id as gadaimarhun_id', 'gadaimarhun.bil', 'gadaimarhun.marhun', 'gadaimarhun.nota as gadai_nota', @@ -728,8 +731,14 @@ class MarhunController extends Controller 'gadaimarhun.n_marhun' ) ->get(); - - return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan')); + + $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code') + ->where('gadaimarhun.norujukan', $norujukan) + ->select('cawangan.caw_name') + ->first(); + // dd($caw_names); + + return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names')); } diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php index 47b5d0d3..320f4030 100644 --- a/resources/views/pengesahan/lelbidmarhun.blade.php +++ b/resources/views/pengesahan/lelbidmarhun.blade.php @@ -50,7 +50,7 @@
    - Kembali + Kembali
    diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php index 6a438109..ceae1024 100644 --- a/resources/views/pengesahan/senarailelong.blade.php +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -38,7 +38,7 @@ {{$lel['detail']['jbg']}} {{$lel['detail']['cajlelong']}} - + @endforeach diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php index 78c5f1e4..9e8d3f0c 100644 --- a/resources/views/pengesahan/senaraitangguhlelong.blade.php +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -10,16 +10,25 @@

    {{ $message }}

    @endif + +
    +
    +
    +

    Tarikh Lelong : {{ $tangguhlelong[0]['tarikh_lelong'] }}

    +

    Nama Cawangan : {{ $caw_name }}

    +

    JBG : {{ $tangguhlelong[0]['jbg'] }}

    +
    +
    +
    - - + @@ -27,10 +36,9 @@ @foreach ($tangguhlelong as $tangguhlel) - - + @@ -69,26 +77,26 @@ "lengthChange": false, "pageLength": 15, dom: 'Bfrtip', - buttons: [ - // 'copy', 'excel', 'pdf' - // { text: 'copy', className: 'btn btn-primary' }, - { - className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', - text: '', - titleAttr: 'Tambah Simulasi', - action: function ( e, dt, node, config ) { - alert( 'Button activated' ); - } - }, - { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - titleAttr: 'Export to CSV', - text: '', - action: function ( e, dt, node, config ) { - $("#exportform").submit(); - } - } - ] + // buttons: [ + // // 'copy', 'excel', 'pdf' + // // { text: 'copy', className: 'btn btn-primary' }, + // { + // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', + // text: '', + // titleAttr: 'Tambah Simulasi', + // action: function ( e, dt, node, config ) { + // alert( 'Button activated' ); + // } + // }, + // { + // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + // titleAttr: 'Export to CSV', + // text: '', + // action: function ( e, dt, node, config ) { + // $("#exportform").submit(); + // } + // } + // ] }); $('.addsim').tooltip(); diff --git a/routes/web.php b/routes/web.php index f98d311d..31f8c5f3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -193,7 +193,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); 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('/senaraitangguhlelong/{id}/{caw_name}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); Route::get('/senarailelongtangguh',['as'=>'pengesahan.senarailelongtangguh','uses'=>'TangguhLelongController@senarailelongtangguh']); Route::get('/senaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.senaraisahtangguh','uses'=>'TangguhLelongController@senaraisahtangguh']); From 221e31a180c2718a3e1950e4fa2fbd2b7ce47bc5 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Mon, 9 May 2022 15:28:12 +0800 Subject: [PATCH 06/13] final update tangguh lelong pc & operasi --- .../Controllers/TangguhLelongController.php | 69 ++++++++++++------- .../views/tangguhlelong/carian.blade.php | 8 ++- .../views/tangguhlelong/searchbyic.blade.php | 16 ++++- .../views/tangguhlelong/sensahpc.blade.php | 4 +- 4 files changed, 67 insertions(+), 30 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 76431cac..6e9cc4f1 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -61,42 +61,52 @@ class TangguhLelongController extends Controller if($request->nokp == null) { - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Masukkan No Kad Pengenalan'); + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Sila Masukkan No Kad Pengenalan'); } else if($request->nokp != null) { $lelong = Lelong::where('id', $request->lelong_id)->first(); - - $getic = Customer::join('gadai', 'customer.nopelanggan', '=', 'gadai.nopelanggan') - ->where('customer.kpbaru', $request->nokp) - ->where('gadai.tempoh', $lelong->jbg) + + $getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp') + ->where('customer.kpbaru', '=', $request->nokp) + ->where('gadai.tempoh', '=', $lelong->jbg) ->get(); - + foreach($getic as $index1=>$ic) { $getnorujukan = LelongBid::where('norujukan', $ic->norujukan) ->where('jbg', $ic->tempoh) ->get(); - + foreach($getnorujukan as $norujukan) { $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id) ->where('lelongbid_id', $norujukan->lelongbid_id) ->where('norujukan', $norujukan->norujukan) - ->get()->toArray(); - + ->first(); + + $adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan') + ->where('pengesahan.norujukan', $norujukan->norujukan) + ->where('pengesahan.status_ubah', 6) + ->where('pengesahan.lelong_id', $request->lelong_id) + ->get(); + if($pengesahan) { - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Telah Dibuat'); + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Pengesahan Tangguh Lelong Telah Dibuat'); + } + else + { + // } } - + $getic[$index1]['user_details'] = $getnorujukan; - // dd($getic[$index1]['user_details']); + $getic[$index1]['sdhadapengesahan'] = $adapengesahan; } $lelong_id = $request->lelong_id; - return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id' )); + return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id')); } @@ -165,6 +175,16 @@ class TangguhLelongController extends Controller $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'); @@ -204,9 +224,11 @@ class TangguhLelongController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $pengesahan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) - ->whereNull('disahkan_oleh') - ->whereNull('disahkan_pada') + $pengesahan = Pengesahan::join('tangguhlelong', 'pengesahan.norujukan', '=', 'tangguhlelong.norujukan') + ->where('pengesahan.lelong_id', $lelong_id) + ->whereNull('pengesahan.disahkan_oleh') + ->whereNull('pengesahan.disahkan_pada') + ->whereNull('tangguhlelong.tarikhtangguh') ->get(); foreach($pengesahan as $index1=>$sah) @@ -215,9 +237,10 @@ class TangguhLelongController extends Controller ->where('norujukan', $sah->norujukan) ->where('kodcaw', $caw_code) ->get(); - // dd($lelongbid[0]['jbg']); $pengesahan[$index1]['bid_details'] = $lelongbid; + $pengesahan[$index1]['nota'] = $sah->nota; + } return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code')); @@ -285,15 +308,11 @@ class TangguhLelongController extends Controller $pengesahan->disahkan_pada = $currentdate; $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 = TangguhLelong::where('lelong_id', $request->lelong_id) + ->where('lelongbid_id', $bidmarhun) + ->where('norujukan', $lelongbidmarhun[0]['norujukan']) + ->first(); $tangguhlelong->tarikhtangguh = $currentdate; - $tangguhlelong->ditangguh_oleh = $user->id; - $tangguhlelong->ditangguh_pada = $currentdate; - $tangguhlelong->nota = 'Tangguh Lelong PC'; $tangguhlelong->save(); $biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php index 810867d2..c286abd4 100644 --- a/resources/views/tangguhlelong/carian.blade.php +++ b/resources/views/tangguhlelong/carian.blade.php @@ -8,6 +8,10 @@

    {{ $message }}

    + @elseif ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    @endif

    Sila Masukkan No Kad Pengenalan

    @@ -23,14 +27,14 @@
    Kembali - +
    @endsection From 5e2e73789b21420dc818689481e49cbeb806671a Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Wed, 11 May 2022 10:33:31 +0800 Subject: [PATCH 09/13] final update sah ubah mutu marhun operasi --- app/Http/Controllers/MarhunController.php | 55 +++++++++---------- .../pengesahan/perubahanmutumarhun.blade.php | 2 +- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index bdb0cd69..d953a7ca 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -394,26 +394,25 @@ class MarhunController extends Controller return view('pengesahan.senarailelongubahmutu',compact('lelong')); } - public function sahubahmutu($id) - { - $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') - ->where('lelong.id', $id) - ->whereNull('disahkan_oleh') - ->where('pengesahan.status_ubah', [1,2,3,4,5]) + public function sahubahmutu($id){ + + $mutumarhun = Pengesahan::whereNull('disahkan_oleh') + ->whereNull('disahkan_pada') + ->where('lelong_id', $id) + ->whereIn('status_ubah', [1,2,3,4,5]) ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') - ->groupBy('pengesahan.norujukan') + ->groupBy('norujukan') ->get()->toArray(); - + foreach($mutumarhun as $index1=>$mutu) { - $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', 'cawangan.id') - ->join('lelongbid', 'cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id') + $cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id') ->where('lelongbid.lelong_id', $id) ->where('lelongbid.norujukan', $mutu['norujukan']) ->select('cawangan.caw_name') ->first(); - // dd($cawangan); - $mutumarhun[$index1]['cawangan_name'] = $cawangan; + + $mutumarhun[$index1]['cawangan_name'] = $cawangan['caw_name']; } // foreach($mutumarhun as $index1=>$marhun) @@ -529,7 +528,7 @@ class MarhunController extends Controller $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(); @@ -539,7 +538,6 @@ class MarhunController extends Controller ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) ->where('pengesahan.id', $pengesahan->id) ->get(); - dd($lelongbidmarhuns['marhun']); foreach($lelongbidmarhuns as $bidmarhuns) { @@ -551,29 +549,32 @@ class MarhunController extends Controller { // } + $txtmarhun = ",1 " . $bidmarhuns->marhun ; } - $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + $pengesahans = 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(); + // $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + // ->where('lelongbid_id','=',$pengesahan->lelongbid_id) + // ->get(); + + $lelongbids = LelongBid::where('id', $lelongbid[0]['id'])->first(); + $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun); + $lelongbids->berat = $lelongbids->berat; + $lelongbids->hargaasas = $lelongbids->hargaasas; + $lelongbids->save(); // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); } else if($request->jenis_button == "tangguhlelong") { + $pengesahan = Pengesahan::where('norujukan', $request->norujukan) + ->get(); + dd($pengesahan) ; //add into table tangguhlelong $tangguhlelong = new TangguhLelong; $tangguhlelong->lelong_id = $pengesahan->lelong_id; @@ -676,8 +677,7 @@ class MarhunController extends Controller { $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id') ->where('tangguhlelong.lelong_id', $id) - // ->join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') - // ->where('tangguhlelong.lelong_id', $id) + ->whereNotNull('tangguhlelong.tarikhtangguh') ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelongbid_id', 'tangguhlelong.norujukan', @@ -743,4 +743,3 @@ class MarhunController extends Controller } } - \ No newline at end of file diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index 11e7a47b..bae9058d 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -24,7 +24,7 @@ @foreach($mutumarhun as $marhun)     - + + @@ -29,9 +30,10 @@ - + - + @@ -72,7 +72,7 @@ @csrf - +
    @@ -164,11 +164,6 @@
    - - - - -
    @@ -185,7 +180,7 @@ $("#btnterima").prop("disabled", true); $("#btnbanktransfer").prop("disabled", true); function terimadeno() { - $('#eachbid').val(arraylelongbid); + $("input[name='eachbid[]']").val(arraylelongbid); $("#formpaymentdenokaunter").submit(); } function funcbatal(){ @@ -213,9 +208,9 @@ btnClass: 'btn-info', action: function () { $('#eachbid').val(arraylelongbid); - $("#formbanktransfer").submit(); var total_sum = parseFloat($('#total').val()); $('#total').val(parseFloat(total_sum).toFixed(2)); + $("#formbanktransfer").submit(); } } } @@ -225,7 +220,7 @@ console.log(arraylelongbid.length); let bid_id = $(e).data('bid_id'); - // console.log(bid_id); + console.log(bid_id); if(e.checked==true) //checkbox { arraylelongbid.push(bid_id); diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php index 08119024..c51650ac 100644 --- a/resources/views/pembida/pembayaranbidaan.blade.php +++ b/resources/views/pembida/pembayaranbidaan.blade.php @@ -26,7 +26,7 @@
    - @foreach($listwinner as $winner) + @foreach($listwinner as $index1=>$winner) @@ -35,20 +35,22 @@ - + @endforeach
    BilNama CawanganTarikh Lelong Tarikh Tangguh No RujukanRemark Action
    {{ $loop->iteration }}{{ $tangguhlel['nama_caw']['caw_name'] }}{{ $tangguhlel->tarikh_lelong }} {{ $tangguhlel->tarikhtangguh }} {{ $tangguhlel->norujukan }}{{ $tangguhlel->nota }}
    {{ $marhun['cawangan_name']['caw_name'] }}{{ $marhun['cawangan_name'] }} {{ $marhun['norujukan'] }} @if($marhun['total'] === intval($marhun['tstat'])) From b10ac827e222801758d9938baff25539b3251aba Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 11 May 2022 10:42:14 +0800 Subject: [PATCH 10/13] update db migration field fasa --- .../migrations/2021_12_14_041545_create_simulasis_table.php | 1 + database/migrations/2021_12_14_041557_create_lelongs_table.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php index 4cfb3ab8..c0323d01 100644 --- a/database/migrations/2021_12_14_041545_create_simulasis_table.php +++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php @@ -73,6 +73,7 @@ class CreateSimulasisTable extends Migration $table->integer('status_jual'); $table->integer('status_payment'); $table->integer('mora_upah'); + $table->integer('fasa')->default(0); $table->timestamps(); $table->foreign('caw_id') diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 49dc7eb7..ce60c677 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -24,6 +24,7 @@ class CreateLelongsTable extends Migration $table->string('jbg'); $table->integer('cajlelong'); $table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang + $table->integer('fasa')->default(0); $table->timestamps(); }); @@ -78,6 +79,7 @@ class CreateLelongsTable extends Migration $table->integer('status_semak')->default(0); $table->datetime('diserahkan_pada')->nullable(); $table->string('mora_upah'); + $table->integer('fasa')->default(0); $table->timestamps(); $table->foreign('caw_id') From 396d2fa0ae8b2d5ec9e8d5334add3bbc54fa83e3 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Wed, 11 May 2022 10:55:33 +0800 Subject: [PATCH 11/13] update --- resources/views/simulasi/senaraisimulasi.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 3a388d9f..02211990 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -82,7 +82,7 @@ "orderable": false }, { - "targets": 5, + "targets": 4, "orderable": false } ], From 79d00ab131603e95839c20832a8e9d725bda6856 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 17 May 2022 11:44:59 +0800 Subject: [PATCH 12/13] update notistamatkontrak --- app/Http/Controllers/PenggunaController.php | 4 +- app/Http/Controllers/SimulasiController.php | 7 +- app/Http/Controllers/TamatKontController.php | 173 +++++++++++++++++- ...21_12_14_041545_create_simulasis_table.php | 1 + .../views/jananotis/senaraitemp.blade.php | 35 ++-- resources/views/jananotis/tempbycaw.blade.php | 2 +- .../views/simulasi/senaraisimulasi.blade.php | 6 +- routes/web.php | 1 + 8 files changed, 207 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index ad9ec588..d5d468e3 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -33,8 +33,8 @@ class PenggunaController extends Controller public function index() { // $alluser = User::all(); - $alluser = User::with('roles')->get(); - $allroles = Role::all()->pluck('name'); + $alluser = User::with('roles')->orderBy('id')->get(); + $allroles = Role::all(); $caw = Cawangan::all(); $user = User::with('roles')->first(); $userroles = $user->getRoleNames()->toArray(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 3c9b092b..c80df8ea 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -112,10 +112,11 @@ class SimulasiController extends Controller $simkarat->save(); } - + //$fasa = $request->fasa; // join cawangan yang terlibat dengan simulasi if($request->caw && $request->caw == 'all') { + //dd($request->fasa); foreach($cawangan as $key=>$caw) { @@ -124,6 +125,7 @@ class SimulasiController extends Controller $caw_simulasi->caw_id = $caw->id; $caw_simulasi->online = 'Online'; $caw_simulasi->lokasi = $caw->lokasi; + $caw_simulasi->fasa = $request->fasa; $caw_simulasi->save(); $suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all(); @@ -211,6 +213,7 @@ class SimulasiController extends Controller $caw_simulasi->caw_id = $cawsimulasi->id; $caw_simulasi->online = 'Online'; $caw_simulasi->lokasi = $cawsimulasi->lokasi; + $caw_simulasi->fasa = $request->fasa; $caw_simulasi->save(); // dd($caw_simulasi); @@ -304,7 +307,7 @@ class SimulasiController extends Controller $arrayinfo = []; $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id') - ->select('simulasi_id','tarikh_lelong') + ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa') ->groupBy('simulasi_id') ->get() ->toArray(); diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php index b79e75c9..f7fdcd70 100644 --- a/app/Http/Controllers/TamatKontController.php +++ b/app/Http/Controllers/TamatKontController.php @@ -5,12 +5,28 @@ namespace App\Http\Controllers; use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Carbon\Carbon; +use Spatie\Permission\Models\Role; +use Spatie\Permission\Models\Permission; use App\Models\User; use App\Models\Gadai; use App\Models\GadaiMarhun; use App\Models\Cawangan; use App\Models\TransaksiKeuntungan; +use PDF; +use App\Models\Simulasi; +use App\Models\SimulasiBid; +use App\Models\SimulasiBidMarhun; +use App\Models\SimKarat; +use App\Models\SimKarat_temp; +use App\Models\CawanganSimulasi; +use App\Models\JenisEmas; +use App\Models\JenisKarat; +use App\Models\Lelong; +use App\Models\CawanganLelong; +use App\Models\LelongBid; +use App\Models\LelongBidMarhun; +use App\Models\LelKarat; use DateTime; @@ -140,9 +156,11 @@ class TamatKontController extends Controller ->where('tagpalsu', '=', 0) ->where('tagpalsu2', '=', 0) ->whereNotNull('upah12') + ->where('t_matang1', '<', $t_lelong) ->orderBy('t_gadai') - ->select('t_gadai') - ->first(); + ->select('t_gadai', 'norujukan') + ->first(); + //dd($t_gadais); // $t_gadais = $request->t_gadai; // $t_gadaisehingga = Carbon::parse($t_gadais); // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); @@ -235,6 +253,157 @@ class TamatKontController extends Controller 't_lelongdisplay' )); } + public function janadatatamatkontrak(Request $request) + { + //dd($request->all()); + $t_lelong = Carbon::parse($request->trkh_lelong); + $bulan = (int)round('12.00'); + $fasa = '2'; + $jbg = '12'; + $cajlelong = '3'; + //dd($t_lelong); + $t_gadai = $request->t_gadai; + //dd($t_gadai); + if($fasa == '2'){ + $surat = Gadai::where('t_matang1','<',$t_lelong) + ->where('sttebus','=','') + ->where('tagpalsu','=',0) + ->where('tagpalsu2','=',0) + ->where('taglel','=',0) + ->get(); + + } + //dd($surat); + // dd($jbg); + if(sizeof($surat) == 0) + { + return redirect()->route('analisa.janasimulasi') + ->with('failed','Tiada surat untuk di lelong'); + } + $cawangan = Cawangan::all(); + //create simulasi + $simulasi = new Simulasi; + $simulasi->tarikh_lelong = $request->trkh_lelong; + $simulasi->harga_emas_asas = "0.00"; + $simulasi->jbg = $jbg; + $simulasi->cajlelong = $cajlelong; + $simulasi->fasa = $fasa; + $simulasi->save(); + + //create harga asas berdasarkan input harga asas + $karat = JenisKarat::all(); + $hargaasas = $request->hargaasas; //rial + foreach($karat as $item) + { + $simkarat = new SimKarat; + $simkarat->simulasi_id = $simulasi->id; + $simkarat->karat = $item->karat; + $simkarat->keterangan = $item->keterangan; + $simkarat->harga = ($hargaasas + ($item->dariharga916)); //gram + $simkarat->harga2 = $hargaasas + ($item->dariharga916); //rial + $simkarat->save(); + } + + //$fasa = $request->fasa; + // join cawangan yang terlibat dengan simulasi + if($request->caw && $request->caw != 'all') + { + // dd($request->kodcaw); + $caw = Cawangan::whereIn('caw_code',$request->caw)->get(); + // dd($caw); + foreach($caw as $index=>$cawsimulasi){ + // dd($cawsimulasi->id); + $caw_simulasi = new CawanganSimulasi; + $caw_simulasi->simulasi_id = $simulasi->id; + $caw_simulasi->caw_id = $cawsimulasi->id; + $caw_simulasi->online = 'Online'; + $caw_simulasi->lokasi = $cawsimulasi->lokasi; + $caw_simulasi->fasa = $request->fasa; + $caw_simulasi->save(); + // dd($caw_simulasi); + + $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all(); + + // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get(); + foreach($suratcaw as $data) + { + $simulasibid = new SimulasiBid; + $simulasibid->simulasi_id = $simulasi->id; + $simulasibid->caw_id = $cawsimulasi->id; + $simulasibid->kodcaw = $data->kodcaw; + $simulasibid->norujukan = $data->norujukan; + $simulasibid->t_lelong = $request->trkh_lelong; + $simulasibid->hargaasas = 0.00; + $simulasibid->hargajual = 0.00; + $simulasibid->jbg = $data->jbg; + $simulasibid->kadarupah = $data->kadarupah; + $simulasibid->upahsimpan = $data->upahSim; + $simulasibid->ansuran = $data->ansuran; + $simulasibid->nilaimarhun = $data->nilaimarhun; + $simulasibid->pinjaman = $data->pinjaman; + $simulasibid->bakiupah = $data->bakiupah; + $simulasibid->cajlain = $data->cajlain; + $simulasibid->cajlelong = 0.00; + $simulasibid->baki = 0.00; + $simulasibid->berat = $data->berat; + $simulasibid->marhun = $data->marhun; + $simulasibid->percent = $data->percentpinj; + $simulasibid->status_jual = 0; + $simulasibid->status_payment = 0; + $simulasibid->mora_upah = 0; + $simulasibid->save(); + + $sumhargaasas = 0; + $berat = 0; + $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get(); + foreach($gadaimarhun as $marhun) + { + $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get(); + // dd($simkarat); + foreach($simkarat as $karat) + { + + if($karat->karat == $marhun->karat) + { + $val = round($marhun->berat * $karat->harga); + $sumhargaasas = $sumhargaasas + $val; + $berat = $berat + $marhun->berat; + + $simmarhun = new SimulasiBidMarhun; + $simmarhun->simulasibid_id = $simulasibid->id; + $simmarhun->bil = $marhun->bil; + $simmarhun->marhun = $marhun->marhun; + $simmarhun->nota = $marhun->nota; + $simmarhun->karat = $marhun->karat; + $simmarhun->berat = $marhun->berat; + $simmarhun->harga = $karat->harga; + $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->hargaasas = $val; + $simmarhun->save(); + } + } + + + } + + + $calcaj = ($request->cajlelong/100)*$sumhargaasas; + $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + $updatesimbid->hargaasas = $sumhargaasas; + $updatesimbid->cajlelong = $calcaj; + $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + $updatesimbid->berat = $berat; + $updatesimbid->save(); + } + } + } + else + { + dd('error'); + } + + return redirect()->route('analisa.show',$simulasi->id); + } // public function janasimulasi($t_lelong, ) } diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php index c0323d01..6274d135 100644 --- a/database/migrations/2021_12_14_041545_create_simulasis_table.php +++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php @@ -35,6 +35,7 @@ class CreateSimulasisTable extends Migration $table->date('export_data_stsdate')->nullable(); $table->date('import_data_sts_date')->nullable(); $table->string('lokasi')->nullable(); + $table->integer('fasa')->default(0); $table->timestamps(); $table->foreign('caw_id') diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php index 19800d73..f6f5802e 100644 --- a/resources/views/jananotis/senaraitemp.blade.php +++ b/resources/views/jananotis/senaraitemp.blade.php @@ -10,31 +10,38 @@ @endif

    Butiran Gadaian Mengikut Cawangan

    - +
    + @csrf +

    Tarikh Lelong : {{ $t_lelongdisplay }}

    Tarikh Gadai Sehingga : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai ); - $datez = $myDateTime->format('d-m-Y'); - echo($datez); + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); + $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y'); + $t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d'); + echo($tarikhlelong); @endphp

    Tarikh Perlu Blast Notis SMS(30 Hari) : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); - $datez1 = $myDateTime->modify('-1 month')->format('d-m-Y'); - echo($datez1); + $trkh_lelong = $myDateTime->format('Y-m-d'); + $tblastnotis = $myDateTime->modify('-1 month')->format('d-m-Y'); + echo($tblastnotis); @endphp

    Tarikh Perlu Daftar Batch Lelong(20 Hari) : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); - $datez1 = $myDateTime->modify('-20 days')->format('d-m-Y'); - echo($datez1); + $tdaftarbatch = $myDateTime->modify('-20 days')->format('d-m-Y'); + echo($tdaftarbatch); @endphp

    + + +
    -
    - + +
    @@ -51,7 +58,7 @@ @foreach($senarai as $send) - + @@ -66,10 +73,12 @@ @endforeach
    {{ $send['kodcaw'] }} {{ $send['caw_name'] }} {{ $send['bil_lelong'] }}
    +
    Kembali - Jana Simulasi -
    + + +
    diff --git a/resources/views/jananotis/tempbycaw.blade.php b/resources/views/jananotis/tempbycaw.blade.php index e73c41ba..167f2cbb 100644 --- a/resources/views/jananotis/tempbycaw.blade.php +++ b/resources/views/jananotis/tempbycaw.blade.php @@ -19,7 +19,7 @@

    Tarikh Lelong : {{ $t_lelongdisplay }}

    Tarikh Gadai Sehingga : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai ); + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); $datez = $myDateTime->format('d-m-Y'); echo($datez); @endphp

    diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 02211990..174a0e6d 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -18,6 +18,7 @@
    		No Lelong ID Tarikh LelongFasa Cawangan Action
    {{$loop->iteration}} {{$info['info']['simulasi_id']}} {{$info['info']['tarikh_lelong']}} + {{$info['info']['fasa']}} @foreach($info['detailsinfo'] as $info2) - {{$info2['caw_name']}}
    + {{$info2['caw_name']}}
    @endforeach     		diff --git a/routes/web.php b/routes/web.php index 31f8c5f3..0f07ced7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -204,6 +204,7 @@ Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notist Route::get('/sebelumtamatkont',['as'=>'notistamatkontrak.sebelumtamatkont','uses'=>'TamatKontController@sebelumtamatkont']); Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']); + Route::post('/janadatatamatkontrak',['as'=>'notistamatkontrak.janadatatamatkontrak','uses'=>'TamatKontController@janadatatamatkontrak']); }); Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], function () { From f047fbf0f7193b89b868575a46cf9a0028a9a64c Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Tue, 17 May 2022 12:15:30 +0800 Subject: [PATCH 13/13] pembayaran details --- app/Http/Controllers/LelongController.php | 2 + app/Http/Controllers/PaymentController.php | 85 ++++++++++++------- app/Http/Controllers/PembidaController.php | 32 +++---- ...21_12_14_041545_create_simulasis_table.php | 1 + ...01_23_042652_create_lelongbidder_table.php | 2 +- .../views/pembayaran/SAGBidItem.blade.php | 15 ++-- .../views/pembida/pembayaranbidaan.blade.php | 14 +-- 7 files changed, 86 insertions(+), 65 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0241fa70..77c9cfbc 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -791,9 +791,11 @@ class LelongController extends Controller public function senaraisagpemenang($user_id, $lelong_id){ + // dd($user_id); $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) ->get(); return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id')); diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index acb14560..d812c534 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -24,11 +24,9 @@ class PaymentController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) - ->where('sts_lelong', 3) + ->where('lelong.sts_lelong', 3) ->get(); - // dd($senarai); - return view('pembayaran.senarailelongbayaran',compact('senarai')); } @@ -120,6 +118,7 @@ class PaymentController extends Controller } public function paymentdenokaunter(Request $request){ + // dd($request->all()); $currentdate = Carbon::now(); @@ -127,8 +126,9 @@ class PaymentController extends Controller $user = Auth::user(); - $bid_id = explode(",", $request->eachbid); - dd($bid_id); + // $bid_id = implode(",", $request->eachbid); + $bid_id = $request->eachbid; + // dd($bid_id); $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) @@ -159,24 +159,24 @@ class PaymentController extends Controller 'disahkan_oleh' => $user->id, 'disahkan_pada' => $currentdate ]); - foreach($bid_id as $bid){ + foreach($bid_id as $bid) + { $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.lelongbid_id', $bid) ->select('lelongbidder.hargabida', - 'lelongbid.hargaasas', - 'lelongbid.norujukan', - 'lelongbidder.lelongbid_id', - 'lelongbidder.id as lelongbidder_id', - 'lelongbid.lelong_id as lelong_id' - ) + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.id as lelongbidder_id', + 'lelongbid.lelong_id as lelong_id' + ) ->first(); $total_hargabida = $total_hargabida + $eachbid->hargabida; // dd($total_hargabida); - $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) ->where('user_id',$request->user_id) ->first(); @@ -192,14 +192,15 @@ class PaymentController extends Controller $eachbidupdate->save(); } + $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) ->get(); - // dd(floatval($request->amaunkiraan)); - if(floatval($request->amaunkiraan) == $total_hargabida){ - // dd('hye'); + + if(floatval($request->amaunkiraan) == $total_hargabida) + { $resit->total_payment = $resit->total_payment + $total_hargabida; if($resit->total_payment >= $senaraisagallpayment->sum('hargabida')) { @@ -208,11 +209,14 @@ class PaymentController extends Controller } $resit->save(); } + return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya'); } public function pengesahanPembayaran(Request $request){ + // dd($request->all()); + $pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) @@ -223,21 +227,21 @@ class PaymentController extends Controller public function banktransfer(Request $request) { - dd($request->all()); + // dd($request->all()); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); $user = Auth::user(); - // dd($user); - // dd($request->checkboxdata); - $totalcheck = implode(",", $request->checkboxdata); + + // $totalcheck = implode(",", $request->checkboxdata); + $bid_id = explode(",", $request->eachbid); //bid_id = lelongbid_id $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) ->where('resit_type', 2) ->first(); - + $payment = new Payment; $payment->user_id = $request->user_id; $payment->lelong_id = $request->lelong_id; @@ -246,21 +250,44 @@ class PaymentController extends Controller $payment->status = 2; $payment->remark = 'BAYARAN CDM'; $payment->resit_id = $resit->id; - $payment->total_payment = sum($totalcheck->valueOf()); + $payment->total_payment = $request->total; $payment->diminta_pada = $currentdate; $payment->diminta_oleh = $user->id; $payment->save(); - $sts_payment = LelongBidder::where('user_id', $request->user_id) - ->where('lelongbid_id', $request->eachbid) + foreach($bid_id as $bid){ + + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.lelongbid_id', $bid) + ->select('lelongbidder.hargabida', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.id as lelongbidder_id', + 'lelongbid.lelong_id as lelong_id' + ) ->first(); - - $sts_payment->payment_id = $payment->id; - $sts_payment->status_payment = 2; //Menunggu pengesahan account - $sts_payment->update(); + + $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) + ->where('user_id',$request->user_id) + ->first(); + $updatelelbidbidder->status_payment = 1; + $updatelelbidbidder->payment_id = $payment->id; + $updatelelbidbidder->save(); + + $eachbidupdate = LelongBid::where('id',$bid)->first(); + $eachbidupdate->status_jual = 1; + $eachbidupdate->status_payment = 2; + $eachbidupdate->t_jual = $currentdate; + $eachbidupdate->hargajual = $eachbid->hargabida; + $eachbidupdate->save(); + + } + return redirect()->route('pembayaran.SenaraiLelongBayar') - ->with('success','Menunggu Pengesahan Account'); + ->with('success','Menunggu Pengesahan Account'); } } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index ccbb0934..230d6872 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -194,29 +194,22 @@ class PembidaController extends Controller ->groupBy('lelongbidder.user_id') ->get()->toArray(); - foreach($listwinner as $index1=>$winner){ - + foreach($listwinner as $index1=>$winner) + { $userdetails = User::where('id', $winner['user_id'])->first(); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $request->lelong_id) ->get(); + // dd($SAGWin); - $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->where('user_id', $winner['user_id']) - ->where('lelongbidder.status_bidder', 1) - ->where('lelongbid.lelong_id', $request->lelong_id) - ->select('lelongbidder.status_payment') - ->get(); + foreach($SAGWin as $index2=>$sag) + { - $detailspayment = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id') - ->where('payment.kodcaw', $request->kodcaw) - ->where('payment.lelong_id', $request->lelong_id) - ->whereNotNull('payment.disahkan_pada') - ->where('lelongbidder.status_bidder', 1) - ->where('lelongbidder.status_payment', 1) - ->get(); + $detailspayment = Payment::where('id', $sag->payment_id)->first(); + // dd($detailspayment); + } $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('user_id', $winner['user_id']) @@ -225,7 +218,8 @@ class PembidaController extends Controller ->select('payment_id')->groupBy('payment_id')->get(); $total_payment = 0; - foreach($payment_id as $id){ + foreach($payment_id as $id) + { $payment = Payment::where('id', $id->payment_id) ->first(); @@ -238,9 +232,9 @@ class PembidaController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; - $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; - $listwinner[$index1]['status'] = $detailspayment[0]['status']; - $listwinner[$index1]['remark'] = $detailspayment[0]['remark']; + $listwinner[$index1][$index2]['remarks'] = $detailspayment['remark']; + $listwinner[$index1][$index2]['status_payment'] = $sag->status_payment; + $listwinner[$index1][$index2]['status'] = $detailspayment['status']; } diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php index c0323d01..7686beb7 100644 --- a/database/migrations/2021_12_14_041545_create_simulasis_table.php +++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php @@ -22,6 +22,7 @@ class CreateSimulasisTable extends Migration $table->string('harga_emas_asas')->nullable(); $table->string('jbg')->nullable(); $table->integer('cajlelong')->nullable(); + $table->integer('fasa')->default(0); $table->timestamps(); }); diff --git a/database/migrations/2022_01_23_042652_create_lelongbidder_table.php b/database/migrations/2022_01_23_042652_create_lelongbidder_table.php index d67351f4..e82f8f53 100644 --- a/database/migrations/2022_01_23_042652_create_lelongbidder_table.php +++ b/database/migrations/2022_01_23_042652_create_lelongbidder_table.php @@ -24,7 +24,7 @@ class CreateLelongbidderTable extends Migration $table->decimal('cajlelong'); $table->integer('status_bidder')->nullable(); //1 = win $table->integer('payment_id')->nullable(); - $table->integer('status_payment')->nullable(); // 1=paid + $table->integer('status_payment')->nullable(); // 1=paid, 2=memerlukan pengesahan operasi (CDM) $table->datetime('masa_bidaan'); $table->timestamps(); diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 6831b28f..0731fa08 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -51,7 +51,7 @@ @endforeach
    Jumlah BayaranRMRM
    {{ $loop->iteration }} {{ $winner['details']['name'] }}{{ $winner['totalBid'] }} {{ $winner['totalPay'] }} - @if($winner['status'] == 1) + @if($winner[$index1]['status'] == 1) - @elseif($winner['status'] == 2) + @elseif($winner[$index1]['status'] == 2) @endif - @if($winner['sts_payment'] == 1) + + + @if($winner[$index1]['status_payment'] == 1) - @else @endif +