BreakPoint -> Starter Dev

app/api/app/Applications/Document/Requests/LeaveTypeRequest.php

@@ -27,18 +27,16 @@ public function rules()
         $rules = [
             'name' => 'required|max:255|min:2',
             'slug' => 'required|max:255|min:2',
+            'color' => 'required',
         ];
 
         return $rules;
     }
     public function messages(){
         return [
-            'name.required' => 'users.name.required',
-            'name.max' => 'users.name.max',
-            'name.min' => 'users.name.min',
-            'slug.required' => 'users.slug.required',
-            'slug.max' => 'users.slug.max',
-            'slug.min' => 'users.slug.min',
+            'name.required' => 'The name field is required',
+            'slug.required' => 'The slug field is required',
+            'color.required' => 'The color field is required',
         ];
     }
 }

app/api/app/Applications/LeaveRequest/Mail/LeaveRequestCancelation.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Applications\LeaveRequest\Mail;
+
+use App\Applications\LeaveRequest\Model\LeaveRequest;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class LeaveRequestCancelation extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public LeaveRequest $leaveRequest;
+    public ?string $pdfPath;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(LeaveRequest $leaveRequest, ?string $pdfPath = null)
+    {
+        $this->leaveRequest = $leaveRequest;
+        $this->pdfPath = $pdfPath;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        $formattedStartDate = \Carbon\Carbon::parse($this->leaveRequest->start_date)->format('d M Y');
+        $formattedEndDate = $this->leaveRequest->end_date
+            ? \Carbon\Carbon::parse($this->leaveRequest->end_date)->format('d M Y')
+            : null;
+        $subject = $this->leaveRequest->user->first_name . ' ' . $this->leaveRequest->user->last_name . ': ' . $this->leaveRequest->leaveType->name .  ': ' . $formattedStartDate . ($this->leaveRequest->end_date ? ' to ' . $formattedEndDate : '');
+        $email = $this->subject($subject .' (Canceled)')
+                    ->view('emails.leave_request_cancelation')
+                    ->with([
+                        'leaveRequest' => $this->leaveRequest,
+                    ]);
+
+        return $email;
+    }
+}

app/api/app/Applications/LeaveRequest/Mail/LeaveRequestConfirmation.php

@@ -12,36 +12,33 @@ class LeaveRequestConfirmation extends Mailable
     use Queueable, SerializesModels;
 
     public LeaveRequest $leaveRequest;
-    public ?string $pdfPath;
 
     /**
      * Create a new message instance.
      */
-    public function __construct(LeaveRequest $leaveRequest, ?string $pdfPath = null)
+    public function __construct(LeaveRequest $leaveRequest)
     {
         $this->leaveRequest = $leaveRequest;
-        $this->pdfPath = $pdfPath;
     }
 
     /**
      * Build the message.
      */
     public function build(): self
     {
-        $email = $this->subject($this->leaveRequest->user->first_name . ' ' . $this->leaveRequest->user->last_name .' Leave Request was Approved')
+        $formattedStartDate = \Carbon\Carbon::parse($this->leaveRequest->start_date)->format('d M Y');
+        $formattedEndDate = $this->leaveRequest->end_date
+            ? \Carbon\Carbon::parse($this->leaveRequest->end_date)->format('d M Y')
+            : null;
+
+        $subject =$this->leaveRequest->user->first_name . ' ' . $this->leaveRequest->user->last_name . ': ' . $this->leaveRequest->leaveType->name .  ': ' . $formattedStartDate . ($this->leaveRequest->end_date ? ' to ' . $formattedEndDate : '');
+        $email = $this->subject($subject .' (Approved)')
                     ->view('emails.leave_request_confirmation')
                     ->with([
                         'leaveRequest' => $this->leaveRequest,
                     ]);
 
 
-        if ($this->pdfPath && file_exists($this->pdfPath)) {
-            $email->attach($this->pdfPath, [
-                'as' => basename($this->pdfPath),
-                'mime' => 'application/pdf',
-            ]);
-        }
-
         return $email;
     }
 }

app/api/app/Applications/LeaveRequest/Mail/LeaveRequestConfirmationPDF.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Applications\LeaveRequest\Mail;
+
+use App\Applications\LeaveRequest\Model\LeaveRequest;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class LeaveRequestConfirmationPDF extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public LeaveRequest $leaveRequest;
+    public ?string $pdfPath;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(LeaveRequest $leaveRequest, ?string $pdfPath = null)
+    {
+        $this->leaveRequest = $leaveRequest;
+        $this->pdfPath = $pdfPath;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        $subject = $this->leaveRequest->user->country == 1 ? 'ESOF Starter' : 'ESOF BG';
+        $email = $this->subject( $subject . ' PDF')
+                    ->view('emails.leave_request_confirmation_pdf')
+                    ->with([
+                        'leaveRequest' => $this->leaveRequest,
+                    ]);
+
+
+        if ($this->pdfPath && file_exists($this->pdfPath)) {
+            $email->attach($this->pdfPath, [
+                'as' => basename($this->pdfPath),
+                'mime' => 'application/pdf',
+            ]);
+        }
+
+        return $email;
+    }
+}

app/api/app/Applications/LeaveRequest/Mail/LeaveRequestDeclining.php

@@ -26,7 +26,13 @@ public function __construct(LeaveRequest $leaveRequest)
      */
     public function build(): self
     {
-        return $this->subject('Leave Request was Declined')
+        $formattedStartDate = \Carbon\Carbon::parse($this->leaveRequest->start_date)->format('d M Y');
+        $formattedEndDate = $this->leaveRequest->end_date
+            ? \Carbon\Carbon::parse($this->leaveRequest->end_date)->format('d M Y')
+            : null;
+
+        $subject = $this->leaveRequest->leaveType->name .  ': ' . $formattedStartDate . ($this->leaveRequest->end_date ? ' to ' . $formattedEndDate : '');  
+        return $this->subject($subject . ' (Declined)')
                     ->view('emails.leave_request_decline')
                     ->with([
                         'leaveRequest' => $this->leaveRequest,

app/api/app/Applications/LeaveRequest/Mail/LeaveRequestNotification.php

@@ -26,7 +26,12 @@ public function __construct(LeaveRequest $leaveRequest)
      */
     public function build(): self
     {
-        return $this->subject('New Leave Request Assigned to You')
+        $formattedStartDate = \Carbon\Carbon::parse($this->leaveRequest->start_date)->format('d M Y');
+        $formattedEndDate = $this->leaveRequest->end_date
+            ? \Carbon\Carbon::parse($this->leaveRequest->end_date)->format('d M Y')
+            : null;
+        $subject =$this->leaveRequest->user->first_name . ' ' . $this->leaveRequest->user->last_name . ': ' . $this->leaveRequest->leaveType->name .  ': ' . $formattedStartDate . ($this->leaveRequest->end_date ? ' to ' . $formattedEndDate : '');
+        return $this->subject('Requested: ' . $subject)
                     ->view('emails.leave_request_notification')
                     ->with([
                         'leaveRequest' => $this->leaveRequest,

app/api/app/Applications/LeaveRequest/Mail/LeaveRequestNotificationUpdate.php

@@ -26,7 +26,13 @@ public function __construct(LeaveRequest $leaveRequest)
      */
     public function build(): self
     {
-        return $this->subject('A Leave Request Is Updated')
+        $formattedStartDate = \Carbon\Carbon::parse($this->leaveRequest->start_date)->format('d M Y');
+        $formattedEndDate = $this->leaveRequest->end_date
+            ? \Carbon\Carbon::parse($this->leaveRequest->end_date)->format('d M Y')
+            : null;
+
+        $subject =$this->leaveRequest->user->first_name . ' ' . $this->leaveRequest->user->last_name . ': ' . $this->leaveRequest->leaveType->name .  ': ' . $formattedStartDate . ($this->leaveRequest->end_date ? ' to ' . $formattedEndDate : '');
+        return $this->subject($subject . ' (Update)')
                     ->view('emails.leave_request_notification')
                     ->with([
                         'leaveRequest' => $this->leaveRequest,

app/api/app/Applications/LeaveRequest/Repositories/LeaveRequestRepository.php

@@ -8,7 +8,9 @@
     LeaveRequestNotification,
     LeaveRequestNotificationUpdate,
     LeaveRequestConfirmation,
-    LeaveRequestDeclining
+    LeaveRequestDeclining,
+    LeaveRequestCancelation,
+    LeaveRequestConfirmationPDF,
 };
 use App\Applications\Pagination\StarterPaginator;
 use App\Applications\LeaveRequest\Model\LeaveRequest;
@@ -103,11 +105,14 @@ public function confirm(int $leaveRequestId, LeaveRequestDTO $leaveRequestData,
         $leaveRequest->update([
             ...$leaveRequestData->toArray(),
             'is_confirmed' => $isConfirmed,
-            'confirmed_by' => ($isConfirmed == 2 ? $user->id : $leaveRequest['confirmed_by'])
+            'confirmed_by' => $user->id
         ]);
 
         if ($isConfirmed == 2) {
-            $this->createLeaveRequestPDF($leaveRequest->user, $leaveRequest);
+            if ($leaveRequest->leave_type_id == 3 || $leaveRequest->leave_type_id == 4) {
+                $this->createLeaveRequestPDF($leaveRequest->user, $leaveRequest);
+                $this->sendConfirmationAccountentsEmail($leaveRequest);
+            }
 
             if ($leaveRequest->user && $leaveRequestData->leave_type_id == 3) {
                 $this->deductPaidLeaves($leaveRequest->user, $leaveRequestData);
@@ -120,7 +125,10 @@ public function confirm(int $leaveRequestId, LeaveRequestDTO $leaveRequestData,
 
     public function delete(int $id)
     {
-        return $this->leaveRequest::findOrFail($id)->delete();
+        $leaveRequest = $this->leaveRequest::findOrFail($id);
+        $this->sendRequestCancelationEmail($leaveRequest);
+
+        return $leaveRequest->delete();
     }
 
     public function draw($data): StarterPaginator
@@ -177,15 +185,30 @@ private function sendRequestConfirmationEmail(LeaveRequest $leaveRequest)
         };
 
         if ($mailClass) {
-            if ($leaveRequest->is_confirmed == 2) {
-                $document = Document::where('leave_request_id', $leaveRequest->id)->first();
-                Mail::to($recipients)->send(new $mailClass($leaveRequest, $document ? Storage::disk('public')->path($document->file_path) : null));
-            } else {
-                Mail::to($recipients)->send(new $mailClass($leaveRequest));
-            }
+            Mail::to($recipients)->send(new $mailClass($leaveRequest));
         }
     }
 
+    private function sendRequestCancelationEmail(LeaveRequest $leaveRequest)
+    {
+        $recipients = $this->getRecipients($leaveRequest);
+
+        Mail::to($recipients)->send(new LeaveRequestCancelation($leaveRequest));
+    }
+
+
+    private function sendConfirmationAccountentsEmail(LeaveRequest $leaveRequest) {
+        $administrationEmails = User::role(User::COLLABORATOR)
+        ->where('country', '=', $leaveRequest->user->country)
+        ->pluck('email')
+        ->toArray(); 
+
+        if ($leaveRequest->is_confirmed == 2) {
+            $document = Document::where('leave_request_id', $leaveRequest->id)->first();
+            Mail::to($administrationEmails)->send(new LeaveRequestConfirmationPDF($leaveRequest, $document ? Storage::disk('public')->path($document->file_path) : null));
+        } 
+    }
+
     private function getRecipients(LeaveRequest $leaveRequest)
     {
         $manager = $this->user->find($leaveRequest->request_to);
@@ -235,12 +258,12 @@ private function createLeaveRequestPDF(User $user, LeaveRequest $leaveRequest):
         // Cannot print in PDF
         // Create a Cyrilyc Data for each user on create in a separate table, with foreign user_id
         $fullNameCyrilic = transliterator_transliterate('Latin-Cyrillic', $user->first_name) . ' ' . transliterator_transliterate('Latin-Cyrillic', $user->last_name);
+        $start_date = $this->formatDate($leaveRequest->start_date);
 
         if ($isSingleDay) {
-            $dates = $this->formatDate($leaveRequest->start_date);
             $leaveDays = 1;
         } else {
-            $dates = $this->formatDate($leaveRequest->start_date) . "g. to " . $this->formatDate($leaveRequest->end_date) . 'g.';
+            $end_date = $this->formatDate($leaveRequest->end_date);
                     // Calculate valid leave days excluding weekends and national holidays
             $startDate = new DateTime($leaveRequest->start_date);
             $endDate = $leaveRequest->end_date ? new DateTime($leaveRequest->end_date) : $startDate;
@@ -259,26 +282,50 @@ private function createLeaveRequestPDF(User $user, LeaveRequest $leaveRequest):
                 fn($date) => in_array($date->format('N'), [6, 7]) || in_array($date->format('Y-m-d'), $nationalHolidays)
             ));
         }
-
+        $userCountry = $leaveRequest->user->country;
+
         $pdf = new Fpdi();
         $pdf->AddPage();
-        $pdf->setSourceFile(public_path('BG_template.pdf'));
+        if ($userCountry == 1) {
+            if ($leaveRequest->leave_type_id == 3) {
+                $pdf->setSourceFile(public_path('MK_template_paid.pdf'));
+            } else {
+                $pdf->setSourceFile(public_path('MK_template_unpaid.pdf'));
+            }
+        } else {
+            if ($leaveRequest->leave_type_id == 3) {
+                $pdf->setSourceFile(public_path('BG_template_paid.pdf'));
+            } else {
+                $pdf->setSourceFile(public_path('BG_template_unpaid.pdf'));
+            }
+        }
+
         $tplIdx = $pdf->importPage(1);
         $pdf->useTemplate($tplIdx, 0, 0, 210);
-
         $pdf->SetFont('Arial', '', 11);
-        $pdf->SetXY(111, 77);
-        $pdf->Write(0, $user->first_name . " " . $user->last_name);
-        $pdf->SetXY(112, 110);
-        $pdf->Write(0, $leaveRequest->leaveType->name ?? 'N/A');
-        $pdf->SetXY(121, 114);
-        $pdf->Write(0, $leaveDays ?? 'N/A');
-        $pdf->SetXY(44, 118);
-        $pdf->Write(0, $dates ?? 'N/A');
-        $pdf->SetXY(24, 159);
-        $pdf->Write(0, $nowDate ?? 'N/A');
-        $pdf->SetXY(24, 227);
-        $pdf->Write(0, $nowDate ?? 'N/A');
+        if ($userCountry !== 1) {
+            $pdf->SetXY(111, 79);
+            $pdf->Write(0, $user->first_name . " " . $user->last_name);
+            $pdf->SetXY($leaveRequest->leave_type_id == 3 ? 92 : 80, 135);
+            $pdf->Write(0, $leaveDays ?? 'N/A');
+            $pdf->SetXY(44, 141);
+            $pdf->Write(0,  $start_date ?? 'N/A');
+            $pdf->SetXY(44, 147);
+            $pdf->Write(0,  $end_date ?? '');
+            $pdf->SetXY(24,215);
+            $pdf->Write(0, $nowDate ?? 'N/A');
+        } else {
+            $pdf->SetXY(111, 77);
+            $pdf->Write(0, $user->first_name . " " . $user->last_name);
+            $pdf->SetXY(65, 118);
+            $pdf->Write(0, $leaveDays ?? 'N/A');
+            $pdf->SetXY(124, 118);
+            $pdf->Write(0,  $start_date ?? 'N/A');
+            $pdf->SetXY(150, 118);
+            $pdf->Write(0,  $end_date ?? '');
+            $pdf->SetXY(24,193);
+            $pdf->Write(0, $nowDate ?? 'N/A');
+        }
 
         $pdfDirectory = storage_path("app/public/");
         if (!file_exists($pdfDirectory)) {

app/api/app/Applications/LeaveRequest/Requests/LeaveRequestRequest.php

@@ -27,7 +27,7 @@ public function rules()
         $rules = [
             'request_to' => 'required',
             'leave_type_id' => 'required',
-            'start_date' => 'required|date',
+            'start_date' => 'required|date|after_or_equal:today',
             'end_date' => 'sometimes|date|after_or_equal:start_date',
         ];