Onroute release 45 clone

vehicles/src/common/helper/permit-fee.helper.ts

@@ -16,6 +16,7 @@ import {
 import { differenceBetween } from './date-time.helper';
 import * as dayjs from 'dayjs';
 import { Nullable } from '../types/common';
+import { PaymentMethodType } from '../enum/payment-method-type.enum';
 
 /**
  * Calculates the permit fee based on the application and old amount.
@@ -155,6 +156,25 @@ export const currentPermitFee = (
     : pricePerTerm * permitTerms + oldAmount;
 };
 
+/**
+ * Determines whether or not transaction is valid based on payment method and if it's approved.
+ * @param paymentMethod Payment method used
+ * @param transactionApproved Approval status of the transaction
+ * @returns Whether or not the transaction is valid
+ */
+export const isValidTransaction = (
+  paymentMethod: PaymentMethodType,
+  transactionApproved?: Nullable<number>,
+) => {
+  // For payment methods using payment gateways (ie. PayBC), a payment is considered to have succeeded only if its
+  // pgApproved flag is 1, and transactions using all other payment methods (ie. IcePay) is automatically considered
+  // to have succeeded
+  return (
+    paymentMethod !== PaymentMethodType.WEB ||
+    (Boolean(transactionApproved) && transactionApproved > 0)
+  );
+};
+
 export const calculatePermitAmount = (
   permitPaymentHistory: PermitHistoryDto[],
 ): number => {

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

@@ -38,6 +38,7 @@ import { PaymentMethodType } from './entities/payment-method-type.entity';
 import { LogAsyncMethodExecution } from '../../../common/decorator/log-async-method-execution.decorator';
 import {
   calculatePermitAmount,
+  isValidTransaction,
   permitFee,
   validAmount,
 } from 'src/common/helper/permit-fee.helper';
@@ -856,11 +857,20 @@ export class PaymentService {
       queryRunner,
       companyId,
     );
+
+    const validPermitPaymentHistory = permitPaymentHistory.filter(
+      historyItem => isValidTransaction(
+        historyItem.paymentMethodTypeCode,
+        historyItem.pgApproved,
+      ),
+    );
+
     const isNoFee = await this.specialAuthService.findNoFee(companyId);
     const oldAmount =
-      permitPaymentHistory.length > 0
-        ? calculatePermitAmount(permitPaymentHistory)
+      validPermitPaymentHistory.length > 0
+        ? calculatePermitAmount(validPermitPaymentHistory)
         : undefined;
+
     if (application.permitStatus === ApplicationStatus.VOIDED)
       return -oldAmount;
     const fee = permitFee(application, isNoFee, oldAmount);