Merge branch 'dev' into WEB-1100-client-approval-activation-date

Author: Ruba-Tawk-FOO

src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts

@@ -434,28 +434,29 @@ export class TransactionsTabComponent extends LoanProductBaseComponent implement
     const locale = this.settingsService.language.code;
     const dateFormat = this.settingsService.dateFormat;
     const loanId = this.route.parent.parent.snapshot.params['loanId'];
+    const isLoanProduct = this.loanProductService.isLoanProduct;
     let command = 'undo';
     let operationDate = this.dateUtils.parseDate(transaction.date);
-    let payload = {};
+    let payload: any = {};
+    // Working capital loan undo only accepts locale/dateFormat/note/reversalExternalId;
+    // transactionDate/transactionAmount are required only by the generic loan adjust endpoint.
+    const undoPayload = isLoanProduct
+      ? {
+          transactionDate: this.dateUtils.formatDate(operationDate && new Date(operationDate), dateFormat),
+          transactionAmount: 0,
+          dateFormat,
+          locale
+        }
+      : { dateFormat, locale };
     if (this.isChargeOff(transaction.type)) {
       command = 'undo-charge-off';
       operationDate = this.settingsService.businessDate;
       payload = {};
     } else if (this.isWriteOff(transaction.type)) {
       command = 'undowriteoff';
-      payload = {
-        transactionDate: this.dateUtils.formatDate(operationDate && new Date(operationDate), dateFormat),
-        transactionAmount: 0,
-        dateFormat,
-        locale
-      };
+      payload = undoPayload;
     } else {
-      payload = {
-        transactionDate: this.dateUtils.formatDate(operationDate && new Date(operationDate), dateFormat),
-        transactionAmount: 0,
-        dateFormat,
-        locale
-      };
+      payload = undoPayload;
     }
 
     const undoTransactionAccountDialogRef = this.dialog.open(ConfirmationDialogComponent, {

src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts

@@ -170,6 +170,10 @@ export class ViewTransactionComponent extends LoanAccountActionsBaseComponent im
       ) {
         this.allowUndo = false;
       }
+      if (this.isWorkingCapital) {
+        this.allowEdition = false;
+        this.allowChargeback = false;
+      }
     });
     this.clientId = this.route.snapshot.params['clientId'];
     this.loanId = this.route.snapshot.params['loanId'];
@@ -291,27 +295,34 @@ export class ViewTransactionComponent extends LoanAccountActionsBaseComponent im
         if (response.confirm) {
           const locale = this.settingsService.language.code;
           const dateFormat = this.settingsService.dateFormat;
-          const data = {
-            transactionDate: this.dateUtils.formatDate(
-              this.transactionData.date && new Date(this.transactionData.date),
-              dateFormat
-            ),
-            transactionAmount: 0,
-            dateFormat,
-            locale
-          };
           const command = this.isWriteOff(this.transactionType) ? 'undowriteoff' : 'undo';
-          const transactionId = command === 'undowriteoff' ? null : this.transactionData.id;
-          this.loansService
-            .executeLoansAccountTransactionsCommand(accountId, command, data, transactionId)
-            .subscribe(() => {
-              this.router.navigate(['../'], {
-                queryParams: {
-                  productType: this.loanProductService.productType.value
-                },
-                relativeTo: this.route
-              });
+          const navigateBack = () =>
+            this.router.navigate(['../'], {
+              queryParams: {
+                productType: this.loanProductService.productType.value
+              },
+              relativeTo: this.route
             });
+          if (this.isWorkingCapital) {
+            const payload = { dateFormat, locale };
+            this.loansService
+              .applyWorkingCapitalLoanActionCommand(accountId, payload, command, this.transactionData.id)
+              .subscribe(navigateBack);
+          } else {
+            const data = {
+              transactionDate: this.dateUtils.formatDate(
+                this.transactionData.date && new Date(this.transactionData.date),
+                dateFormat
+              ),
+              transactionAmount: 0,
+              dateFormat,
+              locale
+            };
+            const transactionId = command === 'undowriteoff' ? null : this.transactionData.id;
+            this.loansService
+              .executeLoansAccountTransactionsCommand(accountId, command, data, transactionId)
+              .subscribe(navigateBack);
+          }
         }
       });
     }