chore: filtering reports only media accepted media order
This commit is contained in:
parent
cd456ff530
commit
14c6530855
@ -1280,9 +1280,13 @@ class="text-dark"
|
|||||||
|
|
||||||
public function adminMediaReport(Request $request, $id){
|
public function adminMediaReport(Request $request, $id){
|
||||||
if ($request->ajax()) {
|
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)
|
return DataTables::of($data)
|
||||||
->addIndexColumn()
|
->addIndexColumn()
|
||||||
|
|||||||
@ -14,7 +14,7 @@ class CooperationProposal extends Model
|
|||||||
'description',
|
'description',
|
||||||
'attachment',
|
'attachment',
|
||||||
'status',
|
'status',
|
||||||
'rejection_reasons',
|
'rejection_reason',
|
||||||
'cooperation_id',
|
'cooperation_id',
|
||||||
'media_id',
|
'media_id',
|
||||||
];
|
];
|
||||||
|
|||||||
@ -322,12 +322,43 @@
|
|||||||
</div><!-- .nk-block -->
|
</div><!-- .nk-block -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@if ($proposal->status !== '2')
|
||||||
<hr>
|
<hr>
|
||||||
<div class="nk-block d-flex justify-content-end">
|
<div class="nk-block d-flex justify-content-end">
|
||||||
<a href="{{route('dashboard.cooperations.requests.media.proposals')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
|
<a href="{{route('dashboard.cooperations.requests.media.proposals')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
|
||||||
</div><!-- .nk-block -->
|
</div><!-- .nk-block -->
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@if ($proposal->status === '2')
|
||||||
|
<div class="card card-bordered card-preview">
|
||||||
|
<ul class="nav nav-tabs nav-tabs-mb-icon nav-tabs-card">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link text-warning" href="#"><em class="icon ni ni-na"></em><span>Data Penolakan</span></a>
|
||||||
|
</li>
|
||||||
|
</ul><!-- .nav-tabs -->
|
||||||
|
<div class="card-inner">
|
||||||
|
{{-- {{dd($mediaCooperationPivot->status != '0')}} --}}
|
||||||
|
<form action="#" method="post">
|
||||||
|
@csrf
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label" for="rejection_reason">Alasan Menolak</label>
|
||||||
|
<div class="bq-note">
|
||||||
|
<div class="bq-note-item">
|
||||||
|
<div class="bq-note-text">
|
||||||
|
{!!$proposal->rejection_reason!!}
|
||||||
|
</div>
|
||||||
|
</div><!-- .bq-note-item -->
|
||||||
|
</div><!-- .bq-note -->
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
<div class="nk-block d-flex justify-content-end">
|
||||||
|
<a href="{{route('dashboard.cooperations.requests.media.proposals')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
|
||||||
|
</div><!-- .nk-block -->
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -346,7 +346,7 @@
|
|||||||
<div class="bq-note">
|
<div class="bq-note">
|
||||||
<div class="bq-note-item">
|
<div class="bq-note-item">
|
||||||
<div class="bq-note-text">
|
<div class="bq-note-text">
|
||||||
{!!$mediaCooperationPivot->rejection_reason!!}
|
{!!$proposal->rejection_reason!!}
|
||||||
</div>
|
</div>
|
||||||
</div><!-- .bq-note-item -->
|
</div><!-- .bq-note-item -->
|
||||||
</div><!-- .bq-note -->
|
</div><!-- .bq-note -->
|
||||||
|
|||||||
@ -112,6 +112,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@if (is_role(['3']) && $mediaOrderPivot->status === '2')
|
@if (is_role(['3']) && $mediaOrderPivot->status === '2')
|
||||||
|
<hr>
|
||||||
<div class="nk-block">
|
<div class="nk-block">
|
||||||
<div class="nk-block-head nk-block-head-sm nk-block-between">
|
<div class="nk-block-head nk-block-head-sm nk-block-between">
|
||||||
<span class="profile-ud-label">Alasan Menolak</span>
|
<span class="profile-ud-label">Alasan Menolak</span>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user