diff --git a/app/Http/Controllers/Dashboard/CooperationRequestController.php b/app/Http/Controllers/Dashboard/CooperationRequestController.php
index 7483df1..e2a1a81 100644
--- a/app/Http/Controllers/Dashboard/CooperationRequestController.php
+++ b/app/Http/Controllers/Dashboard/CooperationRequestController.php
@@ -66,7 +66,7 @@ public function accept(Request $request, $id){
// dd($mediaCooperation->pivot);
// Pastikan data yang ingin diperbarui ada dan statusnya belum '3'
- if ($mediaCooperation->pivot->status != '3') {
+ if ($mediaCooperation->pivot->status == '0') {
$affectedRows = $cooperation->media()->updateExistingPivot($mediaCooperation->id, [
'status' => '1',
]);
@@ -74,7 +74,7 @@ public function accept(Request $request, $id){
if ($affectedRows > 0) {
return redirect()->back()->with('success-status', 'Berhasil menerima kerjasama.');
} else {
- return redirect()->back()->with('failed-status', 'Gagal menerima kerjasama');
+ return redirect()->back()->with('failed-status', 'Gagal menerima kerjasama.');
}
} else {
return redirect()->back()->with('failed-status', 'Kerjasama sudah diterima sebelumnya.');
@@ -82,14 +82,14 @@ public function accept(Request $request, $id){
}
- public function proposal($id){
+ public function createProposal($id){
$cooperation = Cooperation::with(['media'])->findOrFail(decrypt_id($id));
$mediaCooperationPivot = $cooperation->media()
->where('media.id', Auth::user()->company->media->id)
->first()->pivot;
- return view('dashboard.cooperation-requests.proposal', [
+ return view('dashboard.cooperation-requests.create-proposal', [
'title' => 'Ajukan Kerjasama',
'user' => Auth::user(),
'cooperation' => $cooperation,
@@ -97,7 +97,7 @@ public function proposal($id){
]);
}
- public function proposalAction(JournalistCooperationProposalRequest $request, $id){
+ public function storeProposal(JournalistCooperationProposalRequest $request, $id){
$validatedData = $request->validated();
$validatedData['cooperation_id'] = decrypt_id($id);
$validatedData['media_id'] = Auth::user()->company->media->id;
diff --git a/app/Http/Controllers/Dashboard/DatatableController.php b/app/Http/Controllers/Dashboard/DatatableController.php
index ce17373..a1be8b0 100644
--- a/app/Http/Controllers/Dashboard/DatatableController.php
+++ b/app/Http/Controllers/Dashboard/DatatableController.php
@@ -16,7 +16,9 @@
use App\Models\Location;
use App\Models\Media;
use App\Models\MediaMonitoring;
+use App\Models\MediaOrder;
use App\Models\News;
+use App\Models\Order;
use App\Models\Role;
use App\Models\SubClassification;
use App\Models\SubLocation;
@@ -812,7 +814,16 @@ public function journalist(Request $request){
public function cooperation(Request $request){
if ($request->ajax()) {
- $data = Cooperation::with(['media'])->get();
+ if(is_role(['1'])){
+ $data = Cooperation::with(['media', 'mediaOrder'])->get();
+ }else if(is_role(['3'])){
+ $mediaId = Auth::user()->company->media->id;
+ $media = Media::findOrFail($mediaId);
+ $data = $media->cooperations->filter(function ($cooperation) use ($mediaId){
+ // Filter cooperation berdasarkan status proposal yang 1
+ return $cooperation->proposals->where('status', 1)->where('media_id', $mediaId)->isNotEmpty();
+ });
+ }
return DataTables::of($data)
@@ -820,18 +831,33 @@ public function cooperation(Request $request){
->addColumn('name', function ($data) {
return '
' . $data->name . '
';
})
- ->addColumn('start_date', function ($data) {
- return idn_date($data->start_date, 'l, d F Y');
- })
- ->addColumn('end_date', function ($data) {
- return idn_date($data->end_date, 'l, d F Y');
- })
+ // ->addColumn('start_date', function ($data) {
+ // return idn_date($data->start_date, 'l, d F Y');
+ // })
+ // ->addColumn('end_date', function ($data) {
+ // return idn_date($data->end_date, 'l, d F Y');
+ // })
->addColumn('posted_at', function ($data) {
return idn_date($data->created_at, 'l, d F Y');
})
+ ->addColumn('status', function ($data) {
+ $isHaveMediaOrder = !is_null($data->mediaOrder);
+ if ($isHaveMediaOrder) {
+ return '
- Detail
';
+ if (is_role([1, 3])) {
+ $dropdown .= '- Proses
';
+ }
+
+ if (is_role([1]) && !$isHaveMediaOrder) {
+ $dropdown .= '- Buat Media Order
';
+ }
+
if (is_role([1])) {
$dropdown .= '- Data Pengajuan
';
}
@@ -864,7 +898,7 @@ public function cooperation(Request $request){
return $dropdown;
})
- ->rawColumns(['name', 'action'])
+ ->rawColumns(['status', 'name', 'action'])
->make(true);
}
@@ -1192,6 +1226,55 @@ public function mediaProposal(Request $request){
}
+ public function orderMedia(Request $request, $id){
+ if ($request->ajax()) {
+ $cooperation = Cooperation::with(['media', 'mediaOrder.media'])->where('id', '=', decrypt_id($id))->first();
+
+ $data = $cooperation->mediaOrder->media;
+
+ return DataTables::of($data)
+ ->addIndexColumn()
+ ->addColumn('media_name', function ($data) {
+ return $data->name;
+ })
+ ->addColumn('company_name', function ($data) {
+ return $data->company->name;
+ })
+ ->addColumn('email', function ($data) {
+ return $data->company->email;
+ })
+ ->addColumn('type', function ($data) {
+ return ucfirst($data->type);
+ })
+ ->addColumn('classification', function ($data) {
+ return ucfirst($data->classification);
+ })
+ ->addColumn('status', function ($data) use ($cooperation) {
+ switch($data->pivot->status){
+ case 0:
+ return 'Menunggu';
+ case 1:
+ return 'Menerima';
+ case 2:
+ return 'Menolak
+
+ ';
+ case 3:
+ return 'Tidak Diketahui';
+ }
+ })
+
+ ->rawColumns(['link', 'address', 'status'])
+ ->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 2bf8cc6..334ca80 100644
--- a/app/Http/Controllers/Dashboard/MediaCooperationController.php
+++ b/app/Http/Controllers/Dashboard/MediaCooperationController.php
@@ -7,6 +7,7 @@
use App\Models\Cooperation;
use App\Models\CooperationProposal;
use App\Models\Media;
+use App\Models\MediaOrder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -160,5 +161,43 @@ public function mediaProposalRejectAction(Request $request, $id, $proposalId){
}
+ public function process($id, $process){
+ $mediaCooperation = Cooperation::with(['media', 'mediaOrder.media'])->findOrFail(decrypt_id($id));
+ $data = [
+ 'title' => 'Detail Kerjasama',
+ 'process' => $process,
+ 'mediaCooperation' => $mediaCooperation,
+ ];
+
+ if($process === 'cooperation'){
+ $data['title'] = 'Detail Kerjasama';
+ $data['mediaOrder'] = $mediaCooperation->mediaOrder;
+
+ if(is_role(['3'])){
+ $mediaId = Auth::user()->company->media->id;
+ $mediaOrder = $mediaCooperation->mediaOrder->media->where('id', $mediaId)->first();
+ if($mediaOrder){
+ $data['mediaOrderPivot'] = $mediaOrder->pivot;
+ }else{
+ return redirect()->back()->with('warning-status', 'Mohon maaf, admin telah menerbitkan media order!');
+ }
+ }
+
+ return view('dashboard.media-cooperations.processes.cooperations.index', $data);
+ }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;
+ }else{
+ $data['mediaOrder'] = $mediaCooperation->mediaOrder;
+ }
+
+ return view('dashboard.media-cooperations.processes.media-orders.index', $data);
+ }
+ }
+
public function destroy(){}
}
diff --git a/app/Http/Controllers/Dashboard/MediaOrderController.php b/app/Http/Controllers/Dashboard/MediaOrderController.php
new file mode 100644
index 0000000..25b2807
--- /dev/null
+++ b/app/Http/Controllers/Dashboard/MediaOrderController.php
@@ -0,0 +1,154 @@
+proposals->where('status', '1')->pluck('media_id');
+
+ return view('dashboard.media-orders.create', [
+ 'title' => 'Buat Media Order',
+ 'cooperation' => $cooperation,
+ 'media' => Media::all(),
+ 'acceptedMedia' => $media
+ ]);
+ }
+
+ public function store(OrderRequest $request, $id){
+ $validatedData = $request->validated();
+ $validatedData['enhancer_id'] = Auth::id();
+ $validatedData['image'] = store_file($validatedData['image'], '/uploads/media-orders', 'public')['randomFileName'];
+
+ $cooperation = Cooperation::findOrFail(decrypt_id($id));
+ $validatedData['cooperation_id'] = $cooperation->id;
+
+ $createdOrder = Order::create($validatedData);
+ $createdOrder->media()->attach($validatedData['media_ids']);
+
+ if ($createdOrder->media()->count() > 0) {
+ return redirect()->back()->with('success-status', 'Berhasil membuat media order.');
+ } else {
+ return redirect()->back()->with('failed-status', 'Gagal membuat media order');
+ }
+ }
+
+ public function edit($id){
+ // $cooperation = Cooperation::findOrFail(decrypt_id($id));
+
+ $mediaOrder = Order::findOrFail(decrypt_id($id));
+ $media = $mediaOrder->cooperation->proposals->where('status', '1')->pluck('media_id');
+
+ // dd($mediaOrder->media->pluck('id'));
+
+ return view('dashboard.media-orders.edit', [
+ 'title' => 'Buat Media Order',
+ 'cooperation' => $mediaOrder->cooperation,
+ 'mediaOrder' => $mediaOrder,
+ 'media' => Media::all(),
+ 'acceptedMedia' => $media,
+ 'acceptedMediaNow' => $mediaOrder->media->pluck('id')
+ ]);
+ }
+
+ public function update(OrderRequest $request, $id){
+ $validatedData = $request->validated();
+ $validatedData['enhancer_id'] = Auth::id();
+
+ $mediaOrder = Order::findOrFail(decrypt_id($id));
+
+ $validatedData['cooperation_id'] = $mediaOrder->cooperation_id;
+
+ if($request->hasFile('image')){
+ $validatedData['image'] = store_file($validatedData['image'], '/uploads/media-orders', 'public')['randomFileName'];
+
+ delete_file('app/public/uploads/media-orders/'.$mediaOrder->image);
+ }else{
+ $validatedData['image'] = $mediaOrder->image;
+ }
+
+ $mediaOrder->update($validatedData);
+
+ if ($request->has('media_ids')) {
+ $mediaOrder->media()->sync($validatedData['media_ids']);
+ }
+
+ if ($mediaOrder->media()->exists()) {
+ return redirect()->back()->with('success-status', 'Berhasil mengubah media order.');
+ } else {
+ return redirect()->back()->with('failed-status', 'Gagal mengubah media order');
+ }
+ }
+
+ public function accept(Request $request, $id){
+ if(!Auth::check() || Auth::user()->role_id !== 3){
+ return abort(403, 'Unauthorized action.');
+ }
+
+ $order = Order::with('media')->findOrFail(decrypt_id($id));
+
+ $mediaOrder = $order->media()
+ ->where('media.id', Auth::user()->company->media->id)
+ ->first();
+
+ if (!$mediaOrder) {
+ return abort(404, 'Media not found for the cooperation.');
+ }
+
+ if ($mediaOrder->pivot->status == '0') {
+ $affectedRows = $order->media()->updateExistingPivot($mediaOrder->id, [
+ 'status' => '1',
+ ]);
+
+ if ($affectedRows > 0) {
+ return redirect()->back()->with('success-status', 'Berhasil menerima media order.');
+ } else {
+ return redirect()->back()->with('failed-status', 'Gagal menerima media order.');
+ }
+ } else {
+ return redirect()->back()->with('failed-status', 'Kerjasama sudah diterima sebelumnya.');
+ }
+ }
+
+ public function reject(Request $request, $id){
+ $validatedData = $request->validate([
+ 'rejection_reason' => ['required'],
+ ], [
+ 'rejection_reason.required' => 'Alasan penolakan wajib diisi.',
+ ]);
+
+ $order = Order::with('media')->findOrFail(decrypt_id($id));
+
+ $mediaOrder = $order->media()
+ ->where('media.id', Auth::user()->company->media->id)
+ ->first();
+
+ if (!$mediaOrder) {
+ return abort(404, 'Media not found for the cooperation.');
+ }
+
+ if ($mediaOrder->pivot->status == '0') {
+ $affectedRows = $order->media()->updateExistingPivot($mediaOrder->id, [
+ 'status' => '2',
+ 'rejection_reason' => $validatedData['rejection_reason']
+ ]);
+
+ if ($affectedRows > 0) {
+ return redirect()->back()->with('success-status', 'Berhasil menolak media order.');
+ } else {
+ return redirect()->back()->with('failed-status', 'Gagal menolak media order.');
+ }
+ } else {
+ return redirect()->back()->with('failed-status', 'Kerjasama sudah diterima sebelumnya.');
+ }
+ }
+}
diff --git a/app/Http/Requests/OrderRequest.php b/app/Http/Requests/OrderRequest.php
new file mode 100644
index 0000000..72e0df1
--- /dev/null
+++ b/app/Http/Requests/OrderRequest.php
@@ -0,0 +1,35 @@
+|string>
+ */
+ public function rules(): array
+ {
+ return [
+ 'start_date' => ['required', 'date'],
+ 'end_date' => ['required', 'date'],
+ 'media_ids' => ['required', 'array'],
+ 'media_ids.*' => ['required', 'exists:media,id'],
+ 'image' => ['nullable', 'image', 'mimes:png,jpg,jpeg', 'max:2048'],
+ 'amount_report' => ['required', 'numeric', 'min:1', 'max:100'],
+ 'task_description' => ['required'],
+ ];
+ }
+}
diff --git a/app/Models/Cooperation.php b/app/Models/Cooperation.php
index d429e24..4c9c065 100644
--- a/app/Models/Cooperation.php
+++ b/app/Models/Cooperation.php
@@ -32,4 +32,8 @@ public function media()
public function proposals(){
return $this->hasMany(CooperationProposal::class, 'cooperation_id', 'id');
}
+
+ public function mediaOrder(){
+ return $this->hasOne(Order::class, 'cooperation_id', 'id');
+ }
}
diff --git a/app/Models/Media.php b/app/Models/Media.php
index 69303be..da55d45 100644
--- a/app/Models/Media.php
+++ b/app/Models/Media.php
@@ -34,6 +34,14 @@ public function journalists(){
return $this->hasMany(Journalist::class, 'media_id', 'id');
}
+ public function announcements()
+ {
+ return $this->belongsToMany(Announcement::class, 'announcements_media', 'media_id', 'announcement_id')
+ ->using(AnnouncementMedia::class)
+ ->withPivot(['status', 'category'])
+ ->withTimestamps();
+ }
+
public function cooperations()
{
return $this->belongsToMany(Cooperation::class, 'media_cooperations', 'media_id', 'cooperation_id')
@@ -42,11 +50,11 @@ public function cooperations()
->withTimestamps();
}
- public function announcements()
+ public function orders()
{
- return $this->belongsToMany(Announcement::class, 'announcements_media', 'media_id', 'announcement_id')
- ->using(AnnouncementMedia::class)
- ->withPivot(['status', 'category'])
+ return $this->belongsToMany(Order::class, 'media_orders', 'media_id', 'order_id')
+ ->using(MediaOrder::class)
+ ->withPivot(['status', 'rejection_reason'])
->withTimestamps();
}
}
diff --git a/app/Models/MediaOrder.php b/app/Models/MediaOrder.php
new file mode 100644
index 0000000..44419bc
--- /dev/null
+++ b/app/Models/MediaOrder.php
@@ -0,0 +1,26 @@
+belongsTo(Order::class, 'order_id', 'id');
+ }
+
+ public function media(){
+ return $this->belongsTo(Media::class, 'media_id', 'id');
+ }
+}
diff --git a/app/Models/Order.php b/app/Models/Order.php
new file mode 100644
index 0000000..134aea8
--- /dev/null
+++ b/app/Models/Order.php
@@ -0,0 +1,35 @@
+belongsToMany(Media::class, 'media_orders', 'order_id', 'media_id')
+ ->using(MediaOrder::class)
+ ->withPivot(['status', 'rejection_reason'])
+ ->withTimestamps();
+ }
+
+ public function cooperation(){
+ return $this->belongsTo(Cooperation::class, 'cooperation_id', 'id')->withTrashed();
+ }
+}
diff --git a/database/migrations/2025_03_11_072327_create_orders_table.php b/database/migrations/2025_03_11_072327_create_orders_table.php
new file mode 100644
index 0000000..c03e19b
--- /dev/null
+++ b/database/migrations/2025_03_11_072327_create_orders_table.php
@@ -0,0 +1,37 @@
+id();
+ $table->date('start_date');
+ $table->date('end_date');
+ $table->string('image')->nullable();
+ $table->text('task_description');
+ $table->integer('amount_report')->default(0);
+ $table->unsignedBigInteger('cooperation_id');
+ $table->unsignedBigInteger('enhancer_id');
+ $table->foreign('cooperation_id')->references('id')->on('cooperations');
+ $table->foreign('enhancer_id')->references('id')->on('users');
+ $table->timestamps();
+ $table->softDeletes();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::dropIfExists('orders');
+ }
+};
diff --git a/database/migrations/2025_03_11_072416_create_media_orders_table.php b/database/migrations/2025_03_11_072416_create_media_orders_table.php
new file mode 100644
index 0000000..340a526
--- /dev/null
+++ b/database/migrations/2025_03_11_072416_create_media_orders_table.php
@@ -0,0 +1,33 @@
+id();
+ $table->unsignedBigInteger('order_id');
+ $table->unsignedBigInteger('media_id');
+ $table->foreign('order_id')->references('id')->on('orders');
+ $table->foreign('media_id')->references('id')->on('media');
+ $table->enum('status', ['0', '1', '2', '3'])->default('0');
+ $table->text('rejection_reason')->nullable();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::dropIfExists('media_orders');
+ }
+};
diff --git a/database/seeders/OrderSeeder.php b/database/seeders/OrderSeeder.php
new file mode 100644
index 0000000..aa29f8e
--- /dev/null
+++ b/database/seeders/OrderSeeder.php
@@ -0,0 +1,17 @@
+
Tanggal
- {{idn_date($announcement->created_at, 'l, m F Y')}}
+ {{idn_date($announcement->created_at, 'l, d F Y')}}
diff --git a/resources/views/dashboard/announcements/show.blade.php b/resources/views/dashboard/announcements/show.blade.php
index f1dd3df..8614f42 100644
--- a/resources/views/dashboard/announcements/show.blade.php
+++ b/resources/views/dashboard/announcements/show.blade.php
@@ -31,7 +31,7 @@
Tanggal
- {{idn_date($announcement->created_at, 'l, m F Y')}}
+ {{idn_date($announcement->created_at, 'l, d F Y')}}
diff --git a/resources/views/dashboard/cooperation-requests/proposal.blade.php b/resources/views/dashboard/cooperation-requests/create-proposal.blade.php
similarity index 100%
rename from resources/views/dashboard/cooperation-requests/proposal.blade.php
rename to resources/views/dashboard/cooperation-requests/create-proposal.blade.php
diff --git a/resources/views/dashboard/cooperation-requests/reject.blade.php b/resources/views/dashboard/cooperation-requests/reject.blade.php
index ea8a927..4aab1d2 100644
--- a/resources/views/dashboard/cooperation-requests/reject.blade.php
+++ b/resources/views/dashboard/cooperation-requests/reject.blade.php
@@ -31,19 +31,19 @@
Diunggah Pada
- {{idn_date($cooperation->created_at, 'l, m F Y')}}
+ {{idn_date($cooperation->created_at, 'l, d F Y')}}
Tanggal Mulai Pengajuan
- {{idn_date($cooperation->start_date, 'l, m F Y')}}
+ {{idn_date($cooperation->start_date, 'l, d F Y')}}
Tanggal Akhir Pengajuan
- {{idn_date($cooperation->end_date, 'l, m F Y')}}
+ {{idn_date($cooperation->end_date, 'l, d F Y')}}
diff --git a/resources/views/dashboard/cooperation-requests/show.blade.php b/resources/views/dashboard/cooperation-requests/show.blade.php
index cade6cd..e4c19a1 100644
--- a/resources/views/dashboard/cooperation-requests/show.blade.php
+++ b/resources/views/dashboard/cooperation-requests/show.blade.php
@@ -31,19 +31,19 @@
Diunggah Pada
- {{idn_date($cooperation->created_at, 'l, m F Y')}}
+ {{idn_date($cooperation->created_at, 'l, d F Y')}}
Tanggal Mulai Pengajuan
- {{idn_date($cooperation->start_date, 'l, m F Y')}}
+ {{idn_date($cooperation->start_date, 'l, d F Y')}}
Tanggal Akhir Pengajuan
- {{idn_date($cooperation->end_date, 'l, m F Y')}}
+ {{idn_date($cooperation->end_date, 'l, d F Y')}}
diff --git a/resources/views/dashboard/issue-managements/create.blade.php b/resources/views/dashboard/issue-managements/create.blade.php
index 8efb2b5..e76c551 100644
--- a/resources/views/dashboard/issue-managements/create.blade.php
+++ b/resources/views/dashboard/issue-managements/create.blade.php
@@ -82,13 +82,13 @@
Tanggal Input
- {{idn_date($mediaMonitoring->created_at, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->created_at, 'l, d F Y')}}
Tanggal Rilis
- {{idn_date($mediaMonitoring->release_date, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->release_date, 'l, d F Y')}}
diff --git a/resources/views/dashboard/issue-managements/edit.blade.php b/resources/views/dashboard/issue-managements/edit.blade.php
index 01d2260..505ab66 100644
--- a/resources/views/dashboard/issue-managements/edit.blade.php
+++ b/resources/views/dashboard/issue-managements/edit.blade.php
@@ -82,13 +82,13 @@
Tanggal Input
- {{idn_date($mediaMonitoring->created_at, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->created_at, 'l, d F Y')}}
Tanggal Rilis
- {{idn_date($mediaMonitoring->release_date, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->release_date, 'l, d F Y')}}
diff --git a/resources/views/dashboard/issue-managements/show.blade.php b/resources/views/dashboard/issue-managements/show.blade.php
index 550b601..8f858cd 100644
--- a/resources/views/dashboard/issue-managements/show.blade.php
+++ b/resources/views/dashboard/issue-managements/show.blade.php
@@ -69,7 +69,7 @@
Tanggal Input
- {{idn_date($issueManagement->created_at, 'l, m F Y')}}
+ {{idn_date($issueManagement->created_at, 'l, d F Y')}}
@@ -158,13 +158,13 @@
Tanggal Input
- {{idn_date($mediaMonitoring->created_at, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->created_at, 'l, d F Y')}}
Tanggal Rilis
- {{idn_date($mediaMonitoring->release_date, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->release_date, 'l, d F Y')}}
diff --git a/resources/views/dashboard/media-cooperations/index.blade.php b/resources/views/dashboard/media-cooperations/index.blade.php
index 83f6489..3483883 100644
--- a/resources/views/dashboard/media-cooperations/index.blade.php
+++ b/resources/views/dashboard/media-cooperations/index.blade.php
@@ -46,9 +46,10 @@
| No |
Nama Kegiatan |
- Tanggal Mulai Pengajuan |
- Tanggal Akhir Pengajuan |
+ {{-- Tanggal Mulai Pengajuan |
+ Tanggal Akhir Pengajuan | --}}
Dibuat Pada |
+ Step/Status |
|
diff --git a/resources/views/dashboard/media-cooperations/processes/cooperations/index.blade.php b/resources/views/dashboard/media-cooperations/processes/cooperations/index.blade.php
new file mode 100644
index 0000000..3e90064
--- /dev/null
+++ b/resources/views/dashboard/media-cooperations/processes/cooperations/index.blade.php
@@ -0,0 +1,177 @@
+@include('partials.dashboard.head')
+@include('partials.dashboard.sidebar', ['page' => 'cooperations'])
+@include('partials.dashboard.header')
+
+
+
+
+
+
+
+
+ @include('dashboard.media-cooperations.processes.tab')
+
+
+
+
+
+
+ {{--
+
Personal Information
+
Basic info, like your name and address, that you use on Nio Platform.
+
--}}
+
+
+
+ Nama Kegiatan
+ {{$mediaCooperation->name}}
+
+
+
+
+ Diunggah Pada
+ {{idn_date($mediaCooperation->created_at, 'l, d F Y')}}
+
+
+
+
+ Tanggal Mulai Pengajuan
+ {{idn_date($mediaCooperation->start_date, 'l, d F Y')}}
+
+
+
+
+ Tanggal Akhir Pengajuan
+ {{idn_date($mediaCooperation->end_date, 'l, d F Y')}}
+
+
+ @if (is_role(['1']))
+
+ @endif
+
+
+ Status
+
+ @if ($mediaOrder)
+ Media Order
+ @else
+ Kerjasama
+ @endif
+
+
+
+
+
+ {{--
--}}
+
+
+ Deskripsi
+
+
+
+
+ {!!$mediaCooperation->description!!}
+
+
+
+
+
+
+
+ Banner
+
+
+
+
+
+
+
+ @if (filled($mediaCooperation->banner))
+
}})
+ @else
+ -
+ @endif
+
+
+
+
+
+
+
+
+ Template Pengajuan
+
+
+
+
+
+
+
+ @if (filled($mediaCooperation->offer_file_template))
+
+ @else
+ -
+ @endif
+
+
+
+
+
+
+
+
+ @if (is_role(['1']))
+
+
+ @endif
+
+
+
+
Kembali
+ @if (!$mediaOrder && is_role(['1']))
+
Buat Media Order
+ @endif
+
+
+
+
+
+
+
+
+
+
+
+@include('partials.dashboard.footer', ['rich_editor' => false, 'datatable' => 'cooperation_media'])
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
new file mode 100644
index 0000000..21c8382
--- /dev/null
+++ b/resources/views/dashboard/media-cooperations/processes/media-orders/index.blade.php
@@ -0,0 +1,201 @@
+@include('partials.dashboard.head')
+@include('partials.dashboard.sidebar', ['page' => 'cooperations'])
+@include('partials.dashboard.header')
+
+
+
+
+
+
+
+
+ @include('dashboard.media-cooperations.processes.tab')
+
+
+
+
+
+
+ {{--
+
Personal Information
+
Basic info, like your name and address, that you use on Nio Platform.
+
--}}
+
+
+
+ Nama Kegiatan
+ {{$mediaOrder->cooperation->name}}
+
+
+
+
+ Dibuat Pada
+ {{idn_date($mediaOrder->created_at, 'l, d F Y')}}
+
+
+
+
+ Tanggal Mulai Pelaksaan
+ {{idn_date($mediaOrder->start_date, 'l, d F Y')}}
+
+
+
+
+ Tanggal Selesai Pelaksaan
+ {{idn_date($mediaOrder->end_date, 'l, d F Y')}}
+
+
+ @if (is_role(['3']))
+
+
+ Status
+
+ @if ($mediaOrderPivot->status === '0')
+ Menunggu
+ @elseif($mediaOrderPivot->status === '1')
+ Menerima
+ @elseif($mediaOrderPivot->status === '2')
+ Menolak
+ @else
+ Tidak Diketahui
+ @endif
+
+
+
+ @endif
+
+
+ {{--
--}}
+
+
+ Deskripsi Tugas
+
+
+
+
+ {!!$mediaOrder->task_description!!}
+
+
+
+
+
+
+
+ Gambar
+
+
+
+
+
+
+
+ @if (filled($mediaOrder->image))
+
}})
+ @else
+ -
+ @endif
+
+
+
+
+
+
+
+ @if (is_role(['3']) && $mediaOrderPivot->status === '2')
+
+
+ Alasan Menolak
+
+
+
+
+ {!!$mediaOrderPivot->rejection_reason!!}
+
+
+
+
+ @endif
+
+ @if (is_role(['1']))
+
+
+ @endif
+
+
+
+
Kembali
+ @if ($mediaOrder && is_role(['3']) && $mediaOrderPivot->status === '0')
+
+ @elseif (is_role(['1']))
+
Ubah
+ @endif
+
+ @if (is_role(['3']))
+
+ @endif
+
+
+
+
+
+
+
+
+
+
+@include('partials.dashboard.footer', ['rich_editor' => false, 'datatable' => 'order_media'])
diff --git a/resources/views/dashboard/media-cooperations/processes/tab.blade.php b/resources/views/dashboard/media-cooperations/processes/tab.blade.php
new file mode 100644
index 0000000..c4cc2d9
--- /dev/null
+++ b/resources/views/dashboard/media-cooperations/processes/tab.blade.php
@@ -0,0 +1,44 @@
+
diff --git a/resources/views/dashboard/media-cooperations/show.blade.php b/resources/views/dashboard/media-cooperations/show.blade.php
index 230835c..9ce9079 100644
--- a/resources/views/dashboard/media-cooperations/show.blade.php
+++ b/resources/views/dashboard/media-cooperations/show.blade.php
@@ -31,19 +31,19 @@
Diunggah Pada
- {{idn_date($mediaCooperation->created_at, 'l, m F Y')}}
+ {{idn_date($mediaCooperation->created_at, 'l, d F Y')}}
Tanggal Mulai Pengajuan
- {{idn_date($mediaCooperation->start_date, 'l, m F Y')}}
+ {{idn_date($mediaCooperation->start_date, 'l, d F Y')}}
Tanggal Akhir Pengajuan
- {{idn_date($mediaCooperation->end_date, 'l, m F Y')}}
+ {{idn_date($mediaCooperation->end_date, 'l, d F Y')}}
@@ -111,12 +111,15 @@
Kembali
-
Ubah
+ @if (is_role(['1']))
+
Ubah
+ @endif
+ @if (is_role(['1']))
+ @endif
diff --git a/resources/views/dashboard/media-monitorings/show.blade.php b/resources/views/dashboard/media-monitorings/show.blade.php
index a4efe59..d522ca1 100644
--- a/resources/views/dashboard/media-monitorings/show.blade.php
+++ b/resources/views/dashboard/media-monitorings/show.blade.php
@@ -79,13 +79,13 @@
Tanggal Input
- {{idn_date($mediaMonitoring->created_at, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->created_at, 'l, d F Y')}}
Tanggal Rilis
- {{idn_date($mediaMonitoring->release_date, 'l, m F Y')}}
+ {{idn_date($mediaMonitoring->release_date, 'l, d F Y')}}
diff --git a/resources/views/dashboard/media-orders/create.blade.php b/resources/views/dashboard/media-orders/create.blade.php
new file mode 100644
index 0000000..34168ca
--- /dev/null
+++ b/resources/views/dashboard/media-orders/create.blade.php
@@ -0,0 +1,117 @@
+@include('partials.dashboard.head')
+@include('partials.dashboard.sidebar', ['page' => 'cooperations'])
+@include('partials.dashboard.header')
+
+
+
+
+
+
+
+
+
+
{{$title}}
+
+
+
+
+
+
+
+
+
+
+
+@include('partials.dashboard.footer', ['rich_editor' => true])
diff --git a/resources/views/dashboard/media-orders/edit.blade.php b/resources/views/dashboard/media-orders/edit.blade.php
new file mode 100644
index 0000000..58cfe1f
--- /dev/null
+++ b/resources/views/dashboard/media-orders/edit.blade.php
@@ -0,0 +1,118 @@
+@include('partials.dashboard.head')
+@include('partials.dashboard.sidebar', ['page' => 'cooperations'])
+@include('partials.dashboard.header')
+
+
+
+
+
+
+
+
+
+
{{$title}}
+
+
+
+
+
+
+
+
+
+
+
+@include('partials.dashboard.footer', ['rich_editor' => true])
diff --git a/resources/views/partials/app/datatable.blade.php b/resources/views/partials/app/datatable.blade.php
index 17baa50..e7f77bb 100644
--- a/resources/views/partials/app/datatable.blade.php
+++ b/resources/views/partials/app/datatable.blade.php
@@ -368,9 +368,10 @@
columns: [
{ data: 'DT_RowIndex', name: 'DT_RowIndex', orderable: false, searchable: false },
{ data: 'name', name: 'name' },
- { data: 'start_date', name: 'start_date' },
- { data: 'end_date', name: 'end_date' },
+ // { data: 'start_date', name: 'start_date' },
+ // { data: 'end_date', name: 'end_date' },
{ data: 'posted_at', name: 'posted_at' },
+ { data: 'status', name: 'status' },
{ data: 'action', name: 'action', orderable: false, searchable: false },
{ data: 'created_at', name: 'created_at', visible: false },
{ data: 'id', name: 'id', orderable: true, searchable: false, visible: false },
@@ -507,6 +508,35 @@
@endif
+@if ($datatable === 'order_media')
+
+@endif
+
@if ($datatable === 'content_recap')
@endif
+@if (session('warning-status'))
+
+@endif
+