From ad650b72f5447c03b9c412b1dcdcafb9bd213997 Mon Sep 17 00:00:00 2001
From: simranjeetgit <simranjeet.1.singh@gov.bc.ca>
Date: Tue, 10 Dec 2024 16:42:45 -0800
Subject: [PATCH 1/2] Revert "LCSD-7008" (#4334) (#4335)

Revert "LCSD-7008 (#4330)"

This reverts commit 02f474338fc597a0c0f59e1420a2326676185ba6.
---
 .../applications/application/application.component.html     | 2 +-
 .../applications/application/application.component.ts       | 6 ------
 2 files changed, 1 insertion(+), 7 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 e1729cb028..a018eb7a9d 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
@@ -2938,7 +2938,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())">
 
-              <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/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 15a187029f..e80c7c9798 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
@@ -2028,10 +2028,4 @@ export class ApplicationComponent extends FormBase implements OnInit {
  hideOcupantLoadFields(): Boolean{
   return this.isOpenedByLGForApproval || this.lGHasApproved();
  }
-
- private hasInvoiceTriggerRun(): boolean {
-  const hasRun: boolean = (
-    this?.application?.invoiceTrigger === 1)
-  return hasRun;
-}
 }

From 0eed43b470adcba85da6fd4ac16c65b78cd1ec10 Mon Sep 17 00:00:00 2001
From: Vijaivir Dhaliwal <91633223+vijaivir@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:11:09 -0800
Subject: [PATCH 2/2] Merge to Master: LCSD-7540, 7304, 6363, 7524, 6492, 6596
 (#4340)

* Revert "LCSD-7008" (#4334)

Revert "LCSD-7008 (#4330)"

This reverts commit 02f474338fc597a0c0f59e1420a2326676185ba6.

* LCSD-6492 Tied House Exemption label text change (#4337)

Change label text for MFR production amount as requested.
Also remove read-only conditional check for the input field.

* LCSD-6596 update error message for policy document (#4338)

* LCSD-6596 update error message for policy document

Misleading/incorrect error message attribute not-found error to network
problem. Change this text to a simple "Page Not Found" text, and add
links to polices and bulletins. (provided by Coms)

* LCSD-6596 update error message for policy document

Correct left padding in CSS

* LCSD-7524, 7304, 6363: Update SEP banner formatting, Add 'Outdoor Event Venue' Establishment Type, Filter Police Review Queue (#4336)

* update sep banner formatting

* remove duplicate occupant field and add establishment type

* added check for police pending review table

* LCSD-7540: Increase text size and add margin to 'Print Page' on SEP Summary (#4339)

increase text size and add margin to print page

---------

Co-authored-by: simranjeetgit <simranjeet.1.singh@gov.bc.ca>
Co-authored-by: JSuiBCGov <143755335+JSuiBCGov@users.noreply.github.com>
---
 ...application-tied-house-exemption.component.html |  4 ++--
 .../application/application.component.html         | 14 ++++----------
 .../policy-document/policy-document.component.html |  5 ++++-
 .../policy-document/policy-document.component.scss |  2 +-
 .../sep/drink-planner/drink-planner.component.html |  6 +++---
 .../sep/error-alert/error-alert.component.scss     |  1 +
 .../payment-confirmation.component.scss            |  1 +
 .../sep-application/summary/summary.component.scss |  3 +++
 .../sep-application/summary/summary.component.ts   |  2 ++
 .../Controllers/SpecialEventsController.cs         |  2 +-
 10 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.html b/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.html
index d6d2d2ee1e..525c723688 100644
--- a/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.html
+++ b/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.html
@@ -93,9 +93,9 @@ <h3 class="blue-header">LICENSED PRODUCTION TO BE EXEMPTED</h3>
       <h3 class="blue-header">Manufacturer previous year production amount</h3>
       <section class="content-bottom">
         <div class="row">
-          <label class="col-md-6 col-xs-12"><strong>Manufacturer production amount (less spillage) for the prevouis year:</strong></label>
+          <label class="col-md-6 col-xs-12"><strong>Manufacturer production amount (less spillage) for the previous year, or if the manufacturer has not been in operation for 12 months, an estimate of the production volumes for the 12 months after submitting the exemption application:</strong></label>
           <div class="col-md-3 col-xs-12" style="align-content:start;">
-            <input class="form-control" type="number" onkeypress="return event.charCode >= 48 && event.charCode<=57" min="1" formControlName="manufacturerProductionAmountforPrevYear" [readonly]="isAppId != 'true'">
+            <input class="form-control" type="number" onkeypress="return event.charCode >= 48 && event.charCode<=57" min="1" formControlName="manufacturerProductionAmountforPrevYear">
           </div>
           <div class="col-md-3 col-xs-12" style="align-content:start;">
             <select class="form-control" style="height:35px;" formControlName="manufacturerProductionAmountUnit">
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 a018eb7a9d..bdb349cd60 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
@@ -182,7 +182,7 @@ <h3 class="blue-header">PICNIC AREA DECLARATION</h3>
             <h3 class="blue-header">Manufacturer previous year production amount</h3>
             <section class="padded-section content-bottom">
               <div class="row">
-                <label class="col-md-6 col-xs-12"><strong>Manufacturer production amount (less spillage) for the prevouis year:</strong></label>
+                <label class="col-md-6 col-xs-12"><strong>Manufacturer production amount (less spillage) for the previous year, or if the manufacturer has not been in operation for 12 months, an estimate of the production volumes for the 12 months after submitting the exemption application:</strong></label>
                 <div class="col-md-3 col-xs-12" style="align-content:start;">
                   <input class="form-control" type="number" onkeypress="return event.charCode >= 48 && event.charCode<=57" min="1"
                          formControlName="manufacturerProductionAmountForPrevYear">
@@ -942,7 +942,7 @@ <h3 class="blue-header" *ngIf="showFormControl(application?.applicationType?.new
                     </span>
 
                     <ul style="display: inline-block">
-                      <li><a href="https://www.bcassessment.ca/ " target="_bl">BC Assessment’s e-valueBC website</a> </li>
+                      <li>BC Assessment’s e-valueBC website </li>
                       <li>The municipal tax notice</li>
                       <li>The property lease</li>
                     </ul>
@@ -1585,13 +1585,14 @@ <h3 class="blue-header" *ngIf="this.isLP()">ESTABLISHMENT TYPE</h3>
                         <li>Movie Theatre</li>
                         <li>Museum</li>
                         <li>Night Club/Cabaret</li>
+                        <li>Outdoor Event Venue</li>
                         <li>Private Club</li>
                         <li>Public House (Pub)</li>
-                        <li>Recreation Facility</li>
                       </ul>
                     </td>
                     <td>
                       <ul>
+                        <li>Recreation Facility</li>
                         <li>Rental Hall</li>
                         <li>Resort</li>
                         <li>Retail Store</li>
@@ -1853,13 +1854,6 @@ <h3 class="blue-header" *ngIf="this.isLP()">ESTABLISHMENT TYPE</h3>
                 style="width: 250px;" type="number" min="1"  placeholder="Total occupant load"  (input)="validateInput($event)"  /></app-field>
               </section>
              </div>
-              
-             <div>
-              <section  *ngIf="application.applicationType.serviceAreas" > <p>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. </p>
-                <app-field [required]="true"   label="Total occupant load" [valid]="!showValidationMessages || form.get('totalOccupantLoad').valid"  errorMessage="Total occupant load is required.">   <input class="form-control" formControlName="totalOccupantLoad" id="totalOccupantLoad"
-                style="width: 250px;" type="number" min="1"  placeholder="Total occupant load"  (input)="validateInput($event)"  /></app-field>
-              </section>
-             </div>
             </div> 
           
           </section>
diff --git a/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.html b/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.html
index f2975548d3..f4838d6f8e 100644
--- a/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.html
+++ b/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.html
@@ -10,6 +10,9 @@
     </div>
   </div>
   <section *ngIf="!policyDocument && dataLoaded" class="h1">
-    Network issues are preventing the retrieval of this content. Please try again in a few minutes.
+    <p>Page Not found.</p>
+
+    <p>Find information about <a href="https://www2.gov.bc.ca/gov/content?id=BE1251A4F9AC438E97035EC1F2B0A9ED">liquor law and policy</a> or <a href="https://www2.gov.bc.ca/gov/content?id=885DA343124343C7B4BDE187D96164A1">cannabis law and policy</a>.<br/>
+    Find <a href="https://www2.gov.bc.ca/gov/content?id=A23EC0509C9C469188BBA68C3342769D">bulletins about recent policy changes</a>.</p>
   </section>
 </div>
diff --git a/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.scss b/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.scss
index 16abc165cc..c6faec8b98 100644
--- a/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.scss
+++ b/cllc-public-app/ClientApp/src/app/components/policy-document/policy-document.component.scss
@@ -17,7 +17,7 @@ h3 {
 }
 
 p {
-    padding-left: 300px;
+    padding-left: 30px;
 }
 
 .contentPolicy {
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 cd94a8bcda..7301cf8fba 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
@@ -155,14 +155,14 @@ <h3>Enter the number of each drink type appropriate for your event:</h3>
     <div class="row">
       <div style="width:100%;" *ngIf="hideGuestsAndHours">
         <div class="status yellow" *ngIf="totalPercentage < (totalServings || 0)">
-          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink Servings Must Add To 100%
+          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink servings must add to 100%
         </div>
         <div class="status red" *ngIf="totalPercentage > (totalServings || 0)">
-          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink Servings Must Not Exceed
+          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink servings must not exceed
           100%
         </div>
         <div class="status green" *ngIf="totalPercentage == (totalServings || 0)">
-          <fa-icon [icon]="faCheckCircle" style="margin-right:10px;"></fa-icon>Servings Add To 100%
+          <fa-icon [icon]="faCheckCircle" style="margin-right:10px;"></fa-icon>Servings add to 100%
         </div>
       </div>
       <div class="col-md-8 offset-md-4 col-12" *ngIf="!hideGuestsAndHours">
diff --git a/cllc-public-app/ClientApp/src/app/components/sep/error-alert/error-alert.component.scss b/cllc-public-app/ClientApp/src/app/components/sep/error-alert/error-alert.component.scss
index 5689a95486..c770793deb 100644
--- a/cllc-public-app/ClientApp/src/app/components/sep/error-alert/error-alert.component.scss
+++ b/cllc-public-app/ClientApp/src/app/components/sep/error-alert/error-alert.component.scss
@@ -2,6 +2,7 @@
 .sep-error {
     padding: 16px;
     margin-top: 8px;
+    margin-bottom: 8px;
     max-width: 800px;
     border-radius: 5px;
     fa-icon {
diff --git a/cllc-public-app/ClientApp/src/app/components/sep/payment-confirmation/payment-confirmation.component.scss b/cllc-public-app/ClientApp/src/app/components/sep/payment-confirmation/payment-confirmation.component.scss
index 5350c20061..b76581f2b4 100644
--- a/cllc-public-app/ClientApp/src/app/components/sep/payment-confirmation/payment-confirmation.component.scss
+++ b/cllc-public-app/ClientApp/src/app/components/sep/payment-confirmation/payment-confirmation.component.scss
@@ -25,5 +25,6 @@
     color: #1a5a96;
     float: right;
     margin-top: 10px;
+    font-size: large;
   }
   
\ No newline at end of file
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 05e78596b0..ee5dbd1365 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
@@ -55,4 +55,7 @@
       text-align: center;
       width: 240px;
     }
+    .print-page {
+        font-size: large;
+    }
 }
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 1d5b0b28cf..8c2cac147b 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
@@ -26,6 +26,7 @@ import {
   faExclamationTriangle,
   faFlag,
   faPencilAlt,
+  faPrint,
   faQuestionCircle,
   faShoppingCart,
   faStopwatch,
@@ -68,6 +69,7 @@ export class SummaryComponent implements OnInit {
   faBolt = faBolt;
   faCheck = faCheck;
   faBan = faBan;
+  faPrint = faPrint;
   /**
    * Controls whether or not the form show the submit button.
    * The value true by default
diff --git a/cllc-public-app/Controllers/SpecialEventsController.cs b/cllc-public-app/Controllers/SpecialEventsController.cs
index b5f54c3554..68c6b4bd58 100644
--- a/cllc-public-app/Controllers/SpecialEventsController.cs
+++ b/cllc-public-app/Controllers/SpecialEventsController.cs
@@ -1761,7 +1761,7 @@ public IActionResult GetPolicePendingReview([FromQuery] int pageIndex = 0, [From
             }
 
             // Application Status == Pending Review && Police Decision == Under Review
-            var result = GetPagedSepSummaries($"_adoxio_policejurisdictionid_value eq {userAccount._adoxioPolicejurisdictionidValue} and adoxio_policeapproval eq {(int?)ApproverStatus.PendingReview}", pageIndex, pageSize, sort, sortdir);
+            var result = GetPagedSepSummaries($"_adoxio_policejurisdictionid_value eq {userAccount._adoxioPolicejurisdictionidValue} and adoxio_policeapproval eq {(int?)ApproverStatus.PendingReview} and statuscode ne {(int?)EventStatus.Cancelled}", pageIndex, pageSize, sort, sortdir);
 
             return new JsonResult(result);