fixed payroll issues

Author: suxrobGM

src/Client/Logistics.OfficeApp/src/app/layout/sidebar/sidebar.component.html

@@ -67,7 +67,8 @@
                 <p-button severity="secondary"
                   [text]="true"
                   [label]="item.label"
-                  (click)="item?.command({})">
+                  [routerLink]="item.routerLink"
+                  (onClick)="accountingPanel.hide()">
                 </p-button>
               </div>
             }

src/Client/Logistics.OfficeApp/src/app/pages/accounting/edit-payroll/edit-payroll.component.html

@@ -31,19 +31,6 @@ <h1 class="text-center">{{title}}</h1>
             (onSelect)="handleAutoCompleteSelectEvent($event)">
           </p-autoComplete>
         </div>
-
-        <!-- <div *ngIf="isEditMode()" class="mb-3">
-          <label for="paymentStatus" class="form-label">Payment Status</label>
-          <p-dropdown formControlName="paymentStatus" styleClass="w-100" [options]="paymentStatuses" 
-            optionValue="value" optionLabel="description">
-          </p-dropdown>
-        </div> -->
-        <!-- <div class="mb-3">
-          <label for="paymentMethod" class="form-label">Payment Method</label>
-          <p-dropdown formControlName="status" styleClass="w-100" [options]="paymentMethods" 
-            optionValue="value" optionLabel="description">
-          </p-dropdown>
-        </div> -->
 
         @if (selectedEmployee && computedPayroll) {
           <h4>Payment details</h4>
@@ -53,7 +40,7 @@ <h4>Payment details</h4>
           <p><strong>Employee's Salary Type:</strong> {{getSalaryTypeDesc(selectedEmployee.salaryType)}}</p>
           <p>
             <strong>Employee's Salary:</strong>
-            @if (isShareOfGrossSalary()) {
+            @if (selectedEmployee.salaryType === salaryType.ShareOfGross) {
               {{selectedEmployee.salary | percent}}
             }
             @else {
@@ -62,21 +49,43 @@ <h4>Payment details</h4>
           </p>
           <p><strong>Expected Payment:</strong> {{computedPayroll.payment.amount | currency}}</p>
         }
+
+        @if (isEditMode()) {
+          <div class="mb-3">
+            <label for="paymentStatus" class="form-label">Payment Status</label>
+            <p-dropdown formControlName="paymentStatus" styleClass="w-100" [options]="paymentStatuses" 
+              optionValue="value" optionLabel="description">
+            </p-dropdown>
+          </div>
+
+          @if (form.get('paymentStatus')?.value === paymentStatus.Paid) {
+            <h4>Payment details</h4>
+            <hr/>
+
+            <div class="mb-3">
+              <label for="paymentMethod" class="form-label">Payment Method</label>
+              <p-dropdown formControlName="paymentMethod" styleClass="w-100" [options]="paymentMethods" 
+                optionValue="value" optionLabel="description">
+              </p-dropdown>
+            </div>
+
+            <h5>Billing address</h5>
+            <app-address-form formControlName="paymentBillingAddress"></app-address-form>
+          }
+        }
 
-        <div>
-          <p-button type="submit"
-            class="mt-3"
-            icon="bi bi-pencil-square"
-            label="Save"
-            [disabled]="isLoading">
-          </p-button>
-          <p-button type="button"
-            class="mt-3 ms-2"
-            icon="bi bi-arrow-left-square"
-            label="Back to list"
-            [routerLink]="['/accounting/payrolls']">
-          </p-button>
-        </div>
+        <p-button type="submit"
+          class="mt-3"
+          icon="bi bi-pencil-square"
+          label="Save"
+          [disabled]="isLoading || !form.valid || computedPayroll?.payment?.amount === 0">
+        </p-button>
+        <p-button type="button"
+          class="mt-3 ms-2"
+          icon="bi bi-arrow-left-square"
+          label="Back to list"
+          [routerLink]="['/accounting/payrolls']">
+        </p-button>
       </form>
     </p-card>
   </div>

src/Client/Logistics.OfficeApp/src/app/pages/accounting/edit-payroll/edit-payroll.component.ts

@@ -12,8 +12,16 @@ import {ButtonModule} from 'primeng/button';
 import {CreatePayroll, Employee, Payroll, UpdatePayroll} from '@core/models';
 import {ApiService, ToastService} from '@core/services';
 import {PredefinedDateRanges} from '@core/helpers';
-import {SalaryType, SalaryTypeEnum} from '@core/enums';
-import {ValidationSummaryComponent} from '@shared/components';
+import {
+  PaymentMethod,
+  PaymentMethodEnum,
+  PaymentStatus,
+  PaymentStatusEnum,
+  SalaryType,
+  SalaryTypeEnum,
+  convertEnumToArray,
+} from '@core/enums';
+import {AddressFormComponent, ValidationSummaryComponent} from '@shared/components';
 import {DateUtils} from '@shared/utils';
 
 
@@ -33,9 +41,14 @@ import {DateUtils} from '@shared/utils';
     ReactiveFormsModule,
     CalendarModule,
     ButtonModule,
+    AddressFormComponent,
   ],
 })
 export class EditPayrollComponent implements OnInit {
+  public salaryType = SalaryType;
+  public paymentStatus = PaymentStatus;
+  public paymentStatuses = convertEnumToArray(PaymentStatusEnum);
+  public paymentMethods = convertEnumToArray(PaymentMethodEnum);
   public title = 'Edit payroll';
   public id: string | null = null;
   public isLoading = false;
@@ -54,8 +67,15 @@ export class EditPayrollComponent implements OnInit {
     const lastWeek = [PredefinedDateRanges.getLastWeek().startDate, PredefinedDateRanges.getLastWeek().endDate]
 
     this.form = new FormGroup<PayrollForm>({
-      employee: new FormControl<Employee | null>(null, {validators: Validators.required}),
-      dateRange: new FormControl<Date[]>(lastWeek, {validators: Validators.required, nonNullable: true}),
+      employee: new FormControl(null, {validators: Validators.required}),
+      dateRange: new FormControl(lastWeek, {validators: Validators.required, nonNullable: true}),
+      paymentStatus: new FormControl(null),
+      paymentMethod: new FormControl(null),
+      paymentBillingAddress: new FormControl(null),
+    });
+
+    this.form.get('paymentStatus')?.valueChanges.subscribe((status) => {
+      this.setConditionalValidators(status);
     });
   }
 
@@ -127,14 +147,28 @@ export class EditPayrollComponent implements OnInit {
     return this.id != null && this.id !== '';
   }
 
-  isShareOfGrossSalary() {
-    return this.selectedEmployee?.salaryType === SalaryType.ShareOfGross;
-  }
-
   getSalaryTypeDesc(salaryType: SalaryType): string {
     return SalaryTypeEnum.getDescription(salaryType);
   }
 
+  private setConditionalValidators(paymentStatus: PaymentStatus | null) {
+    if (!paymentStatus) {
+      return;
+    }
+
+    const paymentMethodControl = this.form.get('paymentMethod');
+    const billingAddressControl = this.form.get('paymentBillingAddress');
+
+    if (paymentStatus === PaymentStatus.Paid) {
+      paymentMethodControl?.setValidators(Validators.required);
+      billingAddressControl?.setValidators(Validators.required);
+    }
+    else {
+      paymentMethodControl?.clearValidators();
+      billingAddressControl?.clearValidators();
+    }
+  }
+
   private fetchPayroll() {
     if (!this.id) {
       return;
@@ -146,7 +180,13 @@ export class EditPayrollComponent implements OnInit {
         this.form.patchValue({
           employee: payroll.employee,
           dateRange: [new Date(payroll.startDate), new Date(payroll.endDate)],
+          paymentMethod: payroll.payment.method,
+          paymentStatus: payroll.payment.status,
+          paymentBillingAddress: payroll.payment.billingAddress,
         });
+
+        this.computedPayroll = payroll;
+        this.selectedEmployee = payroll.employee;
       }
 
       this.isLoading = false;
@@ -199,4 +239,7 @@ export class EditPayrollComponent implements OnInit {
 interface PayrollForm {
   employee: FormControl<Employee | null>;
   dateRange: FormControl<Date[]>;
+  paymentStatus: FormControl<PaymentStatus | null>;
+  paymentMethod: FormControl<PaymentMethod | null>;
+  paymentBillingAddress: FormControl<string | null>;
 }

src/Client/Logistics.OfficeApp/src/app/pages/accounting/list-payroll/list-payroll.component.html

@@ -94,6 +94,7 @@ <h1>Payrolls</h1>
               <p-button class="ms-2"
                 icon="bi bi-pencil"
                 pTooltip="Edit payroll"
+                tooltipPosition="bottom"
                 [routerLink]="['/accounting/payrolls/edit', payroll.id]">
               </p-button>
             </td>

src/Client/Logistics.OfficeApp/src/app/pages/load/list-loads/list-loads.component.ts

@@ -74,6 +74,8 @@ export class ListLoadComponent {
       if (result.isSuccess && result.data) {
         this.loads = result.data;
         this.totalRecords = result.totalItems;
+        console.log(this.loads);
+        
       }
 
       this.isLoading = false;

src/Client/Logistics.OfficeApp/src/app/pages/payment/process-payment/process-payment.component.html

@@ -2,7 +2,7 @@ <h1 class="text-center">{{title}}</h1>
 <hr class="w-100">
 
 <div class="row justify-content-center mx-0">
-  <div class="col-12 col-xl-6">
+  <div class="col-12 col-lg-6 col-xl-8">
     <p-card>
       <div class="row mb-3">
         <div class="col-12">

src/Client/Logistics.OfficeApp/src/app/pages/payment/process-payment/process-payment.component.ts

@@ -87,13 +87,15 @@ export class ProcessPaymentComponent implements OnInit {
   }
 
   submit() {
-    if (!this.form.valid || !this.payroll || !this.invoice) {
+    const paymentId = this.payroll?.payment.id ?? this.invoice?.payment.id;
+    
+    if (!this.form.valid || !paymentId) {
       return;
     }
 
     this.isLoading = true;
     const command: ProcessPayment = {
-      paymentId: this.payroll.payment.id ?? this.invoice.payment.id,
+      paymentId: paymentId,
       paymentMethod: this.form.value.paymentMethod!,
       billingAddress: this.form.value.billingAddress!,
       cardholderName: this.form.value.cardholderName!,

src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadHandler.cs

@@ -41,7 +41,8 @@ protected override async Task<ResponseResult> HandleValidated(
             refId = latestLoad.RefId + 1;
 
         var load = Load.Create(
-            refId, 
+            refId,
+            req.DeliveryCost,
             req.OriginAddress!,
             req.OriginAddressLat,
             req.OriginAddressLong,
@@ -54,7 +55,6 @@ protected override async Task<ResponseResult> HandleValidated(
 
         load.Name = req.Name;
         load.Distance = req.Distance;
-        load.DeliveryCost = req.DeliveryCost;
 
         await _tenantRepository.AddAsync(load);
         var changes = await _tenantRepository.UnitOfWork.CommitAsync();

src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollCommand.cs

@@ -6,10 +6,10 @@ namespace Logistics.Application.Tenant.Commands;
 public class UpdatePayrollCommand : IRequest<ResponseResult>
 {
     public string Id { get; set; } = default!;
-    public DateTime StartDate { get; set; }
-    public DateTime EndDate { get; set; }
+    public DateTime? StartDate { get; set; }
+    public DateTime? EndDate { get; set; }
     public string? EmployeeId { get; set; }
-    public PaymentMethod? Method { get; set; }
-    public decimal? Amount { get; set; }
-    public PaymentStatus? Status { get; set; }
+    public PaymentStatus? PaymentStatus { get; set; }
+    public PaymentMethod? PaymentMethod { get; set; }
+    public string? PaymentBillingAddress { get; set; }
 }

src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollHandler.cs

@@ -1,6 +1,8 @@
-namespace Logistics.Application.Tenant.Commands;
+using Logistics.Shared.Enums;
 
-internal sealed class UpdatePayrollHandler : RequestHandler<UpdatePaymentCommand, ResponseResult>
+namespace Logistics.Application.Tenant.Commands;
+
+internal sealed class UpdatePayrollHandler : RequestHandler<UpdatePayrollCommand, ResponseResult>
 {
     private readonly ITenantRepository _tenantRepository;
 
@@ -10,35 +12,42 @@ public UpdatePayrollHandler(ITenantRepository tenantRepository)
     }
 
     protected override async Task<ResponseResult> HandleValidated(
-        UpdatePaymentCommand req, CancellationToken cancellationToken)
+        UpdatePayrollCommand req, CancellationToken cancellationToken)
     {
-        var payment = await _tenantRepository.GetAsync<Payment>(req.Id);
-
-        if (payment is null)
-            return ResponseResult.CreateError($"Could not find a payment with ID '{req.Id}'");
+        var payroll = await _tenantRepository.GetAsync<Payroll>(req.Id);
 
-        if (req.PaymentFor.HasValue && payment.PaymentFor != req.PaymentFor)
-        {
-            payment.PaymentFor = req.PaymentFor.Value;
-        }
-        if (req.Method.HasValue && payment.Method != req.Method)
+        if (payroll is null)
         {
-            payment.Method = req.Method.Value;
+            return ResponseResult.CreateError($"Could not find a payroll with ID '{req.Id}'");
         }
-        if (req.Status.HasValue && payment.Status != req.Status)
+        
+        if (!string.IsNullOrEmpty(req.EmployeeId) && req.EmployeeId != payroll.EmployeeId)
         {
-            payment.SetStatus(req.Status.Value);
+            var employee = await _tenantRepository.GetAsync<Employee>(req.EmployeeId);
+
+            if (employee is null)
+            {
+                return ResponseResult.CreateError($"Could not find an employer with ID '{req.EmployeeId}'");
+            }
+            
+            payroll.Employee = employee;
         }
-        if (req.Amount.HasValue && payment.Amount != req.Amount)
+
+        if (req is { StartDate: not null, EndDate: not null } &&  payroll.StartDate != req.StartDate &&
+            payroll.EndDate != req.EndDate)
         {
-            payment.Amount = req.Amount.Value;
+            payroll.StartDate = req.StartDate.Value;
+            payroll.EndDate = req.EndDate.Value;
         }
-        if (!string.IsNullOrEmpty(req.Comment) && payment.Comment != req.Comment)
+        
+        if (req.PaymentStatus.HasValue && payroll.Payment.Status != req.PaymentStatus)
         {
-            payment.Comment = req.Comment;
+            payroll.Payment.SetStatus(req.PaymentStatus.Value);
+            payroll.Payment.Method = req.PaymentMethod;
+            payroll.Payment.BillingAddress = req.PaymentBillingAddress;
         }
 
-        _tenantRepository.Update(payment);
+        _tenantRepository.Update(payroll);
         await _tenantRepository.UnitOfWork.CommitAsync();
         return ResponseResult.CreateSuccess();
     }

src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollValidator.cs

@@ -7,7 +7,6 @@ internal sealed class UpdatePayrollValidator : AbstractValidator<UpdatePayrollCo
     public UpdatePayrollValidator()
     {
         RuleFor(i => i.StartDate).LessThan(i => i.EndDate);
-        RuleFor(i => i.Amount).GreaterThanOrEqualTo(0);
         RuleFor(i => i.Id).NotEmpty();
     }
 }