Merge to Master #4320
Merged
Merge to Master #4320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SEP Application: Portion size is not getting calculated for free servings
* Add banner text for dynamics outage * Update banner text
* LCSD-6147 SEP Checklist, add permit holder's responsibilities.
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)
* 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
added refund policy for renewal applications
…on validation (#4303) * added refund policy for renewal applications * fix typo, move refund policy, add declaration validation * fix typo
* LCSD-7322 Added checkbox for proposed capacity if the occupant load exceeds the total allowed load & Content updates
remove banner
* 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.
* remove banner * added closing section tag
… into develop Pulled master to develop
* LCSD-7322 LG - Occupant load bug fix
* LCSD-7322 LG - Occupant load bug fix * LCSD-7498 Updated SEP refund policy content
added hours of sale
…erted Changes (#4316) * added hours of sale * revert unit tests and styling
LCSD-7322 MFR bug fix
commit 203c947 Author: simranjeetgit <[email protected]> Date: Mon Nov 18 15:09:27 2024 -0800 Fixed build issues (#4311) * Revert "LCSD-7312: Add proof of valid interest back to Dormancy Reinstatement form" (#4291) Revert "LCSD-7312: Add proof of valid interest back to Dormancy Reinstatement…" This reverts commit c94ebfd. * LCSD-7367 (#4294) SEP Application: Portion size is not getting calculated for free servings * LCSD-7483: Add banner for dynamics upgrade (#4296) * Add banner text for dynamics outage * Update banner text * LCSD-6147 (#4298) * LCSD-6147 SEP Checklist, add permit holder's responsibilities. * Update banner text (#4297) * LCSD-6857 LCSD-7322 (#4300) 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) * 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 * LCSD-7414: Added refund policy for renewal applications (#4301) added refund policy for renewal applications * 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 * LCSD-7312: Add proof of valid interest back to dormancy reinstatement (#4299) * LCSD-7322 (#4304) * LCSD-7322 Added checkbox for proposed capacity if the occupant load exceeds the total allowed load & Content updates * Revert System Maintenance Banner (#4305) remove banner * 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. * Add closing section (#4309) * remove banner * added closing section tag * Fixed merge issues --------- Co-authored-by: gary-jipp <[email protected]> Co-authored-by: Vijaivir Dhaliwal <[email protected]> Co-authored-by: JSuiBCGov <[email protected]> Co-authored-by: Sam Warren <[email protected]> Merge branch 'master' of https://github.com/bcgov/jag-lcrb-carla-public into develop
vijaivir
previously approved these changes
Nov 21, 2024
vijaivir
requested changes
Nov 21, 2024
Resolved merge conflicts removed duplicate hours of sale section
vijaivir
approved these changes
Nov 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LCSD-7382 & LCSD-7322