Feature/intern contractor appraisal

Modules/HR/Entities/Employee.php

@@ -96,7 +96,8 @@ public function employeeSalaries()
 
  public function getCurrentSalary()
  {
- return $this->employeeSalaries()->where('commencement_date', '<=', today())->latest('commencement_date')->first();
+ $salaryType = $this->payroll_type == config('salary.payroll_type.full_time.slug') ? config('salary.type.employee_salary.slug') : config('salary.type.contractor_fee.slug');
+ return $this->employeeSalaries()->where('salary_type', $salaryType)->where('commencement_date', '<=', today())->latest('commencement_date')->first();
  }
 
  public function scopeContractorSalary($query)
@@ -109,9 +110,27 @@ public function scopeEmployeeSalary($query)
  return $query->where('salary_type', config('salary.type.employee_salary.slug'));
  }
 
- public function getLatestSalary()
+ public function getLatestSalary($payRollType = null)
  {
- return $this->employeeSalaries()->latest('commencement_date')->first();
+ $latestEmployeeSalary = $this->employeeSalaries()->latest('commencement_date')->first();
+
+ if (! $latestEmployeeSalary) {
+ return 0;
+ }
+
+ if ($payRollType) {
+ if ($payRollType === config('salary.payroll_type.full_time.slug') && $latestEmployeeSalary->salary_type === 'employee-salary') {
+ return $latestEmployeeSalary;
+ }
+
+ if ($payRollType === config('salary.payroll_type.contractor.slug') && $latestEmployeeSalary->salary_type === 'contractor-fee') {
+ return $latestEmployeeSalary;
+ }
+
+ return 0;
+ }
+
+ return $latestEmployeeSalary;
  }
 
  public function getPreviousSalary($salaryType = 'employee-salary')

Modules/Project/Resources/views/show.blade.php

@@ -421,6 +421,11 @@
  },
  markStageAsUpdated(stage) {
  if (stage.id) stage.isUpdated = true;
+ if(stage.start_date && ! stage.end_date){
+ stage.status = 'started';
+ } else if (stage.end_date){
+ stage.status = 'completed';
+ }
  },
  updateStatus(status, index) {
  const stage = this.stages[index];

Modules/Project/Resources/views/subviews/project-stages.blade.php

@@ -20,7 +20,7 @@
  <td>
  <p class="fz-16 font-weight-bold">Start Date</p>
  <input v-if="isEditing(index)" @input="markStageAsUpdated(stage)" type="datetime-local" v-model="stage.start_date" class="form-control fz-14" :disabled="!isEditing(index)">
- <p v-else class="fz-16">@{{ formatDisplayDate(stage.start_date) }}</p>
+ <p v-else-if="stage.start_date" class="fz-16">@{{ formatDisplayDate(stage.start_date) }}</p>
  </td>
  <td>
  <p class="fz-16 font-weight-bold field-required">Expected End Date</p>
@@ -30,7 +30,7 @@
  <td>
  <p class="fz-16 font-weight-bold">Actual End Date</p>
  <input v-if="isEditing(index)" @input="markStageAsUpdated(stage)" type="datetime-local" v-model="stage.end_date" class="form-control fz-14" :disabled="!isEditing(index)">
- <p v-else class="fz-16">@{{ formatDisplayDate(stage.end_date) }}</p>
+ <p v-else-if="stage.end_date" class="fz-16">@{{ formatDisplayDate(stage.end_date) }}</p>
  </td>
  <td>
  <p class="fz-16 font-weight-bold">Status</p>

Modules/Salary/Config/config.php

@@ -46,4 +46,34 @@
  'slug' => 'contractor-fee',
  ],
  ],
+
+ 'payroll_type' => [
+ 'contractor' => [
+ 'label' => 'Contractor',
+ 'slug' => 'contractor',
+ ],
+ 'full_time' => [
+ 'label' => 'Full Time',
+ 'slug' => 'full-time',
+ ],
+ ],
+
+ 'staff_type' => [
+ 'employee' => [
+ 'label' => 'Employee',
+ 'slug' => 'Employee',
+ ],
+ 'contractor' => [
+ 'label' => 'Contractor',
+ 'slug' => 'Contractor',
+ ],
+ 'support_staff' => [
+ 'label' => 'Support Staff',
+ 'slug' => 'Support Staff',
+ ],
+ 'intern' => [
+ 'label' => 'Intern',
+ 'slug' => 'Intern',
+ ],
+ ]
 ];

