added reject & tanggal on meeting seminar
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -13,6 +13,7 @@ class FormMeetingSeminar extends Model
|
||||
protected $fillable = [
|
||||
'expense_number',
|
||||
'user_id',
|
||||
'tanggal',
|
||||
'allowance',
|
||||
'transport_ankot',
|
||||
'hotel',
|
||||
|
||||
Reference in New Issue
Block a user