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

LSCD-7312: Back Merge from Master to Develop #4308

Merged
merged 3 commits into from
Nov 18, 2024
Merged

LSCD-7312: Back Merge from Master to Develop #4308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7261a2d
Revert "LCSD-7312: Add proof of valid interest back to Dormancy Reins…
gary-jipp Sep 26, 2024
131b558
LCSD-7483: Add banner for dynamics upgrade (#4296)
vijaivir Nov 12, 2024
55b5eda
Update banner text (#4297)
vijaivir Nov 12, 2024
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
11 changes: 11 additions & 0 deletions cllc-public-app/ClientApp/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@
</div>
</header>

<section>
<div style="background: red; color: #ffffff; padding-left: 25px; padding-right: 25px; font-weight: bold; text-align: center;">
<br>
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.
<br>
We apologize for any inconvenience.
<br>
<br>
</div>
</section>

<div *ngIf="showBceidTermsOfUse()">
<main class="app-content">
<app-bceid-confirmation (reloadUser)="reloadUser()" [currentUser]="currentUser"></app-bceid-confirmation>
Expand Down
21 changes: 0 additions & 21 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 @@ -1516,27 +1516,6 @@ <h3 class="blue-header">Discretion Request</h3>
</div>
</section>
</div>
<div *ngIf="application?.applicationType?.name === ApplicationTypeNames.DormancyReinstatement">
<section>
<div>
<h3 class="blue-header">Supporting Documents</h3>
<div class="content-bottom">
<p>
Proof of valid interest (lease or land title) is required - attach a copy when submitting the form.
</p>

<app-file-uploader *ngIf="applicationId" documentType="Supporting Document"
fileTypes="FILE MUST BE IN PDF FORMAT." [disableUploads]="isOpenedByLGForApproval || lGHasApproved()"
[enableFileDeletion]="!isOpenedByLGForApproval && !lGHasApproved()" [multipleFiles]="true"
entityName="application" [useDocumentTypeForName]="true"
(numberOfUploadedFiles)="proofofValidInterestDocuments = $event" [entityId]="applicationId"
[uploadHeader]="'TO UPLOAD SUPPORTING DOCUMENTS'">
</app-file-uploader>

</div>
</div>
</section>
</div>
</section>

<!-- The label of the field will now be used to communicate the message of the alert -->
Expand Down
1 change: 0 additions & 1 deletion cllc-public-app/Models.Extensions/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down