From 9252cd9b094c6246f2da16f6a96e2a747520b870 Mon Sep 17 00:00:00 2001 From: simranjeetgit Date: Tue, 19 Nov 2024 15:14:02 -0800 Subject: [PATCH] Merge to Master Updated SEP refund policy content & bug fixes (#4314) LCSD-7322 LG - Occupant load bug fix LCSD-7498 Updated SEP refund policy content --- .../application/application.component.html | 32 +++++++++++-------- .../application/application.component.ts | 16 ++++++++-- .../summary/summary.component.html | 4 +-- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html index 23bf56f73a..f4e4ce3d2e 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html +++ b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html @@ -1846,10 +1846,13 @@

ESTABLISHMENT TYPE


-

Enter the total occupant load as indicated by your local government. This number can be either the total stamped on the floor plan or the sum of occupant loads across all service areas, as listed in the occupant load stamp.

-
+
+

Enter the total occupant load as indicated by your local government. This number can be either the total stamped on the floor plan or the sum of occupant loads across all service areas, as listed in the occupant load stamp.

+ +
+
@@ -1865,17 +1868,20 @@

SERVICE -
-
-

The sum of occupant loads across all service areas does not match the total occupant load entered in the total occupant load field.

- -
-
- * - I affirm that the combined service area capacity exceeds the total occupant load. - -
+
+
+
+

The sum of occupant loads across all service areas does not match the total occupant load entered in the total occupant load field.

+ +
+ +
+ * + I affirm that the combined service area capacity exceeds the total occupant load. + +
+
diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts index c4ba22b560..a15010042a 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts @@ -1126,6 +1126,7 @@ export class ApplicationComponent extends FormBase implements OnInit { valid = false; this.validationMessages.push('At least one service area is required.'); }else{ + if(!this.isOccupantLoadCorrect()){ valid = false; this.validationMessages.push('The sum of occupant loads across all service areas does not match the total occupant load entered in the total occupant load field.'); @@ -1790,18 +1791,27 @@ export class ApplicationComponent extends FormBase implements OnInit { } isOccupantLoadCorrect(): Boolean{ + if(this.hideOcupantLoadFields()){ + this.form.get('totalOccupantLoadExceed').disable(); + return true; + } const serviceArea = ('areas' in this.form.get('serviceAreas').value) ? this.form.get('serviceAreas').value['areas'] : this.form.get('serviceAreas').value; let totalCapacity = serviceArea.reduce((sum,item)=> Number(sum+(+item.capacity)),0); let totalOccupantLoad = this.form.get('totalOccupantLoad').value | 0; const isExceeded:boolean = totalOccupantLoad>=totalCapacity if(isExceeded){ - this.form.controls['totalOccupantLoadExceed'].enabled; + this.form.get('totalOccupantLoadExceed').enable(); this.showOccupantLoadCheckBox = true; }else{ - this.form.controls['totalOccupantLoadExceed'].disabled; + this.form.get('totalOccupantLoadExceed').disable(); this.showOccupantLoadCheckBox = false; - } return this.form.get('totalOccupantLoadExceed').value === true || isExceeded; } + +//Check if applicant is waiting for LG approcval or has been approved by LG. + //In this case do not block user to pay and submit if the fields are empty + hideOcupantLoadFields(): Boolean{ + return this.isOpenedByLGForApproval || this.lGHasApproved(); + } } diff --git a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.html b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.html index bf4b6c3e43..b3c9b31dd5 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.html +++ b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.html @@ -465,7 +465,7 @@

LIQUOR QUANTITIES

  • The LCRB has made an error
  • You have overpaid
    • -
  • The event is cancelled due to exceptional circumstances such as a provincial state of emergency.
    • +
  • The event is cancelled due to exceptional circumstances such as a provincial state of emergency

The LCRB investigates all credit card chargeback requests for fees and will dispute chargeback requests. A note will also be made on your LCRB account and there may be consequences for fraudulent requests.

@@ -553,7 +553,7 @@

Declaration

Application Approved!

You must pay these fees to get a special event permit. If you do not pay these fees, your application will not be valid and a licence will not be issued for your event.

-

In the event that the information on this application is no longer correct or if you wish to make additional changes, you may contact the LCRB or withdraw your application up to 24 hours before the event begins.

+

If the information on this application is no longer correct or if you wish to make additional changes, you may contact the LCRB or withdraw your application up to 24 hours before the event begins.