From cd771c72586c735c3ea0c95cace5bcce3cc85ff2 Mon Sep 17 00:00:00 2001 From: gary-jipp <37557999+gary-jipp@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:47:23 -0700 Subject: [PATCH 1/5] LCSD-7190 - Minor Text change (#4220) LCSD-7190 - Policy - LIQ - Market Authorization / Craft Distilleries - Minor Content Change on Portal (2G) --- .../src/app/components/market-event/market-event.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.html b/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.html index a6331777ad..ddf17b7b80 100644 --- a/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.html +++ b/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.html @@ -47,7 +47,7 @@

MARKET ELIGIBILITY CONSENT

As per Liquor Manufacturing Terms and Conditions, it is your responsibility as a liquor manufacturer to ensure that the market where you intend to sell the product manufactured under your licence is eligible. - Your Regional Manufacturing inspector can inspect at the market site to check for compliance with the Liquor Manufacturing Terms and Conditions. + Your Regional Manufacturing inspector can inspect the market site to check for compliance with the Liquor Manufacturing Terms and Conditions.

I hereby consent that:

There is no local rule preventing the sale of packaged liquor at a market.
From 7d75b9ef5cf59422d3764488c5ebf2204c3aee19 Mon Sep 17 00:00:00 2001 From: williamrosswhite <47016475+williamrosswhite@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:57:25 -0700 Subject: [PATCH 2/5] LCSD-7244 - Banner on the Portal (#4222) init commit Co-authored-by: W. Ross White --- cllc-public-app/ClientApp/src/app/app.component.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 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 06615ad026..4bb73f90b1 100644 --- a/cllc-public-app/ClientApp/src/app/app.component.html +++ b/cllc-public-app/ClientApp/src/app/app.component.html @@ -20,7 +20,6 @@ Liquor and Cannabis Licensing -
@@ -39,6 +38,17 @@ +
+
+
+ There will be a scheduled system update on July 31, 2024 between 6 and 7 am PT. The liquor and cannabis licensing portal will not be available during that time. +
+ We apologize for any inconvenience. +
+
+
+
+
From e0c6087267fdd529fce95e8a5b1820fd5a9c1904 Mon Sep 17 00:00:00 2001 From: williamrosswhite <47016475+williamrosswhite@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:53:20 -0700 Subject: [PATCH 3/5] LCSD-7244 - Banner on the Portal (#4225) init commit Co-authored-by: W. Ross White --- 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 4bb73f90b1..f59ce9c923 100644 --- a/cllc-public-app/ClientApp/src/app/app.component.html +++ b/cllc-public-app/ClientApp/src/app/app.component.html @@ -39,7 +39,7 @@
-
+

There will be a scheduled system update on July 31, 2024 between 6 and 7 am PT. The liquor and cannabis licensing portal will not be available during that time.
From 97e1f0f25293bc432c9a7b021da78f735c1d030f Mon Sep 17 00:00:00 2001 From: williamrosswhite <47016475+williamrosswhite@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:53:59 -0700 Subject: [PATCH 4/5] LCSD-7190 Policy - LIQ - Market Authorization / Craft Distilleries - Minor Content Change on Portal (#4226) init commit Co-authored-by: W. Ross White --- .../components/market-event/market-event.component.ts | 3 --- .../ClientApp/src/app/models/licence-event.model.ts | 1 - functional-tests/bdd-tests/TestBaseMarketEvents.cs | 10 ---------- 3 files changed, 14 deletions(-) diff --git a/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.ts b/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.ts index 9f64ada11b..094ff4365d 100644 --- a/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.ts +++ b/cllc-public-app/ClientApp/src/app/components/market-event/market-event.component.ts @@ -61,7 +61,6 @@ export class MarketEventComponent extends FormBase implements OnInit { isNoPreventingSaleofLiquor: ["", [Validators.required]], isMarketManagedorCarried: ["", [Validators.required]], isMarketOnlyVendors: ["", [Validators.required]], - isNoImportedGoods: ["", [Validators.required]], isMarketHostsSixVendors: ["", [Validators.required]], isMarketMaxAmountorDuration: ["", [Validators.required]], isAllStaffServingitRight: ["", [Validators.required]], @@ -213,7 +212,6 @@ export class MarketEventComponent extends FormBase implements OnInit { isNoPreventingSaleofLiquor: licenceEvent.isNoPreventingSaleofLiquor, isMarketManagedorCarried: licenceEvent.isMarketManagedorCarried, isMarketOnlyVendors: licenceEvent.isMarketOnlyVendors, - isNoImportedGoods: licenceEvent.isNoImportedGoods, isMarketHostsSixVendors: licenceEvent.isMarketHostsSixVendors, isMarketMaxAmountorDuration: licenceEvent.isMarketMaxAmountorDuration, isAllStaffServingitRight: licenceEvent.isAllStaffServingitRight, @@ -508,7 +506,6 @@ export class MarketEventComponent extends FormBase implements OnInit { isNoPreventingSaleofLiquor: "Please agree to all terms", isMarketManagedorCarried: "Please agree to all terms", isMarketOnlyVendors: "Please agree to all terms", - isNoImportedGoods: "Please agree to all terms", isMarketHostsSixVendors: "Please agree to all terms", isMarketMaxAmountorDuration: "Please agree to all terms", isAllStaffServingitRight: "Please agree to all terms", diff --git a/cllc-public-app/ClientApp/src/app/models/licence-event.model.ts b/cllc-public-app/ClientApp/src/app/models/licence-event.model.ts index e0f90d026d..29be902eef 100644 --- a/cllc-public-app/ClientApp/src/app/models/licence-event.model.ts +++ b/cllc-public-app/ClientApp/src/app/models/licence-event.model.ts @@ -102,7 +102,6 @@ export class LicenceEvent { isNoPreventingSaleofLiquor: boolean; isMarketManagedorCarried: boolean; isMarketOnlyVendors: boolean; - isNoImportedGoods: boolean; isMarketHostsSixVendors: boolean; isMarketMaxAmountorDuration: boolean; mktOrganizerContactName: string; diff --git a/functional-tests/bdd-tests/TestBaseMarketEvents.cs b/functional-tests/bdd-tests/TestBaseMarketEvents.cs index 20766ec517..838778565c 100644 --- a/functional-tests/bdd-tests/TestBaseMarketEvents.cs +++ b/functional-tests/bdd-tests/TestBaseMarketEvents.cs @@ -45,11 +45,6 @@ public void MarketEvents(string frequency) ngDriver.FindElement(By.CssSelector("mat-checkbox[formcontrolname='isMarketOnlyVendors']")); uiIsMarketOnlyVendors.Click(); - // select imported goods checkbox - var uiIsNoImportedGoods = - ngDriver.FindElement(By.CssSelector("mat-checkbox[formcontrolname='isNoImportedGoods']")); - uiIsNoImportedGoods.Click(); - // select six vendors checkbox var uiIsMarketHostsSixVendors = ngDriver.FindElement(By.CssSelector("mat-checkbox[formcontrolname='isMarketHostsSixVendors']")); @@ -397,11 +392,6 @@ public void MarketEventDataCorrect(string frequency) ngDriver.FindElement(By.CssSelector("mat-checkbox[formcontrolname='isMarketOnlyVendors']")); Assert.Contains("mat-checkbox-checked", uiIsMarketOnlyVendors.GetAttribute("class")); - // confirm imported goods checkbox is selected - var uiIsNoImportedGoods = - ngDriver.FindElement(By.CssSelector("mat-checkbox[formcontrolname='isNoImportedGoods']")); - Assert.Contains("mat-checkbox-checked", uiIsNoImportedGoods.GetAttribute("class")); - // confirm six vendors checkbox is selected var uiIsMarketHostsSixVendors = ngDriver.FindElement(By.CssSelector("mat-checkbox[formcontrolname='isMarketHostsSixVendors']")); From 91e94a7dd41509c478ba3c771674589013b4b5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AJ=20Po-D=C3=A9ziel?= Date: Wed, 31 Jul 2024 09:27:25 -0700 Subject: [PATCH 5/5] LCSD-7244: Remove outage banner for 2024-07-31 maintenance event (#4231) Remove outage banner for 2024-07-31 maintenance event --- cllc-public-app/ClientApp/src/app/app.component.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cllc-public-app/ClientApp/src/app/app.component.html b/cllc-public-app/ClientApp/src/app/app.component.html index f59ce9c923..aaae96b37b 100644 --- a/cllc-public-app/ClientApp/src/app/app.component.html +++ b/cllc-public-app/ClientApp/src/app/app.component.html @@ -38,17 +38,6 @@
-
-
-
- There will be a scheduled system update on July 31, 2024 between 6 and 7 am PT. The liquor and cannabis licensing portal will not be available during that time. -
- We apologize for any inconvenience. -
-
-
-
-