fixed address-form component

Author: suxrobGM

README.md

@@ -72,10 +72,12 @@ User password: Test12345#
 - MS SQL
 - xUnit
 - Moq
-- Angular 16
+- Angular 17
 - PrimeNG
 - Blazor
 - MAUI
+- Firebase
+- SignalR
 - Docker
 - CI/CD
 

src/Client/Logistics.OfficeApp/src/app/core/helpers/regexPatterns.ts

@@ -1,5 +1,5 @@
 export abstract class RegexPatterns {
-  static readonly CREDIT_CARD_NUMBER = '^[0-9]{16}$';
+  static readonly CREDIT_CARD_NUMBER = '^(\\d{4} \\d{4} \\d{4} \\d{4})$'; //'^[0-9]{16}$';
   static readonly CARD_EXPIRATION_DATE = '(0[1-9]|1[0-2])/[0-9]{2}'; // MM/YY format
   static readonly CARD_CVV = '^[0-9]{3,4}$'; // CVV 3 or 4 digits
   static readonly ROUTING_NUMBER = '^[0-9]{9}$'; // 9 digit routing number

src/Client/Logistics.OfficeApp/src/app/core/models/payment/index.ts

@@ -2,3 +2,4 @@ export * from './createPayment';
 export * from './payment';
 export * from './subscriptionPayment';
 export * from './updatePayment';
+export * from './processPayment';

src/Client/Logistics.OfficeApp/src/app/core/models/payment/payment.ts

@@ -9,5 +9,6 @@ export interface Payment {
   amount: number;
   status: PaymentStatus;
   paymentFor: PaymentFor;
+  billingAddress?: string;
   comment?: string;
 }

src/Client/Logistics.OfficeApp/src/app/core/models/payment/processPayment.ts

@@ -0,0 +1,15 @@
+import {PaymentMethod} from '@core/enums';
+
+
+export interface ProcessPayment {
+  paymentId: string;
+  paymentMethod: PaymentMethod;
+  cardholderName?: string;
+  cardNumber?: string;
+  cardExpirationDate?: string;
+  cardCvv?: string;
+  bankName?: string;
+  bankAccountNumber?: string;
+  bankRoutingNumber?: string;
+  billingAddress: string;
+}

src/Client/Logistics.OfficeApp/src/app/core/services/api.service.ts

@@ -42,6 +42,7 @@ import {
   Payroll,
   UpdatePayroll,
   CreatePayroll,
+  ProcessPayment,
 } from '../models';
 
 
@@ -297,6 +298,11 @@ export class ApiService {
     return this.get(url);
   }
 
+  processPayment(command: ProcessPayment): Observable<ResponseResult> {
+    const url = `/payments/process-payment`;
+    return this.post(url, command);
+  }
+
   createPayment(command: CreatePayment): Observable<ResponseResult> {
     const url = `/payments`;
     return this.post(url, command);

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

@@ -8,13 +8,13 @@ import {DropdownModule} from 'primeng/dropdown';
 import {AutoCompleteModule, AutoCompleteOnSelectEvent} from 'primeng/autocomplete';
 import {ProgressSpinnerModule} from 'primeng/progressspinner';
 import {CalendarModule} from 'primeng/calendar';
+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 {DateUtils} from '@shared/utils';
-import { ButtonModule } from 'primeng/button';
 
 
 @Component({

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

@@ -56,6 +56,10 @@ <h1>Payments for the past 90 days</h1>
               Payment For
               <p-sortIcon field="paymentFor"></p-sortIcon>
             </th>
+            <th pSortableColumn="billingAddress">
+              Billing Address
+              <p-sortIcon field="billingAddress"></p-sortIcon>
+            </th>
             <th pSortableColumn="comment">
               Comment
               <p-sortIcon field="comment"></p-sortIcon>
@@ -75,6 +79,7 @@ <h1>Payments for the past 90 days</h1>
               </p-tag>
             </td>
             <td>{{getPaymentForDesc(payment.paymentFor)}}</td>
+            <td>{{payment.billingAddress}}</td>
             <td>{{payment.comment}}</td>
           </tr>
         </ng-template>

src/Client/Logistics.OfficeApp/src/app/pages/payment/components/payroll-details/payroll-details.component.html

@@ -39,10 +39,10 @@ <h6>Salary:</h6>
   </div>
   <div class="col-8">
     @if (payroll.employee.salaryType === salaryType.ShareOfGross) {
-    {{payroll.employee.salary | percent}}
+      {{payroll.employee.salary | percent}}
     }
     @else {
-    {{payroll.employee.salary | currency}}
+      {{payroll.employee.salary | currency}}
     }
   </div>
 </div>