From aca0df98284112c622b646e5a43398b7475eb6ce Mon Sep 17 00:00:00 2001 From: myuqinurrohman Date: Wed, 19 Mar 2025 08:13:43 +0700 Subject: [PATCH] feat: cooperation completion --- .../CooperationCompletionController.php | 91 ++++++++ .../Dashboard/DatatableController.php | 71 +++++++ .../Dashboard/MediaCooperationController.php | 101 ++++++--- .../Requests/CooperationCompletionRequest.php | 53 +++++ app/Models/CooperationCompletion.php | 29 +++ app/Models/Media.php | 4 + app/Models/Order.php | 4 + ...8_create_cooperation_completions_table.php | 37 ++++ .../seeders/CooperationCompletionSeeder.php | 17 ++ public/assets/dashboard/css/custom.css | 15 ++ .../cooperation-completions/reject.blade.php | 196 ++++++++++++++++++ .../cooperation-completions/show.blade.php | 193 +++++++++++++++++ .../completions/index-admin.blade.php | 52 +++++ .../completions/index-media.blade.php | 196 ++++++++++++++++++ .../processes/reports/index-media.blade.php | 8 +- .../processes/tab.blade.php | 4 +- .../views/partials/app/datatable.blade.php | 30 ++- routes/web.php | 21 ++ 18 files changed, 1083 insertions(+), 39 deletions(-) create mode 100644 app/Http/Controllers/Dashboard/CooperationCompletionController.php create mode 100644 app/Http/Requests/CooperationCompletionRequest.php create mode 100644 app/Models/CooperationCompletion.php create mode 100644 database/migrations/2025_03_17_072048_create_cooperation_completions_table.php create mode 100644 database/seeders/CooperationCompletionSeeder.php create mode 100644 resources/views/dashboard/cooperation-completions/reject.blade.php create mode 100644 resources/views/dashboard/cooperation-completions/show.blade.php create mode 100644 resources/views/dashboard/media-cooperations/processes/completions/index-admin.blade.php create mode 100644 resources/views/dashboard/media-cooperations/processes/completions/index-media.blade.php diff --git a/app/Http/Controllers/Dashboard/CooperationCompletionController.php b/app/Http/Controllers/Dashboard/CooperationCompletionController.php new file mode 100644 index 0000000..cee017e --- /dev/null +++ b/app/Http/Controllers/Dashboard/CooperationCompletionController.php @@ -0,0 +1,91 @@ +validated(); + + $validatedData['payment_request_letter'] = store_file($validatedData['payment_request_letter'], 'uploads/cooperation-completions', 'public')['randomFileName']; + + $validatedData['invoice'] = store_file($validatedData['invoice'], 'uploads/cooperation-completions', 'public')['randomFileName']; + + $validatedData['other_document'] = store_file($validatedData['other_document'], 'uploads/cooperation-completions', 'public')['randomFileName']; + + $validatedData['order_id'] = decrypt_id($id); + $validatedData['media_id'] = Auth::user()->company->media->id; + + $createdCompletion = CooperationCompletion::create($validatedData); + if($createdCompletion){ + return redirect()->back()->with('success-status', 'Berhasil mengirim formulir.'); + }else{ + return redirect()->back()->with('failed-status', 'Gagal mengirim formulir.'); + } + } + + public function show($mediaOrderId, $id){ + $cooperationCompletion = CooperationCompletion::findOrFail(decrypt_id($id)); + + return view('dashboard.cooperation-completions.show', [ + 'title' => 'Detail Penyelesaian Kerjasama', + 'cooperationCompletion' => $cooperationCompletion, + 'mediaOrderId' => $mediaOrderId + ]); + } + + public function accept($id){ + $completion = CooperationCompletion::with(['order', 'media'])->findOrFail(decrypt_id($id)); + + $acceptedCompletion = $completion->update([ + 'status' => '1' + ]); + + if ($acceptedCompletion) { + return redirect()->back()->with('success-status', 'Berhasil menyetujui penyelesaian kerjasama.'); + } else { + return redirect()->back()->with('failed-status', 'Gagal menyetujui penyelesaian kerjasama'); + } + + } + + public function reject($mediaOrderId, $id){ + $cooperationCompletion = CooperationCompletion::findOrFail(decrypt_id($id)); + + return view('dashboard.cooperation-completions.reject', [ + 'title' => 'Tolak Penyelesaian Kerjasama', + 'cooperationCompletion' => $cooperationCompletion, + 'mediaOrderId' => $mediaOrderId + ]); + } + + public function rejectAction(Request $request, $mediaOrderId, $id){ + + $validatedData = $request->validate([ + 'rejection_reason' => ['required'], + ], [ + 'rejection_reason.required' => 'Alasan penolakan wajib diisi.', + ]); + + $completion = CooperationCompletion::with(['order', 'media'])->findOrFail(decrypt_id($id)); + + $rejectedCompletion = $completion->update([ + 'status' => '2', + 'rejection_reason' => $validatedData['rejection_reason'] + ]); + + if ($rejectedCompletion) { + return redirect()->back()->with('success-status', 'Berhasil menolak penyelesaian kerjasama.'); + } else { + return redirect()->back()->with('failed-status', 'Gagal menolak penyelesaian kerjasama'); + } + + } +} diff --git a/app/Http/Controllers/Dashboard/DatatableController.php b/app/Http/Controllers/Dashboard/DatatableController.php index c3e01e4..a2e8c97 100644 --- a/app/Http/Controllers/Dashboard/DatatableController.php +++ b/app/Http/Controllers/Dashboard/DatatableController.php @@ -1430,6 +1430,77 @@ class="text-dark" } + public function adminCooperationCompletion(Request $request, $id){ + if ($request->ajax()) { + $mediaOrder = Order::with(['reports', 'media', 'completions.media'])->findOrFail(decrypt_id($id)); + + $data = $mediaOrder->completions; + + return DataTables::of($data) + ->addIndexColumn() + ->addColumn('media_name', function ($data) { + return $data->media->name; + }) + ->addColumn('company_name', function ($data) { + return $data->media->company->name; + }) + ->addColumn('email', function ($data) { + return $data->media->company->email; + }) + ->addColumn('status', function ($data){ + + switch($data->status){ + case '0': + return 'Menunggu'; + case 1: + return 'Diterima
'; + case '2': + return 'Ditolak + + '; + default: + return 'Tidak Diketahui'; + } + }) + ->addColumn('action', function ($data) use ($mediaOrder){ + $showUrl = route('dashboard.cooperation.completions.show', ['mediaOrderId' => encrypt_id($mediaOrder->id), 'id' => encrypt_id($data->id)]); + + $acceptUrl = route('dashboard.cooperation.completions.accept', ['id' => encrypt_id($data->id)]); + + $rejectUrl = route('dashboard.cooperation.completions.reject', ['mediaOrderId' => encrypt_id($mediaOrder->id), 'id' => encrypt_id($data->id)]); + + $dropdown = '
+ +
+
    +
  • Detail
    • '; + + if (is_role(['1']) && $data->status === '0') { + $dropdown .= '
  • Terima
    • '; + } + + if (is_role(['1']) && $data->status === '0') { + $dropdown .= '
  • Tolak
    • '; + } + + $dropdown .= '
+
+
'; + + return $dropdown; + }) + + ->rawColumns(['status', 'action']) + ->make(true); + } + + return response()->json(['error' => 'Unauthorized'], 401); + + } + public function contentRecap(Request $request){ if ($request->ajax()) { diff --git a/app/Http/Controllers/Dashboard/MediaCooperationController.php b/app/Http/Controllers/Dashboard/MediaCooperationController.php index c4e659e..ed277a0 100644 --- a/app/Http/Controllers/Dashboard/MediaCooperationController.php +++ b/app/Http/Controllers/Dashboard/MediaCooperationController.php @@ -163,70 +163,69 @@ public function mediaProposalRejectAction(Request $request, $id, $proposalId){ public function process($id, $process, $paramMediaId = null){ $mediaCooperation = Cooperation::with(['media', 'mediaOrder.media'])->findOrFail(decrypt_id($id)); + $data = [ - 'title' => 'Detail Kerjasama', 'process' => $process, 'mediaCooperation' => $mediaCooperation, + 'mediaOrder' => $mediaCooperation->mediaOrder, + 'mediaId' => is_role(['3']) ? Auth::user()->company->media->id : null ]; + if(is_role(['3'])){ + $reports = $data['mediaOrder']->reports->filter(function ($reports) use ($data) { + return $reports->media_id == Auth::user()->company->media->id; + }); + + if(filled($reports)){ + $data['isAllReportsAccepted'] = $reports->every(function ($item) { + return $item->status === '1'; + }); + $data['isHaveReports'] = true; + }else{ + $data['isAllReportsAccepted'] = false; + $data['isHaveReports'] = false; + } + } + + // Tab Kerjasama if($process === 'cooperation'){ $data['title'] = 'Detail Kerjasama'; - $data['mediaOrder'] = $mediaCooperation->mediaOrder; if(is_role(['3'])){ - $mediaId = Auth::user()->company->media->id; - $mediaOrder = $mediaCooperation->mediaOrder; - $mediaOrderSafe = $mediaOrder ? $mediaOrder->media->where('id', $mediaId)->first() : null; + $mediaOrderSafe = $data['mediaOrder'] ? $data['mediaOrder']->media->where('id', $data['mediaId'])->first() : null; + if($mediaOrderSafe){ $data['mediaOrderPivot'] = $mediaOrderSafe->pivot; } - $data['isHaveReports'] = false; - $data['isAllReportsWaiting'] = true; } return view('dashboard.media-cooperations.processes.cooperations.index', $data); + + // Tab Media order }else if($process === 'media-order'){ $data['title'] = 'Media Order'; if(is_role(['3'])){ - $data['mediaOrder'] = $mediaCooperation->mediaOrder; - $mediaId = Auth::user()->company->media->id; - $data['mediaOrderPivot'] = $mediaCooperation->mediaOrder->media->where('id', $mediaId)->first()->pivot; - $data['isHaveReports'] = false; - $data['isAllReportsWaiting'] = true; - }else{ - $data['mediaOrder'] = $mediaCooperation->mediaOrder; + $data['mediaOrderPivot'] = $data['mediaOrder']->media->where('id', $data['mediaId'])->first()->pivot; } return view('dashboard.media-cooperations.processes.media-orders.index', $data); + + // Tab laporan }else if($process === 'reports'){ - $data['title'] = 'Media Order'; + $data['title'] = 'Laporan'; if(is_role(['3'])){ - $mediaOrderModel = $mediaCooperation->mediaOrder; - $data['mediaOrder'] = $mediaOrderModel; - $mediaId = Auth::user()->company->media->id; - $data['mediaOrderPivot'] = $mediaOrderModel->media->where('id', $mediaId)->first()->pivot; + $data['mediaOrderPivot'] = $data['mediaOrder']->media->where('id', $data['mediaId'])->first()->pivot; $data['reporterMediaId'] = Auth::user()->company->media->id; - $report = $mediaOrderModel->reports->filter(function ($report) use ($data) { - return $report->media_id == Auth::user()->company->media->id; - }); - if(filled($report)){ - $isAllReportsAccepted = $report->every(function ($item) { - return $item->status === '1'; - }); - }else{ - $isAllReportsAccepted = false; - } - - $reportCount = $report->count(); - $data['isHaveReports'] = $reportCount != 0; - $data['isAllReportsAccepted'] = $isAllReportsAccepted; + $reportCount = $reports->count(); $data['reportCount'] = $reportCount; - if($reportCount === $mediaOrderModel->required_reports){ + $data['cooperationCompletion'] = $data['mediaOrder']->completions()->where('media_id', $data['mediaId'])->first(); + + if($reportCount === $data['mediaOrder']->required_reports){ $data['isReportsCompleted'] = true; }else{ $data['isReportsCompleted'] = false; @@ -244,6 +243,40 @@ public function process($id, $process, $paramMediaId = null){ return view('dashboard.media-cooperations.processes.reports.index-media', $data); } } + + // Tab Selesai + }else if($process === 'completion'){ + $data['title'] = 'Penyelesaian'; + + $data['isHaveReports'] = true; + $data['isAllReportsAccepted'] = true; + + $data['cooperationCompletion'] = $data['mediaOrder']->completions()->where('media_id', $data['mediaId'])->first(); + + if(is_role(['3'])){ + $data['mediaOrderPivot'] = $data['mediaOrder']->media->where('id', $data['mediaId'])->first()->pivot; + return view('dashboard.media-cooperations.processes.completions.index-media', $data); + }else{ + abort(404); + } + + } + else if($process === 'completions'){ + $data['title'] = 'Penyelesaian'; + + $data['isHaveReports'] = true; + $data['isAllReportsAccepted'] = true; + + $data['cooperationCompletion'] = $data['mediaOrder']->completions()->where('media_id', $data['mediaId'])->first(); + + if(is_role(['1'])){ + return view('dashboard.media-cooperations.processes.completions.index-admin', $data); + }else{ + abort(404); + } + + }else{ + abort(404); } } diff --git a/app/Http/Requests/CooperationCompletionRequest.php b/app/Http/Requests/CooperationCompletionRequest.php new file mode 100644 index 0000000..a0dfbe6 --- /dev/null +++ b/app/Http/Requests/CooperationCompletionRequest.php @@ -0,0 +1,53 @@ +|string> + */ + public function rules(): array + { + return [ + 'payment_request_letter' => ['required', 'file', 'mimes:pdf', 'max:2048'], + 'invoice' => ['required', 'file', 'mimes:pdf', 'max:2048'], + 'other_document' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'description' => ['nullable'], + ]; + } + + public function messages(): array + { + return [ + 'payment_request_letter.required' => 'Surat permohonan pembayaran wajib diunggah.', + 'payment_request_letter.file' => 'Surat permohonan pembayaran harus berupa file yang valid.', + 'payment_request_letter.mimes' => 'Surat permohonan pembayaran harus berformat PDF.', + 'payment_request_letter.max' => 'Ukuran surat permohonan pembayaran tidak boleh lebih dari 2MB.', + + 'invoice.required' => 'Invoice/Tagihan wajib diunggah.', + 'invoice.file' => 'Invoice/Tagihan harus berupa file yang valid.', + 'invoice.mimes' => 'Invoice/Tagihan harus berformat PDF.', + 'invoice.max' => 'Ukuran Invoice/Tagihan tidak boleh lebih dari 2MB.', + + 'other_document.required' => 'Dokumen lainnya wajib diunggah.', + 'other_document.file' => 'Dokumen lainnya harus berupa file yang valid.', + 'other_document.mimes' => 'Dokumen lainnya harus berformat PDF.', + 'other_document.max' => 'Ukuran dokumen lainnya tidak boleh lebih dari 2MB.', + ]; + } + +} diff --git a/app/Models/CooperationCompletion.php b/app/Models/CooperationCompletion.php new file mode 100644 index 0000000..00534d1 --- /dev/null +++ b/app/Models/CooperationCompletion.php @@ -0,0 +1,29 @@ +belongsTo(Order::class, 'order_id', 'id'); + } + + public function media(){ + return $this->belongsTo(Media::class, 'media_id', 'id'); + } +} diff --git a/app/Models/Media.php b/app/Models/Media.php index 5e26c2c..3f57889 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -61,4 +61,8 @@ public function orders() public function reports(){ return $this->hasMany(Report::class, 'media_id', 'id'); } + + public function completions(){ + return $this->hasMany(CooperationCompletion::class, 'order_id', 'id'); + } } diff --git a/app/Models/Order.php b/app/Models/Order.php index 58bdd7f..e4f4a22 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -36,4 +36,8 @@ public function cooperation(){ public function reports(){ return $this->hasMany(Report::class, 'order_id', 'id'); } + + public function completions(){ + return $this->hasMany(CooperationCompletion::class, 'order_id', 'id'); + } } diff --git a/database/migrations/2025_03_17_072048_create_cooperation_completions_table.php b/database/migrations/2025_03_17_072048_create_cooperation_completions_table.php new file mode 100644 index 0000000..cdfb28f --- /dev/null +++ b/database/migrations/2025_03_17_072048_create_cooperation_completions_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('payment_request_letter'); + $table->string('invoice'); + $table->string('other_document')->nullable(); + $table->text('description')->nullable(); + $table->enum('status', ['0', '1', '2', '3'])->default('0'); + $table->text('rejection_reason')->nullable(); + $table->unsignedBigInteger('media_id'); + $table->unsignedBigInteger('order_id'); + $table->foreign('media_id')->references('id')->on('media'); + $table->foreign('order_id')->references('id')->on('orders'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('cooperation_completions'); + } +}; diff --git a/database/seeders/CooperationCompletionSeeder.php b/database/seeders/CooperationCompletionSeeder.php new file mode 100644 index 0000000..6a5de83 --- /dev/null +++ b/database/seeders/CooperationCompletionSeeder.php @@ -0,0 +1,17 @@ + 'cooperations']) +@include('partials.dashboard.header') + +
+
+
+
+
+
+
+
+ +
+
+ {{--
+
Personal Information
+

Basic info, like your name and address, that you use on Nio Platform.

+
--}} +
+
+
+ Nama Kegiatan + {{$cooperationCompletion->order->cooperation->name}} +
+
+
+
+ Media + {{$cooperationCompletion->media->name}} +
+
+
+
+ Diunggah Pada + {{idn_date($cooperationCompletion->created_at, 'l, d F Y')}} +
+
+
+
+ Status + + @if ($cooperationCompletion->status === '0') + Menunggu + @elseif($cooperationCompletion->status === '1') + Menerima + @elseif($cooperationCompletion->status === '2') + Menolak + @else + Tidak Diketahui + @endif + +
+
+
+
+ {{--
--}} +
+
+ Deskripsi +
+
+
+
+ {!!$cooperationCompletion->description!!} +
+
+
+
+
+
+ +
Surat Permohonan Pembayaran
+ + +
+
+
+
+
+ @if (filled($cooperationCompletion->payment_request_letter)) + + @else + - + @endif +
+
+
+
+
+
+
+ +
Invoice/Tagihan
+ + +
+
+
+
+
+ @if (filled($cooperationCompletion->invoice)) + + @else + - + @endif +
+
+
+
+
+
+
+ +
Dokumen Lainnya
+ + +
+
+
+
+
+ @if (filled($cooperationCompletion->invoice)) + + @else + Tidak ada + @endif +
+
+
+
+
+
+
+
+
+
+
+
+ +
+ {{-- {{dd($mediaCooperationPivot->status != '0')}} --}} +
+ @csrf +
+ + @if ($cooperationCompletion->status === '0') +
+ +
+ @elseif ($cooperationCompletion->status === '2') +
+
+
+ {!!$cooperationCompletion->rejection_reason!!} +
+
+
+ @endif +
+
+
+ Kembali + @if ($cooperationCompletion->status !== '2') + + @endif +
+
+
+
+
+
+
+
+
+ +@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/cooperation-completions/show.blade.php b/resources/views/dashboard/cooperation-completions/show.blade.php new file mode 100644 index 0000000..7c530fc --- /dev/null +++ b/resources/views/dashboard/cooperation-completions/show.blade.php @@ -0,0 +1,193 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'cooperations']) +@include('partials.dashboard.header') + +
+
+
+
+
+
+
+
+ +
+
+ {{--
+
Personal Information
+

Basic info, like your name and address, that you use on Nio Platform.

+
--}} +
+
+
+ Nama Kegiatan + {{$cooperationCompletion->order->cooperation->name}} +
+
+
+
+ Media + {{$cooperationCompletion->media->name}} +
+
+
+
+ Diunggah Pada + {{idn_date($cooperationCompletion->created_at, 'l, d F Y')}} +
+
+
+
+ Status + + @if ($cooperationCompletion->status === '0') + Menunggu + @elseif($cooperationCompletion->status === '1') + Diterima + @elseif($cooperationCompletion->status === '2') + Ditolak + @else + Tidak Diketahui + @endif + +
+
+
+
+ {{--
--}} +
+
+ Deskripsi +
+
+
+
+ {!!$cooperationCompletion->description!!} +
+
+
+
+
+
+ +
Surat Permohonan Pembayaran
+ + +
+
+
+
+
+ @if (filled($cooperationCompletion->payment_request_letter)) + + @else + - + @endif +
+
+
+
+
+
+
+ +
Invoice/Tagihan
+ + +
+
+
+
+
+ @if (filled($cooperationCompletion->invoice)) + + @else + - + @endif +
+
+
+
+
+
+
+ +
Dokumen Lainnya
+ + +
+
+
+
+
+ @if (filled($cooperationCompletion->invoice)) + + @else + Tidak ada + @endif +
+
+
+
+
+
+
+ @if ($cooperationCompletion->status !== '2') +
+
+ Kembali +
+ @endif +
+
+
+
+ @if ($cooperationCompletion->status === '2') +
+ +
+ {{-- {{dd($mediaCooperationPivot->status != '0')}} --}} +
+ @csrf +
+ +
+
+
+ {!!$cooperationCompletion->rejection_reason!!} +
+
+
+
+
+
+ Kembali +
+
+
+
+ @endif +
+
+
+
+
+ +@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/media-cooperations/processes/completions/index-admin.blade.php b/resources/views/dashboard/media-cooperations/processes/completions/index-admin.blade.php new file mode 100644 index 0000000..5a75889 --- /dev/null +++ b/resources/views/dashboard/media-cooperations/processes/completions/index-admin.blade.php @@ -0,0 +1,52 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'cooperations']) +@include('partials.dashboard.header') + +
+
+
+
+
+
+
+ @include('dashboard.media-cooperations.processes.tab') +
+
+
+ +
+
+ + + + + + + + + + + +
NoNama MediaNama PerusahaanEmailStatus
+
+
+
+
+
+ Kembali +
+
+
+
+
+
+
+
+
+
+ +@include('partials.dashboard.footer', ['rich_editor' => false, 'datatable' => 'admin_completion']) diff --git a/resources/views/dashboard/media-cooperations/processes/completions/index-media.blade.php b/resources/views/dashboard/media-cooperations/processes/completions/index-media.blade.php new file mode 100644 index 0000000..511c55e --- /dev/null +++ b/resources/views/dashboard/media-cooperations/processes/completions/index-media.blade.php @@ -0,0 +1,196 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'cooperations']) +@include('partials.dashboard.header') + +
+
+
+
+
+
+
+ @include('dashboard.media-cooperations.processes.tab') +
+
+
+ @if (is_role(['3'])) + +
+ @if (!$cooperationCompletion) +
+ @csrf +
+
+
+ +
+ +
+ @error('payment_request_letter') + {{$message}} + @enderror +
+
+
+
+ +
+ +
+ @error('invoice') + {{$message}} + @enderror +
+
+
+
+ +
+ +
+ @error('other_document') + {{$message}} + @enderror +
+
+
+
+ +
+ +
+
+
+
+
+ Kembali + +
+
+
+
+ @else +
+ {{--
+
Personal Information
+

Basic info, like your name and address, that you use on Nio Platform.

+
--}} +
+
+
+ Surat Permohonan Pembayaran + + @if ($cooperationCompletion->payment_request_letter) + Lihat + Unduh + @else + - + @endif + +
+
+
+
+ Invoice/Tagihan + + @if ($cooperationCompletion->invoice) + Lihat + Unduh + @else + - + @endif + +
+
+
+
+ Dokumen Lainnya + + @if (filled($cooperationCompletion->other_document)) + Lihat + Unduh + @else + - + @endif + +
+
+
+
+ Tanggal + {{idn_date($cooperationCompletion->created_at, 'l, d F Y')}} +
+
+
+
+ Status + + @if ($cooperationCompletion->status === '0') + Menunggu + @elseif($cooperationCompletion->status === '1') + Diterima + @elseif($cooperationCompletion->status === '2') + Ditolak + @else + Tidak Diketahui + @endif + +
+
+
+
+
+
+ Deskripsi +
+
+
+
+ {!!$cooperationCompletion->description ?? '-' !!} +
+
+
+
+ @if ($cooperationCompletion->status === '2') +
+
+ Alasam Penolakan +
+
+
+
+ {!!$cooperationCompletion->rejection_reason ?? '-' !!} +
+
+
+
+ @endif +
+
+ Kembali +
+ @endif +
+ @endif +
+ {{--
+ Kembali + @if (!$mediaOrder && is_role(['1'])) + Buat Media Order + @endif +
--}} +
+
+
+
+
+
+
+
+
+ +@include('partials.dashboard.footer', ['rich_editor' => true]) diff --git a/resources/views/dashboard/media-cooperations/processes/reports/index-media.blade.php b/resources/views/dashboard/media-cooperations/processes/reports/index-media.blade.php index a28b174..96adca9 100644 --- a/resources/views/dashboard/media-cooperations/processes/reports/index-media.blade.php +++ b/resources/views/dashboard/media-cooperations/processes/reports/index-media.blade.php @@ -50,8 +50,12 @@ Buat Laporan @endif - @if ($isAllReportsAccepted) - Selesaikan + @if ($isAllReportsAccepted && !$cooperationCompletion) + Selesaikan + @elseif($isReportsCompleted && !$cooperationCompletion) + + + @endif @else diff --git a/resources/views/dashboard/media-cooperations/processes/tab.blade.php b/resources/views/dashboard/media-cooperations/processes/tab.blade.php index 5f040b9..3869eaf 100644 --- a/resources/views/dashboard/media-cooperations/processes/tab.blade.php +++ b/resources/views/dashboard/media-cooperations/processes/tab.blade.php @@ -19,7 +19,7 @@ Laporan
  • - + @if (!$mediaOrder) @endif @@ -36,7 +36,7 @@ Laporan
  • - + @if (!isset($mediaOrder)) @elseif (!$isHaveReports || !$isAllReportsAccepted) diff --git a/resources/views/partials/app/datatable.blade.php b/resources/views/partials/app/datatable.blade.php index 519cf25..89546b0 100644 --- a/resources/views/partials/app/datatable.blade.php +++ b/resources/views/partials/app/datatable.blade.php @@ -582,7 +582,35 @@ ], language: datatableLanguage, autoWidth: false, - order: [[4, 'desc']], + order: [[5, 'desc']], + pagingType: "simple", + lengthMenu: [[10, 25, 50, 100, -1], ['Tampilkan 10 data', 'Tampilkan 25 data', 'Tampilkan 50 data', 'Tampilkan 100 data', 'Tampilkan semua']], + scrollX: true + }); + }); + +@endif + +@if ($datatable === 'admin_completion') +