Modules/Salary/Database/Migrations/2024_07_12_135803_add_old_designation_id_and_new_designation_id_column_to_employee_salary_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddOldDesignationIdAndNewDesignationIdColumnToEmployeeSalaryTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('employee_salaries', function (Blueprint $table) {
+ $table->bigInteger('old_designation_id')->unsigned()->nullable();
+ $table->bigInteger('new_designation_id')->unsigned()->nullable();
+ $table->foreign('old_designation_id')->references('id')->on('hr_job_designation');
+ $table->foreign('new_designation_id')->references('id')->on('hr_job_designation');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('employee_salaries', function (Blueprint $table) {
+ $table->dropForeign('new_designation_id');
+ $table->dropForeign('old_designation_id');
+ $table->dropColumn(['new_designation_id', 'old_designation_id']);
+ });
+ }
+}

Modules/Salary/Emails/SendContractorIncrementLetterMail.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Modules\Salary\Emails;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class SendContractorIncrementLetterMail extends Mailable
+{
+ use Queueable, SerializesModels;
+
+ public $employee;
+ public $pdf;
+ public $commencementDateFormat;
+
+ public function __construct($employee, $pdf, $commencementDateFormat)
+ {
+ $this->employee = $employee;
+ $this->pdf = $pdf;
+ $this->commencementDateFormat = $commencementDateFormat;
+ }
+
+ public function build()
+ {
+ $ccEmails = array_map('trim', explode(',', $this->employee['ccemails']));
+ $ccEmails = array_filter($ccEmails);
+
+ return $this->from(config('salary.default.email'), config('salary.default.name'))
+ ->subject('Increment Letter - ' . $this->employee['employeeName'])
+ ->view('salary::emails.contractorIncrementLetterMail', $this->employee)
+ ->attachData($this->pdf, $this->employee['employeeName'] . 'Increment Letter_' . $this->commencementDateFormat . '.pdf', ['mime' => 'application/pdf'])
+ ->when(! empty($ccEmails) && is_array($ccEmails), function ($message) use ($ccEmails) {
+ $message->cc($ccEmails);
+ });
+ }
+}

Modules/Salary/Emails/SendContractorOnboardingLetterMail.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Modules\Salary\Emails;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class SendContractorOnboardingLetterMail extends Mailable
+{
+ use Queueable, SerializesModels;
+
+ public $employee;
+ public $pdf;
+ public $commencementDateFormat;
+
+ public function __construct($employee, $pdf, $commencementDateFormat)
+ {
+ $this->employee = $employee;
+ $this->pdf = $pdf;
+ $this->commencementDateFormat = $commencementDateFormat;
+ }
+
+ public function build()
+ {
+ $ccEmails = array_map('trim', explode(',', $this->employee['ccemails']));
+ $ccEmails = array_filter($ccEmails);
+
+ return $this->from(config('salary.default.email'), config('salary.default.name'))
+ ->subject('Onboarding Letter - ' . $this->employee['employeeName'])
+ ->view('salary::emails.contractorOnboardingLetterMail', $this->employee)
+ ->attachData($this->pdf, $this->employee['employeeName'] . 'Onboarding Letter_' . $this->commencementDateFormat . '.pdf', ['mime' => 'application/pdf'])
+ ->when(! empty($ccEmails) && is_array($ccEmails), function ($message) use ($ccEmails) {
+ $message->cc($ccEmails);
+ });
+ }
+}

Modules/Salary/Entities/EmployeeSalary.php

@@ -10,7 +10,7 @@ class EmployeeSalary extends Model
 {
  use Encryptable;
 
- protected $fillable = ['employee_id', 'monthly_gross_salary', 'commencement_date', 'tds', 'salary_type', 'monthly_fee'];
+ protected $guarded = [];
 
  protected $dates = ['commencement_date'];
 
@@ -21,6 +21,17 @@ public function employee()
  return $this->belongsTo(Employee::class);
  }
 
+ public function getMonthlyGrossSalaryAttribute($monthlyGrossSalary)
+ {
+ if (is_null($monthlyGrossSalary) || empty($monthlyGrossSalary)) {
+ return 0;
+ }
+
+ $decryptedMonthlyGrossSalary = $this->decryptValue($monthlyGrossSalary);
+
+ return (float) $decryptedMonthlyGrossSalary;
+ }
+
  public function getBasicSalaryAttribute()
  {
  $salaryConf = new SalaryConfiguration;
@@ -72,7 +83,7 @@ public function getFoodAllowanceAttribute()
 
  public function getOtherAllowanceAttribute()
  {
- return $this->monthly_gross_salary - $this->basic_salary - $this->hra - $this->transport_allowance - $this->food_allowance;
+ return (float) $this->monthly_gross_salary - $this->basic_salary - $this->hra - $this->transport_allowance - $this->food_allowance;
  }
 
  public function getTotalSalaryAttribute()