Revert "LCSD-7008: Do not display "Submit & Pay" button on /applicati…

…on form if Generate Invoice=Yes" (#4213)
bcgov · Jul 16, 2024 · c3a1582 · c3a1582
1 parent f8183b2
commit c3a1582
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/...plications/application-tied-house-exemption/application-tied-house-exemption.component.ts b/...plications/application-tied-house-exemption/application-tied-house-exemption.component.ts
@@ -232,6 +232,9 @@ export class ApplicationTiedHouseExemptionComponent extends FormBase implements
     const assignedJobNumber = this.form.get("assignedLicence.jobNumber").value;
 
 
+    console.log("Tied House Exemption===> Save: licenceId: " + this.licenceId + ", assignedLicenceId: " + assignedLicenceId + ", assignedLicenceNumber: " + assignedLicenceNumber + ", assignedJobNumber: " + assignedJobNumber);
+
+
     if (!this.licenceId) {
       this.application.parentApplicationId = this.applicationId;
       const applicationType = this.applicationType;

diff --git a/...blic-app/ClientApp/src/app/components/applications/application/application.component.html b/...blic-app/ClientApp/src/app/components/applications/application/application.component.html
@@ -3039,16 +3039,16 @@ <h3>LG/IN Review Complete </h3>
             </button>
 
             <!-- NEXT STEP BUTTONS
-  LG Approval Required -- > Submit to LG For Approval
+    LG Approval Required -- > Submit to LG For Approval
 
-  No LG Approvals Required
-  No Security Screening Required -- > Submit & Pay
-  Security Screening Required    -- > Proceed to Security Screening
-  LG Approved
-  No Security Screening Required -- > Submit & Pay
-  Security Screening Required    -- > Proceed to Security Screening
+    No LG Approvals Required
+    No Security Screening Required -- > Submit & Pay
+    Security Screening Required    -- > Proceed to Security Screening
+    LG Approved
+    No Security Screening Required -- > Submit & Pay
+    Security Screening Required    -- > Proceed to Security Screening
 
-  -->
+    -->
             <!-- LG Approval Required -->
             <button mat-raised-button class="ng-test-submit-for-lg-review" color="primary"
                     *ngIf="showSubmitToLG()"
@@ -3060,8 +3060,7 @@ <h3>LG/IN Review Complete </h3>
             <!-- LG Approved OR NO LG Approvals Required -->
             <ng-container *ngIf="lGHasApproved() || ((!application?.applicationType?.isShowLGINApproval && !application?.applicationType?.isShowLGZoningConfirmation) || !showSubmitToLG())">
 
-              <!--LCSD-7008: 2024-05-01 waynezen dont show Submit & Pay if Invoice Trigger has already run -->
-              <button mat-raised-button *ngIf="!application?.applicationType?.requiresSecurityScreening && !hasInvoiceTriggerRun()" color="primary"
+              <button mat-raised-button *ngIf="!application?.applicationType?.requiresSecurityScreening" color="primary"
                       (click)="submit_application()" [disabled]="submitApplicationInProgress">
                 SUBMIT&nbsp;<span *ngIf="!isFreeEndorsement() && !application?.applicationType?.isFree &&  !skipPayment && !isRAS()">&amp; PAY</span>
                 <mat-progress-bar *ngIf="submitApplicationInProgress" mode="indeterminate"></mat-progress-bar>

diff --git a/...public-app/ClientApp/src/app/components/applications/application/application.component.ts b/...public-app/ClientApp/src/app/components/applications/application/application.component.ts
@@ -1257,15 +1257,6 @@ export class ApplicationComponent extends FormBase implements OnInit {
     return isAllowed;
   }
 
-  /**
-   * LCSD-7008: 2024-05-01 waynezen: prevent check if Dynamics 365 Invoice generation workflow has already run
-   */
-  private hasInvoiceTriggerRun(): boolean {
-    const hasRun: boolean = (
-      this?.application?.invoiceTrigger === 1)
-
-    return hasRun;
-  }
 
   /**
    * Redirect to payment processing page (Express Pay / Bambora service)