From 81860513085c29f810fb6dc1528a877f7f6a37f3 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Wed, 2 Oct 2024 13:52:48 +0700 Subject: [PATCH 01/18] Membuat Sub Menu Data Penawaran dari Menu Tender part 3 --- app/Http/Controllers/TenderController.php | 16 ++++++---- resources/views/penawaran/create.blade.php | 12 +++++--- resources/views/penawaran/index.blade.php | 31 ++++++++++++++----- resources/views/penawaran/show.blade.php | 36 ++++++++++++++++++++++ resources/views/permohonan/index.blade.php | 3 -- routes/breadcrumbs.php | 5 +++ routes/web.php | 1 + 7 files changed, 83 insertions(+), 21 deletions(-) create mode 100644 resources/views/penawaran/show.blade.php diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 0ac29a0..6829346 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -33,15 +33,14 @@ class TenderController extends Controller */ public function penawaran_create($id) { + $penawaran = PenawaranTender::find($id); + $status = StatusPermohonan::all(); $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); $jenis_laporan = JenisLaporan::all(); $kjpp = KJPP::all(); - $permohonan = Permohonan::find($id); - $permohonanId = $permohonan->id; - $permohonanNomorRegistrasi = $permohonan->nomor_registrasi; - return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi')); + return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id')); } /** @@ -52,10 +51,14 @@ class TenderController extends Controller $validated = $request->validated(); if ($validated) { - $validated['nomor_registrasi'] = $request->nomor_registrasi; + $penawaran = PenawaranTender::find($id); + + $validated['nomor_registrasi'] = $penawaran->nomor_registrasi; $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya')); + dd($validated); + PenawaranTender::create($validated); return redirect() @@ -73,7 +76,8 @@ class TenderController extends Controller */ public function penawaran_show($id) { - return view('lpj::show'); + $penawaran = PenawaranTender::find($id); + return view('lpj::penawaran.show', compact('id', 'penawaran')); } /** diff --git a/resources/views/penawaran/create.blade.php b/resources/views/penawaran/create.blade.php index 9a081ec..c494a4e 100644 --- a/resources/views/penawaran/create.blade.php +++ b/resources/views/penawaran/create.blade.php @@ -6,7 +6,7 @@ @section('content')
-
+ @csrf
@@ -15,6 +15,8 @@ Tambah Data Penawaran
+ Detail Back @@ -26,9 +28,8 @@ Nomor Registrasi
- + @error('nomor_registrasi') {{ $message }} @enderror @@ -174,7 +175,8 @@ @if (isset($status)) @foreach ($status as $s) - @endforeach diff --git a/resources/views/penawaran/index.blade.php b/resources/views/penawaran/index.blade.php index 897f77e..93b5ad2 100644 --- a/resources/views/penawaran/index.blade.php +++ b/resources/views/penawaran/index.blade.php @@ -72,6 +72,24 @@ @push('scripts') + + +@endpush + diff --git a/routes/web.php b/routes/web.php index a4ad27a..80ada10 100644 --- a/routes/web.php +++ b/routes/web.php @@ -57,14 +57,14 @@ Route::middleware(['auth'])->group(function () { }); Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class); - Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () { - Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas'); - Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore'); - Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables']) - ->name('datatables'); - Route::get('export', [JenisJaminanController::class, 'export'])->name('export'); - }); - Route::resource('jenis-jaminan', JenisJaminanController::class); + Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () { + Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas'); + Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore'); + Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables']) + ->name('datatables'); + Route::get('export', [JenisJaminanController::class, 'export'])->name('export'); + }); + Route::resource('jenis-jaminan', JenisJaminanController::class); Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () { Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore'); @@ -98,7 +98,7 @@ Route::middleware(['auth'])->group(function () { Route::name('debitur.')->prefix('debitur')->group(function () { Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore'); Route::get('datatables', [DebitureController::class, 'dataForDatatables']) - ->name('datatables'); + ->name('datatables'); Route::get('export', [DebitureController::class, 'export'])->name('export'); From 8106da7dd93ad1a3ccb303d397ccec7975700cab Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 28 Aug 2024 17:13:46 +0700 Subject: [PATCH 05/18] rename 2024_08_22_080122_create_permohonan_table.php menjadi 2024_08_19_080122_create_permohonan_table.php (ganti tgl dari 20 menjadi 19) --- ...4_08_22_093805_create_permohonan_table.php | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 database/migrations/2024_08_22_093805_create_permohonan_table.php diff --git a/database/migrations/2024_08_22_093805_create_permohonan_table.php b/database/migrations/2024_08_22_093805_create_permohonan_table.php deleted file mode 100644 index e75f942..0000000 --- a/database/migrations/2024_08_22_093805_create_permohonan_table.php +++ /dev/null @@ -1,46 +0,0 @@ -id(); - $table->string('nomor_registrasi')->unique(); - $table->date('tanggal_permohonan'); - $table->foreignIdFor(User::class)->constrained(); - $table->foreignIdFor(Branch::class)->constrained(); - $table->foreignIdFor(TujuanPenilaian::class)->constrained('tujuan_penilaian')->onDelete('cascade'); - $table->foreignIdFor(Debiture::class)->constrained('debitures')->onDelete('cascade'); - $table->boolean('status')->default(true)->nullable(); - $table->timestamps(); - $table->timestamp('authorized_at')->nullable(); - $table->char('authorized_status', 1)->nullable(); - $table->softDeletes(); - - $table->unsignedBigInteger('created_by')->nullable(); - $table->unsignedBigInteger('updated_by')->nullable(); - $table->unsignedBigInteger('deleted_by')->nullable(); - $table->unsignedBigInteger('authorized_by')->nullable(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('permohonan'); - } -}; From 544f7a7c114522d02d88c7ed7936cb9844056039 Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 2 Oct 2024 11:33:23 +0700 Subject: [PATCH 06/18] upload feature registrasi view --- ...024_08_12_022025_create_branches_table.php | 39 ++++ ...23_073833_create_dokumen_jaminan_table.php | 52 +++++ resources/views/registrasi/edit.blade.php | 96 +++++++++ resources/views/registrasi/index.blade.php | 170 +++++++++++++++ .../views/registrasi/js/editjs.blade.php | 196 ++++++++++++++++++ .../views/registrasi/js/showjs.blade.php | 148 +++++++++++++ resources/views/registrasi/show.blade.php | 40 ++++ 7 files changed, 741 insertions(+) create mode 100644 database/migrations/2024_08_12_022025_create_branches_table.php create mode 100644 database/migrations/2024_08_23_073833_create_dokumen_jaminan_table.php create mode 100644 resources/views/registrasi/edit.blade.php create mode 100644 resources/views/registrasi/index.blade.php create mode 100644 resources/views/registrasi/js/editjs.blade.php create mode 100644 resources/views/registrasi/js/showjs.blade.php create mode 100644 resources/views/registrasi/show.blade.php diff --git a/database/migrations/2024_08_12_022025_create_branches_table.php b/database/migrations/2024_08_12_022025_create_branches_table.php new file mode 100644 index 0000000..bf4e9a8 --- /dev/null +++ b/database/migrations/2024_08_12_022025_create_branches_table.php @@ -0,0 +1,39 @@ +id(); + $table->string('code', 9)->unique(); + $table->string('name'); + $table->boolean('status')->default(true)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->char('authorized_status', 1)->nullable(); + $table->softDeletes(); + + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down() + : void + { + Schema::dropIfExists('branches'); + } + }; diff --git a/database/migrations/2024_08_23_073833_create_dokumen_jaminan_table.php b/database/migrations/2024_08_23_073833_create_dokumen_jaminan_table.php new file mode 100644 index 0000000..2e663c9 --- /dev/null +++ b/database/migrations/2024_08_23_073833_create_dokumen_jaminan_table.php @@ -0,0 +1,52 @@ +id(); + $table->foreignIdFor(Debiture::class)->constrained('debitures')->onDelete('cascade'); + $table->foreignIdFor(Permohonan::class)->nullable()->constrained('permohonan')->onDelete('cascade'); + $table->foreignIdFor(JenisJaminan::class)->constrained('jenis_jaminan')->onDelete('cascade'); + $table->foreignIdFor(PemilikJaminan::class)->constrained('pemilik_jaminan')->onDelete('cascade'); + $table->string('province_code')->nullable()->index(); + $table->string('city_code')->nullable()->index(); + $table->string('district_code')->nullable()->index(); + $table->string('village_code')->nullable()->index(); + $table->string('postal_code', 5)->nullable(); + $table->text('address')->nullable(); + + $table->boolean('status')->default(true)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->char('authorized_status', 1)->nullable(); + $table->softDeletes(); + + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('dokumen_jaminan'); + } +}; diff --git a/resources/views/registrasi/edit.blade.php b/resources/views/registrasi/edit.blade.php new file mode 100644 index 0000000..167fa25 --- /dev/null +++ b/resources/views/registrasi/edit.blade.php @@ -0,0 +1,96 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection +@php + // $route = Route::currentRouteName(); + // dd($route); + $route = explode('.', Route::currentRouteName()); +@endphp + +@section('content') +
+ + + + @method('PUT') + @csrf +
+
+

+ Tambah Registrasi +

+
+ Detail + Back +
+
+
+
+ +
+ +
+
+
+ +
+    + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+
+
+ +
+@endsection +@include('lpj::registrasi.js.editjs') diff --git a/resources/views/registrasi/index.blade.php b/resources/views/registrasi/index.blade.php new file mode 100644 index 0000000..8a98fa4 --- /dev/null +++ b/resources/views/registrasi/index.blade.php @@ -0,0 +1,170 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('registrasi') }} +@endsection + +@section('content') +
+
+
+

+ Daftar Registrasi +

+
+
+ +
+
+
+ Export to Excel +
+
+
+
+
+ + + + + + + + + + + + + + +
+ + + Nomor Registrasi + + + Tanggal Permohonan + + + User Pemohon + + + Cabang Pemohon + + + Debitur + + + Tujuan Penilaian + + + Status + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + +@push('scripts') + + + +@endpush + diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php new file mode 100644 index 0000000..bb23884 --- /dev/null +++ b/resources/views/registrasi/js/editjs.blade.php @@ -0,0 +1,196 @@ +@push('scripts') + +@endpush diff --git a/resources/views/registrasi/js/showjs.blade.php b/resources/views/registrasi/js/showjs.blade.php new file mode 100644 index 0000000..97a5110 --- /dev/null +++ b/resources/views/registrasi/js/showjs.blade.php @@ -0,0 +1,148 @@ +@push('scripts') + +@endpush diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php new file mode 100644 index 0000000..7fbdcec --- /dev/null +++ b/resources/views/registrasi/show.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection +@php + // $route = Route::currentRouteName(); + // dd($route); registrasi.show + $route = explode('.', Route::currentRouteName()); +@endphp +@section('content') +
+
+
+

+ Detail Permohonan +

+
+ Registrasi + Back +
+
+
+ +
+ +
+ +
+
+ +
+
+
+@endsection +@include('lpj::registrasi.js.showjs') \ No newline at end of file From b15d1b61a7b18991db369738cb2a67709cf84b8e Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 2 Oct 2024 11:43:41 +0700 Subject: [PATCH 07/18] upload feature registrasi lengkap --- app/Http/Controllers/RegistrasiController.php | 270 ++++++++++++++++++ app/Models/Permohonan.php | 32 ++- ...4_10_01_095350_update_permohonan_table.php | 32 +++ routes/registrasi.php | 25 ++ routes/web.php | 30 +- 5 files changed, 359 insertions(+), 30 deletions(-) create mode 100644 app/Http/Controllers/RegistrasiController.php create mode 100644 database/migrations/2024_10_01_095350_update_permohonan_table.php create mode 100644 routes/registrasi.php diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php new file mode 100644 index 0000000..5f04aa6 --- /dev/null +++ b/app/Http/Controllers/RegistrasiController.php @@ -0,0 +1,270 @@ +user) || !$this->user->can('debitur.view')) { + //abort(403, 'Sorry! You are not allowed to view users.'); + } + + // Retrieve data from the database + $query = Permohonan::query()->where('status','=','preregister'); + + // Apply search filter if provided + if ($request->has('search') && !empty($request->get('search'))) { + $search = $request->get('search'); + $query->where(function ($q) use ($search) { + $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%'); + $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%'); + $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%'); + $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%'); + $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%'); + $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%'); + $q->orWhere('status', 'LIKE', '%' . $search . '%'); + }); + } + + // Apply sorting if provided + if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { + $order = $request->get('sortOrder'); + $column = $request->get('sortField'); + $query->orderBy($column, $order); + } + + // Get the total count of records + $totalRecords = $query->count(); + + // Apply pagination if provided + if ($request->has('page') && $request->has('size')) { + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + + $query->skip($offset)->take($size); + } + + // Get the filtered count of records + $filteredRecords = $query->count(); + + // Get the data for the current page + $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get(); + + // Calculate the page count + $pageCount = ceil($totalRecords / $request->get('size')); + + // Calculate the current page number + $currentPage = 0 + 1; + + // Return the response data as a JSON object + return response()->json([ + 'draw' => $request->get('draw'), + 'recordsTotal' => $totalRecords, + 'recordsFiltered' => $filteredRecords, + 'pageCount' => $pageCount, + 'page' => $currentPage, + 'totalCount' => $totalRecords, + 'data' => $data, + ]); + } + + public function edit($id) + { + return view('lpj::registrasi.edit', compact('id')); + } + + public function setData(Request $request): JsonResponse + { + $data = array(); + $datas = array(); + + if (request()->ajax()) { + $id = $request->id; + $datas = Permohonan::findOrFail($id); + $data['status'] = 'success'; + if ($datas) { + $jenisPenilaians=null; + $regions=null; + $regions=Regions::pluck('name', 'id'); + $jenisPenilaians=JenisPenilaian::pluck('name', 'id'); + + $data['regions'] = $regions; + $data['jenisPenilaians'] = $jenisPenilaians; + $data['datas'] = $datas; + $data['message'] = 'data successfully found'; + } else { + $data['datas'] = null; + $data['message'] = 'data not found'; + } + } else { + $data['status'] = 'error'; + $data['message'] = 'no ajax request'; + } + + return response()->json($data); + } + + public function update(Request $request, $id): JsonResponse + { + // init + $data = array(); + $dataku = array(); + $tindakan = null; + if (request()->ajax()) { + $validator = RegistrasiController::rulesEditnya($request, $id); + + if ($validator['fails']) { + $data['message'] = $validator['errors']; + $data['status'] = 'error'; + } + else + { + try { + + $tindakan=$request->tindakan; + $dataku = ['registrasi_by' => Auth::id(), + 'registrasi_at' => now() + ]; + + if($tindakan==0) + { + $dataku['jenis_penilaian_id'] =$request->jenis_penilaian; + $dataku['region_id'] =$request->region; + $dataku['status'] = 'registered'; + } + else + { + $dataku['registrasi_catatan'] =$request->catatan; + $dataku['status'] = 'revisi'; + } + + $data['dataku'] =$dataku; + + $modal = Permohonan::find($id); + + $modal->update($dataku); + // + $data['status'] = 'success'; + $data['message'] = 'Regitrasi '.$modal->nomor_registrasi.' successfully'; + } catch (Exception $e) { + + $data['status'] = 'error'; + $data['message'] = 'Jenis Fasilitas Kredit updated failed.'; + } + } + + } else { + $data['status'] = 'error'; + $data['message'] = 'no ajax request'; + } + + return response()->json($data); + + } + + public function rulesEditnya($request, $id) + { + $tindakan=null; + $jenis_penilaian=null; + $validate_catatan=''; + $tindakan=$request->tindakan; + $jenis_penilaian=$request->jenis_penilaian; + + $validateIt = [ + // 'name' diambil dari definisi parameter yang di kirim pada POST Data + 'tindakan' => 'required', + ]; + + $messageIt = [ + 'tindakan.required' => 'Silahkan pilih Tindakan' + ]; + + if($tindakan==0) + { + $validateIt['jenis_penilaian'] = ['required']; + $messageIt ['jenis_penilaian.required']= 'Silahkan pilih Jenis Penilaian'; + + // INTERNAL + if(1==$jenis_penilaian) + { + $validateIt['region'] = ['required']; + $messageIt ['region.required']= 'Silahkan pilih Region'; + } + } + elseif($tindakan==1) + { + $validateIt['catatan'] = ['required']; + $messageIt ['catatan.required']= 'Silahkan isi Catatan'; + } + + $validator = Validator::make($request->all(), $validateIt, $messageIt); + + $data['fails'] = $validator->fails(); + $data['errors'] = $validator->errors(); + + return $data; + } + + public function show($id) + { + return view('lpj::registrasi.show', compact('id')); + } + + public function showData(Request $request): JsonResponse + { + $data = array(); + $datas = array(); + + if (request()->ajax()) { + $id = $request->id; + $datas = Permohonan::findOrFail($id); + $data['status'] = 'success'; + if ($datas) { + $data['datas'] = $datas; + $data['message'] = 'data successfully found'; + } else { + $data['datas'] = null; + $data['message'] = 'data not found'; + } + } else { + $data['status'] = 'error'; + $data['message'] = 'no ajax request'; + } + + return response()->json($data); + } + } diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php index 5b63bdc..566a899 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -28,38 +28,52 @@ class Permohonan extends Base 'authorized_status', 'authorized_by', 'status_bayar', - 'nilai_njop' + 'nilai_njop', + // andy add + 'registrasi_catatan', + 'registrasi_by', + 'registrasi_at', + 'jenis_penilaian_id', + 'region_id' ]; - public function user(){ + public function user() + { return $this->belongsTo(User::class); } - public function branch(){ + public function branch() + { return $this->belongsTo(Branch::class); } - public function tujuanPenilaian(){ + public function tujuanPenilaian() + { return $this->belongsTo(TujuanPenilaian::class); } - public function debiture(){ + public function debiture() + { return $this->belongsTo(Debiture::class); } - public function documents(){ + public function documents() + { return $this->hasMany(DokumenJaminan::class); } - public function nilaiPlafond(){ + public function nilaiPlafond() + { return $this->belongsTo(NilaiPlafond::class); } - public function jenisFasilitasKredit(){ + public function jenisFasilitasKredit() + { return $this->belongsTo(JenisFasilitasKredit::class); } - public function penilaian(){ + public function penilaian() + { return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi'); } } diff --git a/database/migrations/2024_10_01_095350_update_permohonan_table.php b/database/migrations/2024_10_01_095350_update_permohonan_table.php new file mode 100644 index 0000000..98794df --- /dev/null +++ b/database/migrations/2024_10_01_095350_update_permohonan_table.php @@ -0,0 +1,32 @@ +text('registrasi_catatan')->nullable()->comment('kebutuhan untuk feature Registrasi'); + $table->unsignedBigInteger('registrasi_by')->nullable()->after('registrasi_catatan')->comment('kebutuhan untuk feature Registrasi'); + $table->timestamp('registrasi_at')->nullable()->after('registrasi_by')->comment('kebutuhan untuk feature Registrasi'); + $table->unsignedBigInteger('jenis_penilaian_id')->nullable()->after('registrasi_at')->comment('kebutuhan untuk feature Registrasi'); + $table->unsignedBigInteger('region_id')->nullable()->after('jenis_penilaian_id')->comment('kebutuhan untuk feature Registrasi'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('permohonan', function (Blueprint $table) { + + }); + } +}; diff --git a/routes/registrasi.php b/routes/registrasi.php new file mode 100644 index 0000000..8beb9ae --- /dev/null +++ b/routes/registrasi.php @@ -0,0 +1,25 @@ +group(function () { + + // andy add + // Route::name('registrasi.')->prefix('registrasi')->group(function () { + Route::controller(RegistrasiController::class)->group(function(){ + // Route::get('/', [RegistrasiController::class, 'index'])->name('registrasi.index'); + Route::get('/registrasi', 'index')->name('registrasi.index'); + Route::get('/registrasi/datatables', 'dataForDatatables')->name('registrasi.datatables'); + + // show data + Route::get('/registrasi/{registrasi}', 'show')->name('registrasi.show'); + Route::post('registrasi/showData', 'setData')->name('registrasi.showData'); + + Route::post('registrasi/setData', 'setData')->name('registrasi.setData'); + Route::get('/registrasi/{registrasi}/edit', 'edit')->name('registrasi.edit'); + Route::put('/registrasi/{registrasi}', 'update')->name('registrasi.update'); + + }); + // andy add +}); + diff --git a/routes/web.php b/routes/web.php index 80ada10..bd9b9d0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,7 @@ group(function () { Route::resource('debitur', DebitureController::class); - Route::name('tender.')->prefix('tender')->group(function () { - // Penawaran - Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index'); - Route::get('penawaran/{id}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show'); - Route::get('penawaran/{id}/create', [TenderController::class, 'penawaran_create'])->name('penawaran.createPenawaran'); - Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name('penawaran.storePenawaran'); - Route::post('penawaran/{id}/update', [TenderController::class, 'penawaran_store'])->name('penawaran.updatePenawaran'); - Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name('penawaran.exportPenawaran'); - Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran']) - ->name('penawaran.datatables'); + // andy + // Route::name('authorization.')->prefix('authorization')->group(function () { + // Route::get('/', [AuthorizationController::class, 'index'])->name('index'); + // Route::get('datatables', [AuthorizationController::class, 'dataForDatatables']) + // ->name('datatables'); + // }); - // Proses Penawaran - Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name( - 'proses_penawaran.index', - ); - - // Penawaran Ulang - Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name( - 'penawaran_ulang.index', - ); - }); + // Route::resource('authorization', AuthorizationController::class); + // andy }); From 8ce78a7e0fb3a436cb18d3545df19918b87ab3c6 Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 2 Oct 2024 13:37:42 +0700 Subject: [PATCH 08/18] hapus script sweetalert pada file registrasi/index --- resources/views/registrasi/index.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/registrasi/index.blade.php b/resources/views/registrasi/index.blade.php index 8a98fa4..71b81ca 100644 --- a/resources/views/registrasi/index.blade.php +++ b/resources/views/registrasi/index.blade.php @@ -81,7 +81,6 @@ @endsection @push('scripts') - @@ -144,11 +144,11 @@ title: 'Status', render: (item, data) => { return `
- - + + - +
`; }, From a17215d45e13d5de54d15aeba1527018480dce6e Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 3 Oct 2024 09:42:45 +0700 Subject: [PATCH 17/18] penambahan menu penilaian kjpp --- module.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/module.json b/module.json index 524ca13..d3775b8 100644 --- a/module.json +++ b/module.json @@ -277,6 +277,14 @@ "permission": "", "roles": [] }, + { + "title": "Tujuan Penilaian KJPP", + "path": "basicdata.tujuan_penilaian_kjpp", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, { "title": "Ijin Usaha", "path": "basicdata.ijin_usaha", From bd96bab2a9bc96c3f2db5984e03ad44a4ec1af44 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 3 Oct 2024 10:22:46 +0700 Subject: [PATCH 18/18] ad detail permohonan pada detail register --- app/Http/Controllers/RegistrasiController.php | 3 +- resources/views/registrasi/show.blade.php | 234 ++++++++++++++++-- 2 files changed, 221 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php index 5dc2e65..6884abd 100644 --- a/app/Http/Controllers/RegistrasiController.php +++ b/app/Http/Controllers/RegistrasiController.php @@ -241,7 +241,8 @@ public function show($id) { - return view('lpj::registrasi.show', compact('id')); + $permohonan = Permohonan::find($id); + return view('lpj::registrasi.show', compact('id','permohonan')); } public function showData(Request $request): JsonResponse diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php index 7fbdcec..f2d6e18 100644 --- a/resources/views/registrasi/show.blade.php +++ b/resources/views/registrasi/show.blade.php @@ -10,31 +10,235 @@ @endphp @section('content')
-
-
+
+

- Detail Permohonan + Data Permohonan

+
Registrasi Back
-
- -
- -
- +
+
+

+ Nomor Register Permohonan: +

+ + {{ $permohonan->nomor_registrasi }} + +
+ +
+

+ Pemohon: +

+ + {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + +
+ +
+

+ Tujan Permohonan: +

+ + {{ $permohonan->tujuanPenilaian->name }} + +
+ +
+
+ +
+
+

+ Detail Debutur +

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ Name + + {{ $permohonan->debiture->name ?? "" }} +
+ Email + + {{ $permohonan->debiture->email ?? "" }} +
+ Phone + + {{ $permohonan->debiture->phone ?? "" }} +
+ Address + + {{ $permohonan->debiture->address ?? "" }} +
+   + + {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }} +
+
+
+ + + + + + + + + + + + + + + + + +
+ Cabang + + {{ $permohonan->debiture->branch->name ?? "" }} +
+ CIF + + {{ $permohonan->debiture->cif ?? "" }} +
+ Nomor Rekening + + {{ $permohonan->debiture->nomor_rekening ?? "" }} +
+ NPWP + + {{ $permohonan->debiture->npwp ?? "" }} +
- +
+
+ +
+
+

+ Data Jaminan +

+
+
+ @foreach($permohonan->debiture->documents as $dokumen) +
+ + +
+ @endforeach
+ + @endsection -@include('lpj::registrasi.js.showjs') \ No newline at end of file +@include('lpj::registrasi.js.showjs')