From fbdce61647ca58cd7c110275e3f148670a7dd483 Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Thu, 14 Dec 2023 14:46:16 -0800 Subject: [PATCH 1/3] 18805 Changed amalgamation to amalgamationApplication --- src/enums/filing-types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/enums/filing-types.ts b/src/enums/filing-types.ts index 52f6cef2..d82ad7ca 100644 --- a/src/enums/filing-types.ts +++ b/src/enums/filing-types.ts @@ -3,7 +3,7 @@ export enum FilingTypes { ALTERATION = 'alteration', AGM_EXTENSION = 'agmExtension', AGM_LOCATION_CHANGE = 'agmLocationChange', - AMALGAMATION = 'amalgamation', + AMALGAMATION = 'amalgamationApplication', ANNUAL_REPORT = 'annualReport', CHANGE_OF_ADDRESS = 'changeOfAddress', CHANGE_OF_COMPANY_INFO = 'changeOfCompanyInfo', // a type of alteration From 78f8984898cb2e452fe2631b4be7c1ba7182d03b Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Thu, 14 Dec 2023 14:55:04 -0800 Subject: [PATCH 2/3] Changed key name to AMALGAMATION_APPLICATION --- src/enums/filing-codes.ts | 6 +++--- src/enums/filing-names.ts | 2 +- src/enums/filing-types.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/enums/filing-codes.ts b/src/enums/filing-codes.ts index fbc28a12..dfd6b1bf 100644 --- a/src/enums/filing-codes.ts +++ b/src/enums/filing-codes.ts @@ -7,9 +7,9 @@ export enum FilingCodes { AFFIDAVIT = 'AFDVT', ALTERATION = 'ALTER', ALTERATION_BC_TO_ULC = 'NOALU', // different fee for BC to ULC - AMALGAMATION_HORIZONTAL = 'AMALH', // Amalgamation Application (Short Form - Horizontal) - AMALGAMATION_REGULAR = 'AMALR', // Amalgamation Application (Regular) - AMALGAMATION_VERTICAL = 'AMALV', // Amalgamation Application (Short Form - Vertical) + AMALGAMATION_APPLICATION_HORIZONTAL = 'AMALH', // Amalgamation Application (Short Form - Horizontal) + AMALGAMATION_APPLICATION_REGULAR = 'AMALR', // Amalgamation Application (Regular) + AMALGAMATION_APPLICATION_VERTICAL = 'AMALV', // Amalgamation Application (Short Form - Vertical) ANNUAL_REPORT_BC = 'BCANN', // BCOMP - Annual Report ANNUAL_REPORT_OT = 'OTANN', // Others - Annual Report CHANGE_OF_REGISTRATION = 'FMCHANGE', diff --git a/src/enums/filing-names.ts b/src/enums/filing-names.ts index dcf93485..b041c123 100644 --- a/src/enums/filing-names.ts +++ b/src/enums/filing-names.ts @@ -3,7 +3,7 @@ export enum FilingNames { AGM_EXTENSION = 'AGM Extension', AGM_LOCATION_CHANGE = 'AGM Location Change', ALTERATION = 'Alteration', - AMALGAMATION = 'Amalgamation Application', + AMALGAMATION_APPLICATION = 'Amalgamation Application', ANNUAL_REPORT = 'Annual Report', CHANGE_OF_ADDRESS = 'Address Change', CHANGE_OF_COMPANY_INFO = 'Change of Company Information', diff --git a/src/enums/filing-types.ts b/src/enums/filing-types.ts index d82ad7ca..2eab4c10 100644 --- a/src/enums/filing-types.ts +++ b/src/enums/filing-types.ts @@ -3,7 +3,7 @@ export enum FilingTypes { ALTERATION = 'alteration', AGM_EXTENSION = 'agmExtension', AGM_LOCATION_CHANGE = 'agmLocationChange', - AMALGAMATION = 'amalgamationApplication', + AMALGAMATION_APPLICATION = 'amalgamationApplication', ANNUAL_REPORT = 'annualReport', CHANGE_OF_ADDRESS = 'changeOfAddress', CHANGE_OF_COMPANY_INFO = 'changeOfCompanyInfo', // a type of alteration From c3422148ee7a9b3ace5da8eec23fa6ac1ae8e656 Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Thu, 14 Dec 2023 15:01:30 -0800 Subject: [PATCH 3/3] small change in response to Sev's comment --- src/enums/filing-codes.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/enums/filing-codes.ts b/src/enums/filing-codes.ts index dfd6b1bf..fbc28a12 100644 --- a/src/enums/filing-codes.ts +++ b/src/enums/filing-codes.ts @@ -7,9 +7,9 @@ export enum FilingCodes { AFFIDAVIT = 'AFDVT', ALTERATION = 'ALTER', ALTERATION_BC_TO_ULC = 'NOALU', // different fee for BC to ULC - AMALGAMATION_APPLICATION_HORIZONTAL = 'AMALH', // Amalgamation Application (Short Form - Horizontal) - AMALGAMATION_APPLICATION_REGULAR = 'AMALR', // Amalgamation Application (Regular) - AMALGAMATION_APPLICATION_VERTICAL = 'AMALV', // Amalgamation Application (Short Form - Vertical) + AMALGAMATION_HORIZONTAL = 'AMALH', // Amalgamation Application (Short Form - Horizontal) + AMALGAMATION_REGULAR = 'AMALR', // Amalgamation Application (Regular) + AMALGAMATION_VERTICAL = 'AMALV', // Amalgamation Application (Short Form - Vertical) ANNUAL_REPORT_BC = 'BCANN', // BCOMP - Annual Report ANNUAL_REPORT_OT = 'OTANN', // Others - Annual Report CHANGE_OF_REGISTRATION = 'FMCHANGE',