Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge to master: LCSD-7008: Do not display "Submit & Pay" button on /application form … #4218

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Merge to master: LCSD-7008: Do not display "Submit & Pay" button on /application form … #4218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...plications/application-tied-house-exemption/application-tied-house-exemption.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,6 @@ 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;
Expand Down
19 changes: 10 additions & 9 deletions ...blic-app/ClientApp/src/app/components/applications/application/application.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()"
Expand All @@ -3060,7 +3060,8 @@ <h3>LG/IN Review Complete </h3>
<!-- LG Approved OR NO LG Approvals Required -->
<ng-container *ngIf="lGHasApproved() || ((!application?.applicationType?.isShowLGINApproval && !application?.applicationType?.isShowLGZoningConfirmation) || !showSubmitToLG())">

<button mat-raised-button *ngIf="!application?.applicationType?.requiresSecurityScreening" color="primary"
<!--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"
(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>
Expand Down
9 changes: 9 additions & 0 deletions ...public-app/ClientApp/src/app/components/applications/application/application.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,15 @@ 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)
Expand Down