diff --git a/app/Http/Controllers/Dashboard/CooperationRequestController.php b/app/Http/Controllers/Dashboard/CooperationRequestController.php index b678fbc..7483df1 100644 --- a/app/Http/Controllers/Dashboard/CooperationRequestController.php +++ b/app/Http/Controllers/Dashboard/CooperationRequestController.php @@ -107,7 +107,7 @@ public function proposalAction(JournalistCooperationProposalRequest $request, $i $createdCooperationProposal->journalists()->attach($validatedData['journalist_ids']); if ($createdCooperationProposal->journalists()->count() > 0) { - return redirect()->back()->with('success-status', 'Berhasil melakukan pengajuan kerjasama.'); + return redirect()->route('dashboard.cooperations.requests.index')->with('success-status', 'Berhasil melakukan pengajuan kerjasama.'); } else { return redirect()->back()->with('failed-status', 'Gagal melakukan pengajuan kerjasama'); } @@ -150,9 +150,6 @@ public function rejectAction(Request $request, $id){ } - // dd($mediaCooperation->pivot); - - // Pastikan data yang ingin diperbarui ada dan statusnya belum '3' if ($mediaCooperation->pivot->status != '3') { $affectedRows = $cooperation->media()->updateExistingPivot($mediaCooperation->id, [ 'status' => '2', @@ -169,4 +166,55 @@ public function rejectAction(Request $request, $id){ } } + + public function editProposal($id){ + $proposal = CooperationProposal::with(['cooperation', 'media', 'journalists'])->findOrFail(decrypt_id($id)); + + return view('dashboard.cooperation-requests.media-proposals.edit',[ + 'title' => 'Ubah Ajuan Kerjasama', + 'proposal' => $proposal, + 'selectedJournalists' => $proposal->journalists->pluck('id')->toArray() + ]); + } + + public function updateProposal(JournalistCooperationProposalRequest $request, $id){ + $validatedData = $request->validated(); + $validatedData['media_id'] = Auth::user()->company->media->id; + + $proposal = CooperationProposal::with(['cooperation', 'media', 'journalists'])->findOrFail(decrypt_id($id)); + $validatedData['cooperation_id'] = $proposal->cooperation_id; + + if($request->hasFile('attachment')){ + $validatedData['attachment'] = store_file($validatedData['attachment'], '/uploads/cooperation-proposals', 'public')['randomFileName']; + delete_file('app/public/uploads/cooperation-proposals/'.$proposal->image); + }else{ + $validatedData['attachment'] = $proposal->attachment; + } + + $proposal->update($validatedData); + + if($request->has('journalist_ids')){ + $proposal->journalists()->sync($validatedData['journalist_ids']); + } + + if ($proposal->journalists()->count() > 0) { + return redirect()->back()->with('success-status', 'Berhasil mengubah pengajuan kerjasama.'); + } else { + return redirect()->back()->with('failed-status', 'Gagal mengubah pengajuan kerjasama'); + } + + } + + public function destroyProposal($id){ + try { + $cooperationProposal = CooperationProposal::findOrFail(decrypt_id($id)); + delete_file('app/public/uploads/cooperation-proposals/'.$cooperationProposal->attachment); + $cooperationProposal->delete(); + + + return response()->json(['message' => 'Berhasil menghapus ajuan kerjasama.']); + } catch (\Exception $e) { + return response()->json(['message' => 'Gagal menghapus ajuan kerjasama.'], 500); + } + } } diff --git a/app/Http/Controllers/Dashboard/DatatableController.php b/app/Http/Controllers/Dashboard/DatatableController.php index 221be72..0d6a45f 100644 --- a/app/Http/Controllers/Dashboard/DatatableController.php +++ b/app/Http/Controllers/Dashboard/DatatableController.php @@ -746,7 +746,7 @@ public function cooperation(Request $request){ } if (is_role([1])) { - $dropdown .= '
  • Hapus
    • '; + $dropdown .= '
  • Hapus
    • '; } @@ -1052,9 +1052,9 @@ public function mediaProposal(Request $request){ $showUrl = route('dashboard.cooperations.requests.media.proposals.show', ['id' => encrypt_id($data->id)]); - $editUrl = route('dashboard.cooperations.edit', ['id' => encrypt_id($data->id)]); + $editUrl = route('dashboard.cooperations.requests.proposal.edit', ['id' => encrypt_id($data->id)]); - $deleteUrl = route('dashboard.cooperations.destroy', ['id' => encrypt_id($data->id)]); + $deleteUrl = route('dashboard.cooperations.requests.proposal.destroy', ['id' => encrypt_id($data->id)]); $dropdown = '
    @@ -1067,7 +1067,7 @@ public function mediaProposal(Request $request){ } if (is_role(['3']) && $data->status === '0') { - $dropdown .= '
  • Hapus
    • '; + $dropdown .= '
  • Hapus
    • '; } $dropdown .= ' diff --git a/app/Http/Requests/JournalistCooperationProposalRequest.php b/app/Http/Requests/JournalistCooperationProposalRequest.php index 8edab54..61c93e3 100644 --- a/app/Http/Requests/JournalistCooperationProposalRequest.php +++ b/app/Http/Requests/JournalistCooperationProposalRequest.php @@ -22,12 +22,19 @@ public function authorize(): bool */ public function rules(): array { - return [ + $rules = [ 'journalist_ids' => ['required', 'array'], 'journalist_ids.*' => ['required', 'exists:journalists,id'], - 'attachment' => ['required', 'file', 'mimes:pdf', 'max:2048'], 'description' => ['nullable'] ]; + + if($this->isMethod('post')){ + $rules['attachment'] = ['required', 'file', 'mimes:pdf', 'max:2048']; + }else{ + $rules['attachment'] = ['nullable', 'file', 'mimes:pdf', 'max:2048']; + } + + return $rules; } public function messages(): array diff --git a/resources/views/dashboard/cooperation-requests/media-proposals/edit.blade.php b/resources/views/dashboard/cooperation-requests/media-proposals/edit.blade.php new file mode 100644 index 0000000..abb75f3 --- /dev/null +++ b/resources/views/dashboard/cooperation-requests/media-proposals/edit.blade.php @@ -0,0 +1,334 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'cooperation_requests']) +@include('partials.dashboard.header') + +
    +
    +
    +
    +
    +
    + +
    + +
    + @csrf + @method('put') +
    +
    +
    +
    +
    + Nama perusahaan + {{$proposal->media->company->name}} +
    +
    +
    +
    + Email Perusahaan + {{$proposal->media->company->email}} +
    +
    +
    +
    + Direktur + {{$proposal->media->company->director_name}} +
    +
    +
    +
    + NIK Direktur + + @if ($proposal->media->company->director_nik_doc) + {{$proposal->media->company->director_nik}} + @else + {{$proposal->media->company->director_nik ?? '-'}} + @endif + +
    +
    +
    +
    + Alamat + {{$proposal->media->company->address}} +
    +
    +
    +
    + Akta Pendirian + + @if ($proposal->media->company->deed_incorporation_doc) + {{$proposal->media->company->deed_incorporation}} + @else + {{$proposal->media->company->deed_incorporation ?? '-'}} + @endif + +
    +
    +
    +
    + SPT Tahunan + + @if ($proposal->media->company->annual_tax_return_doc) + {{$proposal->media->company->annual_tax_return}} + @else + {{$proposal->media->company->annual_tax_return ?? '-'}} + @endif + +
    +
    +
    +
    + NPWP + + @if ($proposal->media->company->tax_id_number_doc) + {{$proposal->media->company->tax_id_number}} + @else + {{$proposal->media->company->tax_id_number ?? '-'}} + @endif + +
    +
    +
    +
    + PKP + + @if ($proposal->media->company->taxable_enterprise_doc) + {{$proposal->media->company->taxable_enterprise}} + @else + {{$proposal->media->company->taxable_enterprise ?? '-'}} + @endif + +
    +
    +
    +
    + Suket Domisili + + @if ($proposal->media->company->domicile_certificate_doc) + {{$proposal->media->company->domicile_certificate}} + @else + {{$proposal->media->company->domicile_certificate ?? '-'}} + @endif + +
    +
    +
    +
    + SIUP + + @if ($proposal->media->company->trade_license_doc) + {{$proposal->media->company->trade_license}} + @else + {{$proposal->media->company->trade_license ?? '-'}} + @endif + +
    +
    +
    +
    + Profile + + @if ($proposal->media->company->profile_doc) + {{$proposal->media->company->profile}} + @else + {{$proposal->media->company->profile ?? '-'}} + @endif + +
    +
    +
    +
    + Penawaran Kerja + + @if ($proposal->media->company->cooperation_request_doc) + {{$proposal->media->company->cooperation_request}} + @else + {{$proposal->media->company->cooperation_request ?? '-'}} + @endif + +
    +
    +
    +
    + Status + @switch($proposal->media->company->user->status) + @case(0) + Menunggu + @break + @case(1) + Diterima + @break + @case(2) + Ditolak + @break + @default + Tidak Diketahui + @endswitch +
    + +
    +
    +
    +
    +
    +
    +
    + Nama Media + {{$proposal->media->name}} +
    +
    +
    +
    + Jenis + {{ucfirst($proposal->media->type)}} +
    +
    +
    +
    + Klasifikasi + {{ucfirst($proposal->media->classification)}} +
    +
    +
    +
    + Alamat + {{$proposal->media->address}} +
    +
    +
    +
    + Organisasi Kewartawanan + + @if ($proposal->media->journalism_organization_doc) + {{$proposal->media->journalism_organization}} + @else + {{$proposal->media->journalism_organization ?? '-'}} + @endif + +
    +
    +
    +
    + Sertifikat Dewan Press + + @if ($proposal->media->press_council_certificate_doc) + {{$proposal->media->press_council_certificate}} + @else + {{$proposal->media->press_council_certificate ?? '-'}} + @endif + +
    +
    +
    +
    + Status + @switch($proposal->media->company->user->status) + @case(0) + Menunggu + @break + @case(1) + Diterima + @break + @case(2) + Ditolak + @break + @default + Tidak Diketahui + @endswitch +
    + +
    +
    +
    +
    +
    +
    + Pilih Jurnalis +
      + @foreach ($proposal->media->journalists as $journalist) +
    • +
      + id, $selectedJournalists)) required> + +
      +
      • + @endforeach +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + + Unduh template pengajuan + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    + Kembali + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/cooperation-requests/media-proposals/show.blade.php b/resources/views/dashboard/cooperation-requests/media-proposals/show.blade.php index 5c3d8fa..27de5b8 100644 --- a/resources/views/dashboard/cooperation-requests/media-proposals/show.blade.php +++ b/resources/views/dashboard/cooperation-requests/media-proposals/show.blade.php @@ -324,7 +324,7 @@
    - Kembali + Kembali
    diff --git a/routes/web.php b/routes/web.php index a85bb43..ae921e8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -266,9 +266,9 @@ Route::post('/{id}/reject', 'rejectAction')->name('reject.action'); - Route::get('/{id}/edit', 'edit')->name('edit'); - Route::put('/{id}', 'update')->name('update'); - Route::delete('/{id}', 'destroy')->name('destroy'); + Route::get('/{id}/edit', 'editProposal')->name('proposal.edit'); + Route::put('/{id}', 'updateProposal')->name('proposal.update'); + Route::delete('/{id}', 'destroyProposal')->name('proposal.destroy'); }); Route::get('/data', [DatatableController::class, 'cooperationRequest'])->name('data');