From bfde18365ef0e1405ac6f66ebcd54531420f8982 Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Mon, 21 Nov 2022 15:48:47 +0800 Subject: [PATCH] update tangguhlelong 1) tambah button ulang cetak 2) pembetulan notifikasi jika tidak sah --- app/Http/Controllers/LelongController.php | 1 + app/Http/Controllers/SimulasiController.php | 1 + .../Controllers/TangguhLelongController.php | 84 ++++++++++++++++++- app/Models/Gadai.php | 1 + resources/views/lelong/showlelong.blade.php | 13 +-- .../pengurusandatabase/senaraidb.blade.php | 2 +- .../views/pengurusandatabase/show.blade.php | 2 +- .../views/simulasi/showsimulasi.blade.php | 10 +-- .../tangguhlelong/senactionoperasi.blade.php | 13 ++- .../senaraimohontangguh.blade.php | 6 +- routes/web.php | 1 + 11 files changed, 113 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1481df6a..c8983009 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -807,6 +807,7 @@ class LelongController extends Controller $karat->keterangan = $karat->keterangan; // $karat->harga = $request->harga[$index]; $karat->harga2 = $request->harga2[$index]; + $karat->updated_at = $currentdate; $karat->save(); } diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 929163b1..5dfdd098 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -1120,6 +1120,7 @@ class SimulasiController extends Controller $karat->karat = $karat->karat; $karat->keterangan = $karat->keterangan; $karat->harga2 = $request->harga2[$index]; + $karat->updated_at = $currentdate; $karat->save(); } diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 3e417b83..1201e60c 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -635,7 +635,79 @@ class TangguhLelongController extends Controller return $pdf->download('Borang Tangguh Lelong '.$lelong_id.'.pdf'); - } + } + + public function ulangdownloadmohon($lelongbid_id) + { + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $current = new Carbon(); + $t_mohon = $current->toDateString(); + + $selectedbid_id = $lelongbid_id; + //dd($selectedbid_id); + // $nokp = $request->nokp; + // $lelong_id = $request->lelong_id; + + + $lelongbid = LelongBid::where('lelongbid.id', $selectedbid_id) + ->get(); + + + foreach($lelongbid as $bidmarhun) + { + + $cust = Gadai::on($bidmarhun->kodcaw)->where('norujukan',$bidmarhun->norujukan) + ->first(); + //dd($cust['nokp']); + //to get nokp + + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id',$bidmarhun->id) + ->get(); + + $percents = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2); + + $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id) + ->first(); + + $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw) + ->first(); + + $customer = Customer::where('kpbaru','=',$cust['nokp']) + ->orWhere('kplama','=',$cust->nokp) + ->join('poskod','customer.poskod','=','poskod.poskod') + ->join('daerah','poskod.koddaerah','=','daerah.koddaerah') + ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri') + ->first(); + + $lelongbid['nama'] = ($customer) ? $customer : dd($cust['nokp']); + + } + + //get staf cwgn roles harian + $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'penilai' + ])->json(); + + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'khazanah' + ])->json(); + + $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'pc' + ])->json(); + + // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc); + + + // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')); + $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Borang Tangguh Lelong '.$selectedbid_id.'.pdf'); + } public function sentangguh() { @@ -813,15 +885,19 @@ class TangguhLelongController extends Controller $lelongbid = LelongBid::where('lelongbid.id', $request->lelongbidid_mdl) ->delete(); - + return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) + ->with('success', 'Tangguh Lelong Telah Di Lulus.'); + }else{ $tangguhlelong->status = 99; $tangguhlelong->update(); + + return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) + ->with('success', 'Tangguh Lelong Tidak Di Lulus.'); } - return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) - ->with('success', 'Tangguh Lelong Telah Di Sahkan.'); + } public function senaraitlhtangguh() diff --git a/app/Models/Gadai.php b/app/Models/Gadai.php index 7f4addc0..7387d9d3 100644 --- a/app/Models/Gadai.php +++ b/app/Models/Gadai.php @@ -9,6 +9,7 @@ class Gadai extends Model { use HasFactory; + protected $connection = 'main'; protected $table = 'gadai'; protected $fillable = [ diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index b2e614b2..37e3e68b 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -49,6 +49,7 @@ echo($datez); @endphp + @@ -177,13 +178,13 @@
- +
- - - - + + + +
@@ -359,7 +360,7 @@ } $('a.confirmdel').confirm({ - title: 'Confirmation', + title: 'Pengesahan', content: 'Anda pasti?', type: 'orange', typeAnimated: true, diff --git a/resources/views/pengurusandatabase/senaraidb.blade.php b/resources/views/pengurusandatabase/senaraidb.blade.php index 42c96508..bd7eaf41 100644 --- a/resources/views/pengurusandatabase/senaraidb.blade.php +++ b/resources/views/pengurusandatabase/senaraidb.blade.php @@ -163,7 +163,7 @@ function confirm(id) { // console.log(id); $.confirm({ - title: 'Confirmation', + title: 'Pengesahan', content: 'Anda pasti?', type: 'orange', typeAnimated: true, diff --git a/resources/views/pengurusandatabase/show.blade.php b/resources/views/pengurusandatabase/show.blade.php index 1c6a0267..a5d20641 100644 --- a/resources/views/pengurusandatabase/show.blade.php +++ b/resources/views/pengurusandatabase/show.blade.php @@ -105,7 +105,7 @@ }) function confirm() { $.confirm({ - title: 'Confirmation', + title: 'Pengesahan', content: 'Anda pasti?', type: 'orange', typeAnimated: true, diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index e3dc9490..871f59e7 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -265,12 +265,12 @@
- +
- - - + + +
@@ -461,7 +461,7 @@ }); } $('a.confirmdel').confirm({ - title: 'Confirmation', + title: 'Pengesahan', content: 'Anda pasti?', type: 'orange', typeAnimated: true, diff --git a/resources/views/tangguhlelong/senactionoperasi.blade.php b/resources/views/tangguhlelong/senactionoperasi.blade.php index b5062c95..f4f79507 100644 --- a/resources/views/tangguhlelong/senactionoperasi.blade.php +++ b/resources/views/tangguhlelong/senactionoperasi.blade.php @@ -69,13 +69,20 @@ @endif - - @if($sah['status'] == 2) + + @if($sah['status'] == 1) + + + @elseif($sah['status'] == 2) + + @elseif($sah['status'] == 3) + + @@ -199,7 +206,7 @@ function confirm() { $.confirm({ - title: 'Confirmation', + title: 'Pengesahan', content: 'Anda pasti?', type: 'orange', typeAnimated: true, diff --git a/resources/views/tangguhlelong/senaraimohontangguh.blade.php b/resources/views/tangguhlelong/senaraimohontangguh.blade.php index 6e611239..326401ae 100644 --- a/resources/views/tangguhlelong/senaraimohontangguh.blade.php +++ b/resources/views/tangguhlelong/senaraimohontangguh.blade.php @@ -68,14 +68,18 @@ @elseif($mohon['status'] == 4) + @elseif($mohon['status'] == 99) + @endif + @if($mohon['status'] == 0) + - @elseif($mohon['status'] == 4) + @elseif($mohon['status'] == 1 || $mohon['status'] >= 4) @endif diff --git a/routes/web.php b/routes/web.php index e890fc62..997c511f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -402,6 +402,7 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel Route::post('/operasisahtangguh', ['as'=>'tangguhlelong.operasisahtangguh','uses'=>'TangguhLelongController@operasisahtangguh']); Route::get('/operasidownloadboranglulus/{lelongbid_id}', ['as'=>'tangguhlelong.operasidownloadboranglulus','uses'=>'TangguhLelongController@operasidownloadboranglulus']); Route::get('/cwgndownloadboranglulus/{lelongbid_id}', ['as'=>'tangguhlelong.cwgndownloadboranglulus','uses'=>'TangguhLelongController@operasidownloadboranglulus']); + Route::get('/ulangdownloadmohon/{lelongbid_id}', ['as'=>'tangguhlelong.ulangdownloadmohon','uses'=>'TangguhLelongController@ulangdownloadmohon']); }); //pengurus cawangan KHAS