DDS: approvals tab, vouchers, payout & close, Sundry GL search, closure tab, fixes

src/app/organization/dds-batch-processing/dds-batch-processing.component.ts

@@ -22,6 +22,7 @@ import { OrganizationService } from 'app/organization/organization.service';
 import { AlertService } from 'app/core/alert/alert.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
+import { announceHeldForApproval, heldForApproval } from 'app/deposits/dds-approvals/dds-approval-notice';
 
 /**
  * DDS Interest & Commission batch processing — the legacy Interest Part menu.
@@ -264,11 +265,11 @@ export class DdsBatchProcessingComponent implements OnInit {
           type: 'warn',
           heading: `Post ${this.jobTypeLabel}?`,
           dialogContext:
-            `${count} ${count === 1 ? 'entry' : 'entries'} totalling ${total} will be applied. `
-            + (isPosting
+            `${count} ${count === 1 ? 'entry' : 'entries'} totalling ${total} will be applied. ` +
+            (isPosting
               ? 'This credits the customers or pays the agents, and appears on the ledger. '
-              : 'This records what has been earned against each account. ')
-            + 'It cannot be undone from this screen.'
+              : 'This records what has been earned against each account. ') +
+            'It cannot be undone from this screen.'
         }
       })
       .afterClosed()
@@ -296,11 +297,21 @@ export class DdsBatchProcessingComponent implements OnInit {
     const runId = this.generatedRun.id;
     const crediting = this.isPostingJob;
 
-    this.organizationService.postDdsBatchRun(runId).subscribe(() => {
+    this.organizationService.postDdsBatchRun(runId).subscribe((response: any) => {
       this.generatedRun = null;
       this.previewRows = [];
       this.loadRecentRuns();
 
+      if (heldForApproval(response)) {
+        announceHeldForApproval(
+          response,
+          `${label} (${count} ${count === 1 ? 'entry' : 'entries'}, ${total})`,
+          this.organizationService,
+          this.alertService
+        );
+        return;
+      }
+
       if (!crediting) {
         this.alertService.alert({
           type: 'Success',
@@ -312,8 +323,9 @@ export class DdsBatchProcessingComponent implements OnInit {
       this.postingRunId = runId;
       this.alertService.alert({
         type: 'Posting',
-        message: `${label} is running — ${count} ${count === 1 ? 'entry' : 'entries'}, ${total}. `
-          + 'It continues in the background; this list will update when it is done.'
+        message:
+          `${label} is running — ${count} ${count === 1 ? 'entry' : 'entries'}, ${total}. ` +
+          'It continues in the background; this list will update when it is done.'
       });
       this.followRun(runId, label);
     });