From 428c3370dab79c5d0966996293d7b5d1c930ba9b Mon Sep 17 00:00:00 2001 From: gary-jipp <37557999+gary-jipp@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:10:10 -0700 Subject: [PATCH 01/13] Revert "LCSD-7312: Add proof of valid interest back to Dormancy Reinstatement form" (#4291) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "LCSD-7312: Add proof of valid interest back to Dormancy Reinstatement…" This reverts commit c94ebfdd9597a250dea4a385cde1ee7725bb6a11. --- .../application/application.component.html | 21 ------------------- .../Models.Extensions/Application.cs | 1 - 2 files changed, 22 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 ab06339468..60cb02bd5f 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 @@ -1516,27 +1516,6 @@

Discretion Request

-
-
-
-

Supporting Documents

-
-

- Proof of valid interest (lease or land title) is required - attach a copy when submitting the form. -

- - - - -
-
-
-
diff --git a/cllc-public-app/Models.Extensions/Application.cs b/cllc-public-app/Models.Extensions/Application.cs index 55c04b8409..884cecaf96 100644 --- a/cllc-public-app/Models.Extensions/Application.cs +++ b/cllc-public-app/Models.Extensions/Application.cs @@ -696,7 +696,6 @@ public static void PopulateLicenceType(this MicrosoftDynamicsCRMadoxioApplicatio EstablishmentReopeningDate = dynamicsApplication.AdoxioEstablishmentreopeningdate, // Temporary Relocations - removed 2024-08-14 - // Note 2024-09-13: This is a temporary fix - TODO: Assign the appropriate value to temporaryRelocationCriteria and update workflow for AdoxioChecklistdrivingrecordcomplete temporaryRelocationCriteria = dynamicsApplication.AdoxioChecklistdrivingrecordcomplete, }; From ae65a6d5a110db53e1e45c85d4519f0efa16f96d Mon Sep 17 00:00:00 2001 From: simranjeetgit Date: Fri, 8 Nov 2024 16:03:35 -0800 Subject: [PATCH 02/13] LCSD-7367 (#4294) SEP Application: Portion size is not getting calculated for free servings --- .../sep/drink-planner/drink-planner.component.html | 4 ++-- .../sep/drink-planner/drink-planner.component.ts | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.html b/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.html index d307f04877..4aa95cc020 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.html +++ b/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.html @@ -55,13 +55,13 @@

Enter the number of each drink type appropriate for your event:

No. Servings - + No. Free Servings - + diff --git a/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.ts b/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.ts index 3266cffe81..b6ccfb0db3 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.ts @@ -201,7 +201,8 @@ export class DrinkPlannerComponent extends FormBase implements OnInit { } storageUnits(config: DrinkConfig): number { - const servings = this.servings(config); + //calculate free and paid servings + const servings: number = (this.form.get(config.group).value + this.form.get(config.group_free).value) || 0; const storageUnits = servings * config.servingSizeMl / config.storageSizeMl; return storageUnits > 0 && storageUnits < 1 ? 1 : storageUnits; } @@ -320,4 +321,12 @@ export class DrinkPlannerComponent extends FormBase implements OnInit { } return error; } + + + //validate input should only accept numbers + validateInput(event:Event):void{ + const input = event.target as HTMLInputElement; + input.value = input.value.replace(/-/g,''); + + } } From e4693195e96940de5f8aac5958986fd699be94b9 Mon Sep 17 00:00:00 2001 From: Vijaivir Dhaliwal <91633223+vijaivir@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:12:23 -0800 Subject: [PATCH 03/13] LCSD-7483: Add banner for dynamics upgrade (#4296) * Add banner text for dynamics outage * Update banner text --- cllc-public-app/ClientApp/src/app/app.component.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cllc-public-app/ClientApp/src/app/app.component.html b/cllc-public-app/ClientApp/src/app/app.component.html index aaae96b37b..726af2dddd 100644 --- a/cllc-public-app/ClientApp/src/app/app.component.html +++ b/cllc-public-app/ClientApp/src/app/app.component.html @@ -38,6 +38,17 @@ +
+
+
+ There will be scheduled system maintenance starting on November 15, 2024 at 6 PM and ending on November 18, 2024 at 8 PM PT. The liquor and cannabis licensing portal will not be available during this time. +
+ We apologize for any inconvenience. +
+
+
+
+
From 27846891ae701b22ac87f20fc258efbf9c139e88 Mon Sep 17 00:00:00 2001 From: JSuiBCGov <143755335+JSuiBCGov@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:07:55 -0800 Subject: [PATCH 04/13] LCSD-6147 (#4298) * LCSD-6147 SEP Checklist, add permit holder's responsibilities. --- .../sep/starter-checklist/starter-checklist.component.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cllc-public-app/ClientApp/src/app/components/sep/starter-checklist/starter-checklist.component.html b/cllc-public-app/ClientApp/src/app/components/sep/starter-checklist/starter-checklist.component.html index a0853a5f88..13ef041a41 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/starter-checklist/starter-checklist.component.html +++ b/cllc-public-app/ClientApp/src/app/components/sep/starter-checklist/starter-checklist.component.html @@ -5,6 +5,11 @@

Application Checklist

+ Permit holder's responsibilities: + + Event Information:
  • Location, date, time & guest count
    • From 08a2edb4e4d0f89039e6d3f09a7ee41f185ba6f9 Mon Sep 17 00:00:00 2001 From: Vijaivir Dhaliwal <91633223+vijaivir@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:45:49 -0800 Subject: [PATCH 05/13] Update banner text (#4297) --- cllc-public-app/ClientApp/src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cllc-public-app/ClientApp/src/app/app.component.html b/cllc-public-app/ClientApp/src/app/app.component.html index 726af2dddd..a42c6fc33c 100644 --- a/cllc-public-app/ClientApp/src/app/app.component.html +++ b/cllc-public-app/ClientApp/src/app/app.component.html @@ -41,7 +41,7 @@

    - There will be scheduled system maintenance starting on November 15, 2024 at 6 PM and ending on November 18, 2024 at 8 PM PT. The liquor and cannabis licensing portal will not be available during this time. + There will be scheduled system maintenance starting on November 15, 2024 at 6 PM and ending on November 18, 2024 at 8 AM PT. The liquor and cannabis licensing portal will not be available during this time.
    We apologize for any inconvenience.
    From 532c577d09fb57facc6e65e2df8858662769d27b Mon Sep 17 00:00:00 2001 From: simranjeetgit Date: Wed, 13 Nov 2024 13:19:28 -0800 Subject: [PATCH 06/13] LCSD-6857 LCSD-7322 (#4300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LCSD-6857 & LCSD-7322 Licensing - LP/LPC/LP Location Change - Update Floor Plan Requirement Language (Occupant Load Stamp) Licensing – CM Lean – Floor Plans – 1 of 2 – Occupant Load (Fillable field) --- .../application/application.component.html | 13 ++++++++-- .../application/application.component.scss | 8 ++++++ .../application/application.component.ts | 25 ++++++++++++++++++- .../tables/capacity-table.component.html | 1 + 4 files changed, 44 insertions(+), 3 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 60cb02bd5f..a8ed6a6fa8 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 @@ -1826,20 +1826,29 @@

    ESTABLISHMENT TYPE

    [uploadHeader]="'TO UPLOAD FLOOR PLANS, DRAG FILES HERE OR'">
    -
+
+

Enter the total occupant load as indicated by the occupant load stamp on the floor plan. 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.

+
+ +

SERVICE AREAS

-
+
+
+
+

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

+
diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.scss b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.scss index b52dd73f72..6a687624a7 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.scss +++ b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.scss @@ -50,7 +50,15 @@ padding-left: 15px; margin-bottom: 20px; } + .text-red { + color: #ff0800; + } + .error-text { + color: #d8292f; + font-weight: 400; + line-height: 1.5; + } .warning-state { color: #ffc107; } 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 e7c770d343..cf0871457b 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 @@ -178,6 +178,7 @@ export class ApplicationComponent extends FormBase implements OnInit { applyAsIndigenousNation: [false], indigenousNationId: [{ value: null, disabled: true }, Validators.required], federalProducerNames: ['', Validators.required], + totalOccupantLoad: ['', Validators.required], applicantType: ['', Validators.required], description1: [''], description2: [''], @@ -617,6 +618,8 @@ export class ApplicationComponent extends FormBase implements OnInit { if (!this.application.applicationType.serviceAreas) { this.form.get('serviceAreas').disable(); + this.form.get('totalOccupantLoad').disable(); + } if (!this.application.applicationType.outsideAreas) { this.form.get('outsideAreas').disable(); @@ -1114,12 +1117,19 @@ export class ApplicationComponent extends FormBase implements OnInit { } } - const serviceArea = ('areas' in this.form.get('serviceAreas').value) ? this.form.get('serviceAreas').value['areas'] : this.form.get('serviceAreas').value; + const serviceArea = ('areas' in this.form.get('serviceAreas').value) ? this.form.get('serviceAreas').value['areas'] : this.form.get('serviceAreas').value; + //if (this.showServiceArea() && serviceArea.length === 0 && (this.isLP() || ApplicationTypeNames.SpecialEventAreaEndorsement || ApplicationTypeNames.LoungeAreaEndorsment) ) { if (this.showServiceArea() && serviceArea.length === 0) { 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.'); + } + } // optional for this application type @@ -1489,6 +1499,7 @@ export class ApplicationComponent extends FormBase implements OnInit { establishmentParcelId: 'Please enter the Parcel Identifier (format: 9 digits)', establishmentopeningdate: 'Please enter the store opening date', federalProducerNames: 'Please enter the name of federal producer', + totalOccupantLoad:'Please enter the total occupant load', hasValidInterest: 'Please enter a value for valid interest', indigenousNationId: 'Please select the Indigenous nation', isAlr: 'Please indicate ALR status', @@ -1771,4 +1782,16 @@ export class ApplicationComponent extends FormBase implements OnInit { this.licenseToRemove = assignedLicence; this.form.get("description1").patchValue(this.licenseToRemove.name); } + + validateInput(event:Event):void{ + const input = event.target as HTMLInputElement; + input.value = input.value.replace(/-/g,''); + } + + isOccupantLoadCorrect(): Boolean{ + 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; + return totalOccupantLoad>=totalCapacity; + } } diff --git a/cllc-public-app/ClientApp/src/app/components/tables/capacity-table.component.html b/cllc-public-app/ClientApp/src/app/components/tables/capacity-table.component.html index dfdd771ee0..6322672149 100644 --- a/cllc-public-app/ClientApp/src/app/components/tables/capacity-table.component.html +++ b/cllc-public-app/ClientApp/src/app/components/tables/capacity-table.component.html @@ -13,6 +13,7 @@ [areaCategory]="areaCategory" [onDelete]="removeRow.bind(this)" [index]="i" [onRowChange]="onRowChange.bind(this)" [enabled]="enabled"> +
From cecd80ea0360a37fd867e233c99649611609c14a Mon Sep 17 00:00:00 2001 From: JSuiBCGov <143755335+JSuiBCGov@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:47:18 -0800 Subject: [PATCH 07/13] LCSD-7413 SEP refund policy (#4302) * LCSD-6147 Adding permit holder's responsibilities to the checklist * LCSD-6147 Adding permit holder's responsibilities to the checklist * LCSD-6147 SEP Checklist, add permit holder's responsibilities. * revert accidental changes on package-lock.json and package.json * LCSD-7413 SEP refund policy Adding SEP refund policy and checkbox --- .../summary/summary.component.html | 55 +++++++++++++++++-- .../summary/summary.component.scss | 5 ++ .../summary/summary.component.ts | 12 +++- 3 files changed, 65 insertions(+), 7 deletions(-) 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 0f1e7d89c7..58c7566b14 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 @@ -112,11 +112,12 @@

{{application.policeDecisionBy?.name}}.

-
+ +

Your application was approved, however you did not pay for it before the event start date. Therefore, the permit @@ -497,17 +498,59 @@

Declaration

Permits cannot be issued before or on the date that they are submitted.

+ +
+ + + + SPECIAL EVENT REFUND + + +

Generally, Permit fees are non-refundable. A cancelled event is not grounds for a refund.

+

Refunds for permit fees may be available if:

+
    +
  • 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 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.

+

Payment may appear on a credit card statement as:

+
    +
  • "Special Occasion licence"
    • +
  • "Special Occasio"
    • +
  • Other variations
    • +
+
+ + * + I have read and understand the refund policy. + +
+ Please affirm that you have read and understand the refund policy. +
+
+ +
+ + +
-

Application Approved!

- + padding: 20px; + background-color: #fcba19; + padding-bottom: 20px;"> +

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.

+ +
+
+ Please affirm that you have read and understand the refund policy. +
diff --git a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.scss b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.scss index b287f47477..05e78596b0 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.scss +++ b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.scss @@ -42,6 +42,11 @@ } } } + .error-text { + color: #d8292f; + font-weight: 400; + line-height: 1.5; + } h4{ border-bottom: solid #e0e0e0 1px; diff --git a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts index 66dce2b929..163ce7f33a 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts @@ -94,6 +94,8 @@ export class SummaryComponent implements OnInit { paymentTransactionMessage: string; loaded: boolean; savingToAPI: boolean; + isRefundPolicyChecked: boolean = false; + showError:boolean = false; @Input() set localId(value: number) { this._appID = value; @@ -448,7 +450,12 @@ export class SummaryComponent implements OnInit { // present a confirmation dialog prior to the payment being processed. payNow() { - //this.submitApplication(); + this.validateRefundPolicyCheckbox(); + + if (!this.isRefundPolicyChecked) { + return; + } + // set dialogConfig settings const dialogConfig = { autoFocus: true, @@ -467,6 +474,9 @@ export class SummaryComponent implements OnInit { window.print(); } + validateRefundPolicyCheckbox() { + this.showError = !this.isRefundPolicyChecked; + } } From a9a7fb76645b6da7026496a388b4c87fe73b0f07 Mon Sep 17 00:00:00 2001 From: Vijaivir Dhaliwal <91633223+vijaivir@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:47:50 -0800 Subject: [PATCH 08/13] LCSD-7414: Added refund policy for renewal applications (#4301) added refund policy for renewal applications --- .../application-renewal.component.html | 33 +++++++++++++++++++ .../application-renewal.component.ts | 2 ++ .../liquor-renewal.component.html | 33 +++++++++++++++++++ .../liquor-renewal.component.ts | 5 ++- 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html b/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html index 46f763c2f5..da2da18b6e 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html +++ b/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html @@ -470,6 +470,39 @@

APPLICATION CONTACT DETAILS

+

REFUND POLICYY

+
+

+ Licence renewal fees are generally non-refundable. +

+ Refunds for licence renewal fees may be available if the: +

+
    +
  • The LCRB has made an error
    • +
  • Applicant has overpaid
    • +
+

+ Renewal fees must be paid in full for a licence to remain valid. +

+

+ Payment may appear on a credit card statement as:
+ "Liquor and Cannabis Re… Victoria BC" and other variations. +

+

+ 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. +

+ + + + * + + I have read and understand the refund policy. + + + +
+

DECLARATIONS

diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.ts b/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.ts index 1e9512d4fb..271c15361f 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.ts @@ -52,6 +52,7 @@ const ValidationErrorMap = { contactPersonPhone: "Please enter the business contact's 10-digit phone number", authorizedToSubmit: "Please affirm that you are authorized to submit the application", signatureAgreement: "Please affirm that all of the information provided for this application is true and complete", + readRefundPolicy: "Please affirm that you have read and understand the refund policy" }; @@ -242,6 +243,7 @@ export class ApplicationRenewalComponent extends FormBase implements OnInit { authorizedToSubmit: ["", [this.customRequiredCheckboxValidator()]], signatureAgreement: ["", [this.customRequiredCheckboxValidator()]], + readRefundPolicy: ["", [this.customRequiredCheckboxValidator()]], assignedLicence: this.fb.group({ id: [""], diff --git a/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.html b/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.html index ceceb2901f..0b55affb01 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.html +++ b/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.html @@ -396,6 +396,39 @@

RENEWAL CONTACT DETAILS

+

REFUND POLICYY

+
+

+ Licence renewal fees are generally non-refundable. +

+ Refunds for licence renewal fees may be available if the: +

+
    +
  • The LCRB has made an error
    • +
  • Applicant has overpaid
    • +
+

+ Renewal fees must be paid in full for a licence to remain valid. +

+

+ Payment may appear on a credit card statement as:
+ "Liquor and Cannabis Re… Victoria BC" and other variations. +

+

+ 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. +

+ + + + * + + I have read and understand the refund policy. + + + +
+

DECLARATIONS

diff --git a/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.ts b/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.ts index 610f9101ea..ec38a24546 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/applications/liquor-renewal/liquor-renewal.component.ts @@ -44,6 +44,7 @@ const ValidationErrorMap = { contactPersonPhone: "Please enter the business contact's 10-digit phone number", authorizedToSubmit: "Please affirm that you are authorized to submit the application", signatureAgreement: "Please affirm that all of the information provided for this application is true and complete", + readRefundPolicy: "Please affirm that you have read and understand the refund policy", ldbOrderTotals: "Please provide LDB Order Totals ($0 - $10,000,000)", ldbOrderTotalsConfirm: "Please confirm LDB Order Totals matches", @@ -142,7 +143,9 @@ export class LiquorRenewalComponent extends FormBase implements OnInit { authorizedToSubmit: ["", [this.customRequiredCheckboxValidator()]], signatureAgreement: ["", [this.customRequiredCheckboxValidator()]], - isManufacturedMinimum: ["", []] + isManufacturedMinimum: ["", []], + + readRefundPolicy: ["", [this.customRequiredCheckboxValidator()]], }); this.previousYear = (new Date().getFullYear() - 1).toString(); From e9a0e4b7c2a8412b62a6e8b57650d1c797027c4e Mon Sep 17 00:00:00 2001 From: Vijaivir Dhaliwal <91633223+vijaivir@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:45:59 -0800 Subject: [PATCH 09/13] LCSD-7235: Fixed typo, rearrange refund policy section, add declaration validation (#4303) * added refund policy for renewal applications * fix typo, move refund policy, add declaration validation * fix typo --- .../application-renewal.component.html | 6 +- .../liquor-renewal.component.html | 6 +- .../summary/summary.component.html | 95 ++++++++++--------- .../summary/summary.component.ts | 13 ++- 4 files changed, 71 insertions(+), 49 deletions(-) diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html b/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html index da2da18b6e..c3eb809591 100644 --- a/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html +++ b/cllc-public-app/ClientApp/src/app/components/applications/application-renewal/application-renewal.component.html @@ -470,7 +470,7 @@

APPLICATION CONTACT DETAILS

-

REFUND POLICYY

+

REFUND POLICY

Licence renewal fees are generally non-refundable. @@ -489,7 +489,9 @@

REFUND POLICYY

"Liquor and Cannabis Re… Victoria BC" and other variations.

- 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. + + 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. +

RENEWAL CONTACT DETAILS
-

REFUND POLICYY

+

REFUND POLICY

Licence renewal fees are generally non-refundable. @@ -415,7 +415,9 @@

REFUND POLICYY

"Liquor and Cannabis Re… Victoria BC" and other variations.

- 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. + + 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. +

LIQUOR QUANTITIES +
+ + + + SPECIAL EVENT REFUND + + +

Generally, Permit fees are non-refundable. A cancelled event is not grounds for a refund.

+

Refunds for permit fees may be available if:

+
    +
  • 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 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.

+

Payment may appear on a credit card statement as:

+
    +
  • "Special Occasion licence"
    • +
  • "Special Occasio"
    • +
  • Other variations
    • +
+
+ + * + I have read and understand the refund policy. + +
+ Please affirm that you have read and understand the refund policy. +
+
+ +
+
@@ -461,21 +495,30 @@

LIQUOR QUANTITIES

Declaration

- -

I, {{contact?.name}}, certify that all of the information is true and complete to the best of my knowledge. I have read the terms and conditions of the permit, and if the application is approved, the permittee listed on the permit will be responsible for liquor service at the event.

- - -

By checking this box, I confirm that I have read, agree to and acknowledge the declaration. I also - certify that I am at least 19 years old and that no essential information has been concealed or - misrepresented on this application.

+ +

+ * + By checking this box, I confirm that I have read, agree to and acknowledge the declaration. I also + certify that I am at least 19 years old and that no essential information has been concealed or + misrepresented on this application. +

+
+ Please read and acknowledge the declaration before proceeding. +
+
@@ -489,7 +532,7 @@

Declaration

-
+
@@ -498,40 +541,6 @@

Declaration

Permits cannot be issued before or on the date that they are submitted.

- -
- - - - SPECIAL EVENT REFUND - - -

Generally, Permit fees are non-refundable. A cancelled event is not grounds for a refund.

-

Refunds for permit fees may be available if:

-
    -
  • 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 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.

-

Payment may appear on a credit card statement as:

-
    -
  • "Special Occasion licence"
    • -
  • "Special Occasio"
    • -
  • Other variations
    • -
-
- - * - I have read and understand the refund policy. - -
- Please affirm that you have read and understand the refund policy. -
-
- -
@@ -547,7 +556,7 @@

Application Approved!

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.

-
+

Please affirm that you have read and understand the refund policy.
diff --git a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts index 163ce7f33a..1d5b0b28cf 100644 --- a/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/sep/sep-application/summary/summary.component.ts @@ -95,7 +95,9 @@ export class SummaryComponent implements OnInit { loaded: boolean; savingToAPI: boolean; isRefundPolicyChecked: boolean = false; - showError:boolean = false; + showRefundPolicyError:boolean = false; + isDeclarationChecked: boolean = false; + showDeclarationError: boolean = false; @Input() set localId(value: number) { this._appID = value; @@ -419,6 +421,13 @@ export class SummaryComponent implements OnInit { } async submitApplication(): Promise { + // check declaration + if(!this.isDeclarationChecked){ + this.showDeclarationError = true; + return; + } + + this.showDeclarationError = false; this.savingToAPI = true; const appData = await this.db.getSepApplication(this.localId); @@ -475,7 +484,7 @@ export class SummaryComponent implements OnInit { } validateRefundPolicyCheckbox() { - this.showError = !this.isRefundPolicyChecked; + this.showRefundPolicyError = !this.isRefundPolicyChecked; } } From e75f68f59cb9c821b83d0608215bdcc52d832506 Mon Sep 17 00:00:00 2001 From: Sam Warren Date: Thu, 14 Nov 2024 16:54:13 -0700 Subject: [PATCH 10/13] LCSD-7312: Add proof of valid interest back to dormancy reinstatement (#4299) --- .../application/application.component.html | 21 +++++++++++++++++++ .../application/application.component.ts | 4 ++-- 2 files changed, 23 insertions(+), 2 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 a8ed6a6fa8..c86b2c5752 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 @@ -1516,6 +1516,27 @@

Discretion Request

+
+
+
+

Supporting Documents

+
+

+ Proof of valid interest (lease or land title) is required - attach a copy when submitting the form. +

+ + + + +
+
+
+
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 cf0871457b..2c837e25c3 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 @@ -88,7 +88,7 @@ export class ApplicationComponent extends FormBase implements OnInit { uploadedPartnershipAgreement: 0; uploadedOtherDocuments: 0; uploadedIndividualsWithLessThan10: 0; - proofofValidInterestDocuments: 0; + proofOfValidInterestDocuments: 0; dynamicsForm: DynamicsForm; autocompleteLocalGovernmemts: any[]; autocompletePoliceDurisdictions: any[]; @@ -1231,7 +1231,7 @@ export class ApplicationComponent extends FormBase implements OnInit { } } - if (this.application?.applicationType?.name === ApplicationTypeNames.DormancyReinstatement && (this.proofofValidInterestDocuments || 0) < 1) { + if (this.application?.applicationType?.name === ApplicationTypeNames.DormancyReinstatement && (this.proofOfValidInterestDocuments || 0) < 1) { valid = false; this.validationMessages.push('At least one proof of valid interest document is required.'); } From 09f4eb3a026adb05df1d81cc9d7656bd74d3ab86 Mon Sep 17 00:00:00 2001 From: simranjeetgit Date: Mon, 18 Nov 2024 09:55:38 -0800 Subject: [PATCH 11/13] LCSD-7322 (#4304) * LCSD-7322 Added checkbox for proposed capacity if the occupant load exceeds the total allowed load & Content updates --- .../application/application.component.html | 16 ++++++++++++---- .../application/application.component.ts | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 6 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 c86b2c5752..ead9e49a1f 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 @@ -1848,9 +1848,10 @@

ESTABLISHMENT TYPE


-

Enter the total occupant load as indicated by the occupant load stamp on the floor plan. 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.

+ +
@@ -1869,7 +1870,14 @@

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. + +
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 2c837e25c3..c4ba22b560 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 @@ -107,7 +107,7 @@ export class ApplicationComponent extends FormBase implements OnInit { uploadedCentralSecuritiesRegisterDocuments: number = 0; tiedHouseExemptions: { jobNumber: string, displayName: string }[] = []; licenseToRemove: RelatedLicence; - + showOccupantLoadCheckBox: boolean = false; isHasPatioBackingFld: boolean = true; @@ -179,6 +179,7 @@ export class ApplicationComponent extends FormBase implements OnInit { indigenousNationId: [{ value: null, disabled: true }, Validators.required], federalProducerNames: ['', Validators.required], totalOccupantLoad: ['', Validators.required], + totalOccupantLoadExceed: [false, Validators.required], applicantType: ['', Validators.required], description1: [''], description2: [''], @@ -1792,6 +1793,15 @@ export class ApplicationComponent extends FormBase implements OnInit { 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; - return totalOccupantLoad>=totalCapacity; + const isExceeded:boolean = totalOccupantLoad>=totalCapacity + if(isExceeded){ + this.form.controls['totalOccupantLoadExceed'].enabled; + this.showOccupantLoadCheckBox = true; + }else{ + this.form.controls['totalOccupantLoadExceed'].disabled; + this.showOccupantLoadCheckBox = false; + + } + return this.form.get('totalOccupantLoadExceed').value === true || isExceeded; } } From 8c21151aecac4cb0dead154e95c2ad06e8ffa681 Mon Sep 17 00:00:00 2001 From: Vijaivir Dhaliwal <91633223+vijaivir@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:56:01 -0800 Subject: [PATCH 12/13] Revert System Maintenance Banner (#4305) remove banner --- cllc-public-app/ClientApp/src/app/app.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cllc-public-app/ClientApp/src/app/app.component.html b/cllc-public-app/ClientApp/src/app/app.component.html index a42c6fc33c..0ebf8a071f 100644 --- a/cllc-public-app/ClientApp/src/app/app.component.html +++ b/cllc-public-app/ClientApp/src/app/app.component.html @@ -38,7 +38,8 @@ -
+ +
From c3ad739ecb8354c54c3c4ea459381a8f5e9c13be Mon Sep 17 00:00:00 2001 From: JSuiBCGov <143755335+JSuiBCGov@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:40:23 -0800 Subject: [PATCH 13/13] LCSD-6465 remove "aircraft" from LP application (#4307) * LCSD-6147 Adding permit holder's responsibilities to the checklist * LCSD-6147 Adding permit holder's responsibilities to the checklist * LCSD-6147 SEP Checklist, add permit holder's responsibilities. * revert accidental changes on package-lock.json and package.json * LCSD-7413 SEP refund policy Adding SEP refund policy and checkbox * LCSD-6465 remove "aircraft" from LP application "aircraft" is not an establishment type and need to be removed. --- .../applications/application/application.component.html | 7 +++---- 1 file changed, 3 insertions(+), 4 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 ead9e49a1f..8703f6e07c 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 @@ -1555,7 +1555,6 @@

ESTABLISHMENT TYPE

    -
  • Aircraft
  • Airport Lounge
  • Aquarium
  • Art Gallery
    • @@ -1563,11 +1562,11 @@

    ESTABLISHMENT TYPE

  • Bingo Hall
  • Brew Pub
  • Casino
    • +
  • Community Centre
    -
  • Community Centre
  • Concert Hall
  • Convention Centre
  • Cooking School
    • @@ -1575,13 +1574,13 @@

    ESTABLISHMENT TYPE

  • Fishing Lodge
  • Golf Course
  • Hair Salon
    • +
  • Live Theatre
    -
  • Live Theatre
  • Lounge
  • Military Mess
  • Movie Theatre
    • @@ -1589,11 +1588,11 @@

    ESTABLISHMENT TYPE

  • Night Club/Cabaret
  • Private Club
  • Public House (Pub)
    • +
  • Recreation Facility
    -
  • Recreation Facility
  • Rental Hall
  • Resort
  • Retail Store