diff --git a/app/Http/Controllers/Forms/FormMeetingSeminarController.php b/app/Http/Controllers/Forms/FormMeetingSeminarController.php index f2496e4..2b2e16f 100644 --- a/app/Http/Controllers/Forms/FormMeetingSeminarController.php +++ b/app/Http/Controllers/Forms/FormMeetingSeminarController.php @@ -38,8 +38,8 @@ class FormMeetingSeminarController extends Controller $startDate = date('Y-m-' . env('STARTING_DATE')); // Starting date from .env for the current month $closingDateNextMonth = date('Y-m-', strtotime('+1 month')) . env('CLOSING_DATE'); // Closing date for the next month - $forms = FormMeetingSeminar::whereBetween('created_at', [$startDate, $closingDateNextMonth]) - ->orderBy('created_at', 'desc') + $forms = FormMeetingSeminar::whereBetween('tanggal', [$startDate, $closingDateNextMonth]) + ->orderBy('tanggal', 'desc') ->with('user') ->get(); @@ -121,6 +121,7 @@ class FormMeetingSeminarController extends Controller $this->checkAuthorization(auth()->user(), ['forms.meeting.create']); $request->validate([ + 'tanggal' => 'required|date', 'allowance' => 'nullable|numeric', 'transport_ankot' => 'nullable|numeric', 'hotel' => 'nullable|numeric', @@ -129,7 +130,7 @@ class FormMeetingSeminarController extends Controller 'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], ]); - $currentDate = date('Y-m-d'); + $currentDate = $request->tanggal; $startDate = date('Y-m-' . env('STARTING_DATE')); $closingDateNextMonth = date('Y-m-', strtotime('+1 month')) . env('CLOSING_DATE'); @@ -204,6 +205,7 @@ class FormMeetingSeminarController extends Controller $form = FormMeetingSeminar::create([ 'expense_number' => $expense_number, 'user_id' => auth()->user()->id, + 'tanggal' => $request->tanggal, 'allowance' => $data_nominal['allowance'], 'transport_ankot' => $data_nominal['transport_ankot'], 'hotel' => $data_nominal['hotel'], @@ -216,7 +218,7 @@ class FormMeetingSeminarController extends Controller ]); $name = auth()->user()->name; - $tanggal = $form->created_at; + $tanggal = $form->tanggal; $total = $form->total; // Send notification to MIS and Admin Region and Area Manager Cabang @@ -311,6 +313,7 @@ class FormMeetingSeminarController extends Controller $form = FormMeetingSeminar::findOrfail($id); $request->validate([ + 'tanggal' => 'required|date', 'allowance' => 'nullable|numeric', 'transport_ankot' => 'nullable|numeric', 'hotel' => 'nullable|numeric', @@ -384,6 +387,7 @@ class FormMeetingSeminarController extends Controller // Save the form data $form->update([ + 'tanggal' => $request->tanggal, 'allowance' => $data_nominal['allowance'], 'transport_ankot' => $data_nominal['transport_ankot'], 'hotel' => $data_nominal['hotel'], @@ -423,7 +427,7 @@ class FormMeetingSeminarController extends Controller $name = $form->user->name; $expense_number = $form->expense_number; - $tanggal = $form->created_at; + $tanggal = $form->tanggal; $total = $form->total; // Collect all recipients @@ -508,7 +512,7 @@ class FormMeetingSeminarController extends Controller $name = $form->user->name; $expense_number = $form->expense_number; - $tanggal = $form->created_at; + $tanggal = $form->tanggal; $total = $form->total; $roles = ['Marketing Information System', 'Area Manager Cabang', 'Marketing Operational Manager Region', 'Head of Sales Marketing']; @@ -604,7 +608,7 @@ class FormMeetingSeminarController extends Controller $name = $form->user->name; $expense_number = $form->expense_number; - $tanggal = $form->created_at; + $tanggal = $form->tanggal; $total = $form->approved_total; $roles = ['Head of Sales Marketing', 'Marketing Operational Manager Region']; @@ -681,7 +685,7 @@ class FormMeetingSeminarController extends Controller $heads = $form->user->getCabangAndRegionHead(); $name = $form->user->name; $expense_number = $form->expense_number; - $tanggal = $form->created_at; + $tanggal = $form->tanggal; $total = $form->total; // Collect all recipients diff --git a/app/Models/FormMeetingSeminar.php b/app/Models/FormMeetingSeminar.php index a7a98cf..de4a6cd 100644 --- a/app/Models/FormMeetingSeminar.php +++ b/app/Models/FormMeetingSeminar.php @@ -13,6 +13,7 @@ class FormMeetingSeminar extends Model protected $fillable = [ 'expense_number', 'user_id', + 'tanggal', 'allowance', 'transport_ankot', 'hotel', diff --git a/database/migrations/2025_03_04_075433_add_cascade_on_budget_control_table.php b/database/migrations/2025_03_04_075433_add_cascade_on_budget_control_table.php new file mode 100644 index 0000000..8e2010e --- /dev/null +++ b/database/migrations/2025_03_04_075433_add_cascade_on_budget_control_table.php @@ -0,0 +1,37 @@ +date('tanggal')->after('user_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('form_meeting_seminar', function (Blueprint $table) { + $table->dropColumn('tanggal'); + }); + } +}; diff --git a/resources/views/backend/pages/forms/entertainment/view.blade.php b/resources/views/backend/pages/forms/entertainment/view.blade.php index efa175c..b42a3f3 100644 --- a/resources/views/backend/pages/forms/entertainment/view.blade.php +++ b/resources/views/backend/pages/forms/entertainment/view.blade.php @@ -89,8 +89,24 @@ Kembali @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress') + +
@elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1') + + @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2') @endif diff --git a/resources/views/backend/pages/forms/meeting/create.blade.php b/resources/views/backend/pages/forms/meeting/create.blade.php index 4658b60..e1a364f 100644 --- a/resources/views/backend/pages/forms/meeting/create.blade.php +++ b/resources/views/backend/pages/forms/meeting/create.blade.php @@ -50,6 +50,10 @@ @include('backend.layouts.partials.messages')