added if condition for the make payment button

Author: suxrobGM

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

@@ -69,7 +69,7 @@ <h1>Payrolls</h1>
             <td>{{payroll.employee.fullName}}</td>
             <td>{{getSalaryTypeDesc(payroll.employee.salaryType)}}</td>
             <td>
-              @if (isShareOfGrossSalary(payroll.employee.salaryType)) {
+              @if (payroll.employee.salaryType === salaryType.ShareOfGross) {
                 {{payroll.employee.salary | percent}}
               }
               @else {
@@ -84,12 +84,15 @@ <h1>Payrolls</h1>
             </td>
             <td>{{getPaymentMethodDesc(payroll.payment.method)}}</td>
             <td class="overflow-visible">
-              <p-button
-                icon="bi bi-credit-card"
-                pTooltip="Make payment"
-                tooltipPosition="bottom"
-                [routerLink]="['/payment/payroll', payroll.id]">
-              </p-button>
+              @if (payroll.payment.status === paymentStatus.Pending) {
+                <p-button 
+                  icon="bi bi-credit-card"
+                  pTooltip="Make payment"
+                  tooltipPosition="bottom"
+                  [routerLink]="['/payment/payroll', payroll.id]">
+                </p-button>
+              }
+              
               <p-button class="ms-2"
                 icon="bi bi-pencil"
                 pTooltip="Edit payroll"

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

@@ -39,6 +39,8 @@ import {ApiService} from '@core/services';
   ],
 })
 export class ListPayrollComponent {
+  public salaryType = SalaryType;
+  public paymentStatus = PaymentStatus;
   public payrolls: Payroll[] = [];
   public isLoading = false;
   public totalRecords = 0;
@@ -82,14 +84,6 @@ export class ListPayrollComponent {
     });
   }
 
-  isShareOfGrossSalary(salaryType: SalaryType): boolean {
-    return salaryType === SalaryType.ShareOfGross;
-  }
-
-  isPendingPaymentStatus(paymentStatus: PaymentStatus): boolean {
-    return paymentStatus === PaymentStatus.Pending;
-  }
-
   getPaymentStatusTagSeverity(paymentStatus: PaymentStatus): string {
     return paymentStatus === PaymentStatus.Paid ? 'success' : 'warning';
   }

src/Client/Logistics.OfficeApp/src/styles/global.scss

@@ -27,10 +27,6 @@ body {
   text-decoration: none;
 }
 
-.p-button-icon {
-  padding-right: 4px;
-}
-
 ol, ul {
   padding-left: 0;
 }