Merge branch 'ORV2-3221-2' of https://github.com/bcgov/onroutebc into…

… ORV2-3221-2

database/mssql/scripts/sampledata/dbo.ORBC_FEATURE_FLAG.Table.sql

@@ -279,6 +279,28 @@ VALUES
     N'dbo',
     GETUTCDATE()
   );
+INSERT INTO
+  [dbo].[ORBC_FEATURE_FLAG] (
+    [FEATURE_ID],
+    [FEATURE_KEY],
+    [FEATURE_VALUE],
+    [CONCURRENCY_CONTROL_NUMBER],
+    [DB_CREATE_USERID],
+    [DB_CREATE_TIMESTAMP],
+    [DB_LAST_UPDATE_USERID],
+    [DB_LAST_UPDATE_TIMESTAMP]
+  )
+VALUES
+  (
+    '13',
+    'CVCLIENT-PAY-IN-PERSON',
+    'DISABLED',
+    NULL,
+    N'dbo',
+    GETUTCDATE(),
+    N'dbo',
+    GETUTCDATE()
+  );
 
 SET
   IDENTITY_INSERT [dbo].[ORBC_FEATURE_FLAG] OFF

frontend/src/features/permits/pages/Application/components/pay/ChoosePaymentMethod.tsx

@@ -74,7 +74,7 @@ export const ChoosePaymentMethod = ({
               />
             ))}
             {showPayInPersonInfo &&
-            featureFlags?.["STAFF-CAN-PAY"] === "ENABLED" ? (
+            featureFlags?.["CVCLIENT-PAY-IN-PERSON"] === "ENABLED" ? (
               <CVPayInPersonInfo />
             ) : null}
           </RadioGroup>

vehicles/src/modules/permit-application-payment/payment/payment.module.ts

@@ -28,7 +28,12 @@ import { SpecialAuth } from 'src/modules/special-auth/entities/special-auth.enti
     ]),
   ],
   controllers: [PaymentController],
-  providers: [PaymentService, TransactionProfile, PaymentReportService, SpecialAuthService],
+  providers: [
+    PaymentService,
+    TransactionProfile,
+    PaymentReportService,
+    SpecialAuthService,
+  ],
   exports: [PaymentService],
 })
 export class PaymentModule {}

vehicles/src/modules/permit-application-payment/payment/payment.service.ts

@@ -828,9 +828,8 @@ export class PaymentService {
     return fee;
   }
 
-
   /**
-   * 
+   *
    * This function is deprecated and will be removed once the validation endpoints are established.
    */
   @LogAsyncMethodExecution()

vehicles/src/modules/permit-application-payment/permit-receipt-document/permit-receipt-document.service.ts

@@ -40,6 +40,7 @@ import {
   validateEmailandFaxList,
 } from '../../../common/helper/notification.helper';
 import { getPermitTemplateName } from '../../../common/helper/template.helper';
+import { Nullable } from '../../../common/types/common';
 
 @Injectable()
 export class PermitReceiptDocumentService {
@@ -67,10 +68,6 @@ export class PermitReceiptDocumentService {
     const permitQB = this.permitRepository.createQueryBuilder('permit');
     permitQB
       .select('transaction.transactionId', 'transactionId')
-      .addSelect(
-        'COUNT(permit.permitId) OVER (PARTITION BY transaction.transactionId)',
-        'permitCountPerTransactionId',
-      )
       .distinct(true)
       .leftJoin('permit.company', 'company')
       .innerJoin('permit.permitTransactions', 'permitTransactions')
@@ -90,7 +87,6 @@ export class PermitReceiptDocumentService {
 
     const transactions = await permitQB.getRawMany<{
       transactionId: string;
-      permitCountPerTransactionId: number;
     }>();
 
     const transactionPermitList: {
@@ -105,9 +101,10 @@ export class PermitReceiptDocumentService {
         transaction.transactionId,
       );
 
-      if (
-        fetchedApplications?.length === transaction.permitCountPerTransactionId
-      ) {
+      const unIssuedApplications = fetchedApplications.filter(
+        (application) => !application.permitNumber,
+      );
+      if (!unIssuedApplications?.length) {
         transactionPermitList.push({
           transactionId: transaction.transactionId,
           permits: fetchedApplications,
@@ -125,12 +122,14 @@ export class PermitReceiptDocumentService {
    * @param applicationIds Array of application IDs to filter the permits. If empty, will search by transactionId.
    * @param companyId The ID of the company to which the permits may belong, optional.
    * @param transactionId A specific transaction ID to find the related permit, optional. If provided, applicationIds should be empty.
+   * @param issued A boolean to filter results to return only issued permits.
    * @returns A promise that resolves with an array of permits matching the criteria.
    */
   private async findManyWithSuccessfulTransaction(
     permitIds: string[],
     companyId?: number,
     transactionId?: string,
+    issued?: Nullable<boolean>,
   ): Promise<Permit[]> {
     if (
       (!permitIds?.length && !transactionId) ||
@@ -152,8 +151,10 @@ export class PermitReceiptDocumentService {
         'applicationOwner.userContact',
         'applicationOwnerContact',
       )
-      .where('receipt.receiptNumber IS NOT NULL')
-      .where('permit.permitNumber IS NOT NULL');
+      .where('receipt.receiptNumber IS NOT NULL');
+    if (issued) {
+      permitQB.andWhere('permit.permitNumber IS NOT NULL');
+    }
 
     if (permitIds?.length) {
       permitQB.andWhere('permit.permitId IN (:...permitIds)', {
@@ -233,6 +234,8 @@ export class PermitReceiptDocumentService {
     const fetchedPermits = await this.findManyWithSuccessfulTransaction(
       permitIds,
       companyId,
+      null,
+      true,
     );
 
     if (!fetchedPermits?.length) {