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.

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

25863 - Enable Allowable actions after a successful NoW filing #3232

Merged

Conversation

ArwenQin
Copy link
Collaborator

Issue #: /bcgov/entity#25863

Description of changes:

  • Add status WITHDRAWN to the incomplete filing check, fix the Allowable actions bug

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the lear license (Apache 2.0).

@ArwenQin ArwenQin self-assigned this Feb 18, 2025
@ArwenQin
Copy link
Collaborator Author

Before update:
image

@ArwenQin
Copy link
Collaborator Author

After update:

"filingTypes": [
{
"displayName": "Admin Freeze",
"feeCode": "NOFEE",
"name": "adminFreeze"
},
{
"displayName": "Request for AGM Extension",
"feeCode": "AGMDT",
"name": "agmExtension"
},
{
"displayName": "AGM Location Change",
"feeCode": "AGMLC",
"name": "agmLocationChange"
},
{
"displayName": "Alteration",
"feeCode": "ALTER",
"name": "alteration"
},
{
"displayName": "Amalgamation Application (Regular)",
"feeCode": "AMALR",
"name": "amalgamationApplication",
"type": "regular"
},
{
"displayName": "Amalgamation Application Short-form (Vertical)",
"feeCode": "AMALV",
"name": "amalgamationApplication",
"type": "vertical"
},
{
"displayName": "Amalgamation Application Short-form (Horizontal)",
"feeCode": "AMALH",
"name": "amalgamationApplication",
"type": "horizontal"
},
{
"displayName": "Annual Report",
"feeCode": "BCANN",
"name": "annualReport"
},
{
"displayName": "Address Change",
"feeCode": "BCADD",
"name": "changeOfAddress"
},
{
"displayName": "Director Change",
"feeCode": "BCCDR",
"name": "changeOfDirectors"
},
{
"displayName": "6-Month Consent to Continue Out",
"feeCode": "CONTO",
"name": "consentContinuationOut"
},
{
"displayName": "Register Correction Application",
"feeCode": "CRCTN",
"name": "correction"
},
{
"displayName": "Court Order",
"feeCode": "NOFEE",
"name": "courtOrder"
},
{
"displayName": "Voluntary Dissolution",
"feeCode": "DIS_VOL",
"name": "dissolution",
"type": "voluntary"
},
{
"displayName": "Administrative Dissolution",
"feeCode": "DIS_ADM",
"name": "dissolution",
"type": "administrative"
},
{
"displayName": "Correction - Put Back Off",
"feeCode": "NOFEE",
"name": "putBackOff"
},
{
"displayName": "Registrar's Notation",
"feeCode": "NOFEE",
"name": "registrarsNotation"
},
{
"displayName": "Registrar's Order",
"feeCode": "NOFEE",
"name": "registrarsOrder"
},
{
"displayName": "Transition Application",
"feeCode": "TRANS",
"name": "transition"
}
]

@@ -980,7 +980,7 @@ def get_incomplete_filings_by_type(business_id: int, filing_type: str):
filings = db.session.query(Filing). \
filter(Filing.business_id == business_id). \
filter(Filing._filing_type == filing_type). \
filter(Filing._status != Filing.Status.COMPLETED.value). \
filter(not_(Filing._status.in_([Filing.Status.COMPLETED.value, Filing.Status.WITHDRAWN.value]))). \
order_by(desc(Filing.filing_date)). \
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed in the current fix, but update it so the two methods are consistent.

@ArwenQin ArwenQin merged commit 3f3f380 into bcgov:release-2.141.0 Feb 19, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants