diff --git a/app/Http/Controllers/Dashboard/DatatableController.php b/app/Http/Controllers/Dashboard/DatatableController.php index fdd93e2..c3e01e4 100644 --- a/app/Http/Controllers/Dashboard/DatatableController.php +++ b/app/Http/Controllers/Dashboard/DatatableController.php @@ -1280,9 +1280,13 @@ class="text-dark" public function adminMediaReport(Request $request, $id){ if ($request->ajax()) { - $mediaOrder = Order::with(['reports', 'media.reports'])->findOrFail(decrypt_id($id)); + $mediaOrder = Order::with(['reports', 'media'])->findOrFail(decrypt_id($id)); - $data = $mediaOrder->media; + $data = $mediaOrder->media() + ->where(function ($query) { + $query->where('media_orders.status', '=', '1'); + }) + ->get(); return DataTables::of($data) ->addIndexColumn() diff --git a/app/Models/CooperationProposal.php b/app/Models/CooperationProposal.php index 5547f75..3a17943 100644 --- a/app/Models/CooperationProposal.php +++ b/app/Models/CooperationProposal.php @@ -14,7 +14,7 @@ class CooperationProposal extends Model 'description', 'attachment', 'status', - 'rejection_reasons', + 'rejection_reason', 'cooperation_id', 'media_id', ]; 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 27de5b8..40ca781 100644 --- a/resources/views/dashboard/cooperation-requests/media-proposals/show.blade.php +++ b/resources/views/dashboard/cooperation-requests/media-proposals/show.blade.php @@ -322,12 +322,43 @@ + @if ($proposal->status !== '2')
Kembali
+ @endif + @if ($proposal->status === '2') +
+ +
+ {{-- {{dd($mediaCooperationPivot->status != '0')}} --}} +
+ @csrf +
+ +
+
+
+ {!!$proposal->rejection_reason!!} +
+
+
+
+
+
+ Kembali +
+
+
+
+ @endif diff --git a/resources/views/dashboard/media-cooperations/media-proposals/reject.blade.php b/resources/views/dashboard/media-cooperations/media-proposals/reject.blade.php index 987bcd4..1511d6e 100644 --- a/resources/views/dashboard/media-cooperations/media-proposals/reject.blade.php +++ b/resources/views/dashboard/media-cooperations/media-proposals/reject.blade.php @@ -346,7 +346,7 @@
- {!!$mediaCooperationPivot->rejection_reason!!} + {!!$proposal->rejection_reason!!}
diff --git a/resources/views/dashboard/media-cooperations/processes/media-orders/index.blade.php b/resources/views/dashboard/media-cooperations/processes/media-orders/index.blade.php index 89c082f..9b6bee3 100644 --- a/resources/views/dashboard/media-cooperations/processes/media-orders/index.blade.php +++ b/resources/views/dashboard/media-cooperations/processes/media-orders/index.blade.php @@ -112,6 +112,7 @@ @if (is_role(['3']) && $mediaOrderPivot->status === '2') +
Alasan Menolak