From 527b6e009e4ebced6bb6dbe8ba984333d0a3c9e9 Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Wed, 25 Oct 2023 14:07:23 -0700
Subject: [PATCH 1/9] AGM Location Change 4th and final PR

---
 package-lock.json                      | 4 ++--
 package.json                           | 2 +-
 src/components/Dashboard/TodoList.vue  | 9 ++++++++-
 src/interfaces/api-filing-interface.ts | 5 +++--
 tests/unit/EntityMenu.spec.ts          | 2 --
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 283002228..20e116e26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-filings-ui",
-  "version": "6.9.3",
+  "version": "6.9.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-filings-ui",
-      "version": "6.9.3",
+      "version": "6.9.4",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/base-address": "2.0.9",
diff --git a/package.json b/package.json
index cc3722522..0ff1e5f68 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "6.9.3",
+  "version": "6.9.4",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index f1fa64c60..1e4782d37 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -403,7 +403,7 @@
                   </v-btn>
                   <v-btn
                     v-else
-                    class="btn-resume-payment"
+                    :class="{ 'btn-resume-payment': !isAgmLocationChange(item) }"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -413,6 +413,7 @@
 
                   <!-- dropdown menu -->
                   <v-menu
+                    v-if="!isAgmLocationChange(item)"
                     offset-y
                     left
                   >
@@ -671,6 +672,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   // for template
   readonly EnumUtilities = EnumUtilities
   readonly FilingStatus = FilingStatus
+  readonly FilingTypes = FilingTypes
 
   /** Whether a COA is pending. */
   get isCoaPending (): boolean {
@@ -823,6 +825,11 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     })
   }
 
+  /** Check if todo item is an AGM Location change. */
+  isAgmLocationChange (item: TodoItemIF): boolean {
+    return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
+  }
+
   /** Loads a todo item into the Todo Items array. */
   loadTodoItem (task: ApiTaskIF): void {
     const todo = task.task.todo // already checked for not falsey in loadData()
diff --git a/src/interfaces/api-filing-interface.ts b/src/interfaces/api-filing-interface.ts
index c942ad15d..f99238307 100644
--- a/src/interfaces/api-filing-interface.ts
+++ b/src/interfaces/api-filing-interface.ts
@@ -1,5 +1,5 @@
 import { CorpTypeCd, EffectOfOrderTypes, FilingStatus, FilingSubTypes, FilingTypes } from '@/enums'
-import { AddressIF, ApiDateTimeUtc, CommentIF, DocumentIF, FormattedDateTimeGmt, IsoDatePacific, SpecialResolutionIF }
+import { ApiDateTimeUtc, CommentIF, DocumentIF, FormattedDateTimeGmt, IsoDatePacific, SpecialResolutionIF }
   from '@/interfaces'
 
 /**
@@ -43,7 +43,8 @@ export interface ApiFilingIF {
 
     agmLocationChange?: {
       year: string,
-      newAgmLocation: AddressIF
+      reason: string,
+      agmLocation: string
     }
 
     // alteration filings only
diff --git a/tests/unit/EntityMenu.spec.ts b/tests/unit/EntityMenu.spec.ts
index 35efc6580..3b7638442 100644
--- a/tests/unit/EntityMenu.spec.ts
+++ b/tests/unit/EntityMenu.spec.ts
@@ -479,8 +479,6 @@ describe('Entity Menu - Consent to Continuation click tests', () => {
 })
 
 describe('Entity Menu - Request AGM Extension click tests', () => {
-  let vm: any
-
   beforeAll(() => {
     // override feature flag
     vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(flag => {

From 15a1329c5e34b2e6a1bd95c3137a4758a11a51c4 Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Wed, 25 Oct 2023 14:12:56 -0700
Subject: [PATCH 2/9] changed method name

---
 src/components/Dashboard/TodoList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index 1e4782d37..e882e5b25 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -403,7 +403,7 @@
                   </v-btn>
                   <v-btn
                     v-else
-                    :class="{ 'btn-resume-payment': !isAgmLocationChange(item) }"
+                    :class="{ 'btn-resume-payment': !isCancellableTodoItem(item) }"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -413,7 +413,7 @@
 
                   <!-- dropdown menu -->
                   <v-menu
-                    v-if="!isAgmLocationChange(item)"
+                    v-if="!isCancellableTodoItem(item)"
                     offset-y
                     left
                   >
@@ -825,8 +825,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     })
   }
 
-  /** Check if todo item is an AGM Location change. */
-  isAgmLocationChange (item: TodoItemIF): boolean {
+  /** Check if todo item is cancellable (has a draft). */
+  isCancellableTodoItem(item: TodoItemIF): boolean {
     return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
   }
 

From a06d3a6f9eaf57d81ad65e2a71fa79ae988a7566 Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Wed, 25 Oct 2023 14:20:02 -0700
Subject: [PATCH 3/9] changed comment

---
 src/components/Dashboard/TodoList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index e882e5b25..ae7f397ea 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -825,7 +825,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     })
   }
 
-  /** Check if todo item is cancellable (has a draft). */
+  /** Check if task item is cancellable (has a draft). */
   isCancellableTodoItem(item: TodoItemIF): boolean {
     return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
   }

From 14d9df47705332450e6bf7dda69df322d04a3236 Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Wed, 25 Oct 2023 14:22:32 -0700
Subject: [PATCH 4/9] fixed lint error

---
 src/components/Dashboard/TodoList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index ae7f397ea..35bc11cc5 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -826,7 +826,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   }
 
   /** Check if task item is cancellable (has a draft). */
-  isCancellableTodoItem(item: TodoItemIF): boolean {
+  isCancellableTodoItem (item: TodoItemIF): boolean {
     return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
   }
 

From 77d46219d5559b2a6bc0b11734169ba2691ddd3c Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Wed, 25 Oct 2023 14:24:38 -0700
Subject: [PATCH 5/9] removed unnecessary line

---
 src/components/Dashboard/TodoList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index 35bc11cc5..3f15abfbc 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -672,7 +672,6 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   // for template
   readonly EnumUtilities = EnumUtilities
   readonly FilingStatus = FilingStatus
-  readonly FilingTypes = FilingTypes
 
   /** Whether a COA is pending. */
   get isCoaPending (): boolean {

From d5c141e3f9fc9108294d7eb268442a94248a04ce Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Thu, 26 Oct 2023 13:35:51 -0700
Subject: [PATCH 6/9] Fix in response to Sev's comment

---
 src/components/Dashboard/TodoList.vue | 7 +++++--
 src/views/AgmLocationChg.vue          | 2 +-
 tests/unit/AgmLocation.spec.ts        | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index 3f15abfbc..08cd4fa5d 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -394,7 +394,10 @@
                 <template v-else-if="isStatusPending(item)">
                   <v-btn
                     v-if="EnumUtilities.isPayMethodOnlineBanking(item)"
-                    class="btn-change-payment-type"
+                    :class="
+                      [
+                        !isCancellableTodoItem(item) ? 'btn-change-payment-type' : 'btn-change-payment-type-cancellable'
+                      ]"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -403,7 +406,7 @@
                   </v-btn>
                   <v-btn
                     v-else
-                    :class="{ 'btn-resume-payment': !isCancellableTodoItem(item) }"
+                    :class="[!isCancellableTodoItem(item) ? 'btn-resume-payment' : 'btn-resume-payment-cancellable']"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
diff --git a/src/views/AgmLocationChg.vue b/src/views/AgmLocationChg.vue
index 6bf5ef789..fadf7c1b5 100644
--- a/src/views/AgmLocationChg.vue
+++ b/src/views/AgmLocationChg.vue
@@ -418,7 +418,7 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
   get agmLocationRules (): Array<(val) => boolean | string> {
     const rules = [] as Array<(val) => boolean | string>
     rules.push(val => !!val || 'AGM location is required.')
-    rules.push(val => (val.length <= 100) || 'Must be 100 characters or less.')
+    rules.push(val => (val.length <= 400) || 'Must be 400 characters or less.')
     return rules
   }
 
diff --git a/tests/unit/AgmLocation.spec.ts b/tests/unit/AgmLocation.spec.ts
index 651a352b1..f2fcb62e3 100644
--- a/tests/unit/AgmLocation.spec.ts
+++ b/tests/unit/AgmLocation.spec.ts
@@ -13,7 +13,7 @@ describe('AgmLocation', () => {
   /** Array of validations rules for AGM location to be passed as a prop. */
   const rules = [] as Array<(val) => boolean | string>
   rules.push(val => !!val || 'AGM location is required.')
-  rules.push(val => (val.length <= 100) || 'Must be 100 characters or less.')
+  rules.push(val => (val.length <= 400) || 'Must be 400 characters or less.')
 
   it('initializes correctly', () => {
     const wrapper = mount(AgmLocation,
@@ -89,10 +89,10 @@ describe('AgmLocation', () => {
       })
 
     const input = wrapper.find('#agm-location')
-    const a101 = 'a'.repeat(101)
-    await input.setValue(a101)
+    const a401 = 'a'.repeat(401)
+    await input.setValue(a401)
 
-    expect(wrapper.emitted('update:agmLocation').pop()[0]).toBe(a101)
+    expect(wrapper.emitted('update:agmLocation').pop()[0]).toBe(a401)
     expect(wrapper.emitted('valid').pop()[0]).toBe(false)
     wrapper.destroy()
   })

From 3ae327ef1931dd208e78d26ffd01e7cdb53d013f Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Thu, 26 Oct 2023 15:08:34 -0700
Subject: [PATCH 7/9] Fixed in response to Sev's comment + simplified logic

---
 src/components/Dashboard/TodoList.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index 08cd4fa5d..4ab70cf10 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -394,10 +394,8 @@
                 <template v-else-if="isStatusPending(item)">
                   <v-btn
                     v-if="EnumUtilities.isPayMethodOnlineBanking(item)"
-                    :class="
-                      [
-                        !isCancellableTodoItem(item) ? 'btn-change-payment-type' : 'btn-change-payment-type-cancellable'
-                      ]"
+                    class="btn-change-payment-type"
+                    :class="{ 'cancellable' : isCancellableTodoItem(item) }"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -406,7 +404,8 @@
                   </v-btn>
                   <v-btn
                     v-else
-                    :class="[!isCancellableTodoItem(item) ? 'btn-resume-payment' : 'btn-resume-payment-cancellable']"
+                    class="btn-resume-payment"
+                    :class="{ 'cancellable' : isCancellableTodoItem(item) }"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -416,7 +415,7 @@
 
                   <!-- dropdown menu -->
                   <v-menu
-                    v-if="!isCancellableTodoItem(item)"
+                    v-if="isCancellableTodoItem(item)"
                     offset-y
                     left
                   >
@@ -829,7 +828,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
 
   /** Check if task item is cancellable (has a draft). */
   isCancellableTodoItem (item: TodoItemIF): boolean {
-    return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
+    return (item.name !== FilingTypes.AGM_LOCATION_CHANGE)
   }
 
   /** Loads a todo item into the Todo Items array. */
@@ -2108,8 +2107,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     border-bottom-right-radius: 0;
   }
 
-  .btn-change-payment-type,
-  .btn-resume-payment {
+  .btn-change-payment-type.cancellable,
+  .btn-resume-payment.cancellable {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
   }

From 8339703f59f8efe2aacf3ef402fa31bed8241393 Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Mon, 30 Oct 2023 11:08:23 -0700
Subject: [PATCH 8/9] Removed staff payment dialog

---
 src/views/AgmLocationChg.vue | 70 +++++-------------------------------
 1 file changed, 8 insertions(+), 62 deletions(-)

diff --git a/src/views/AgmLocationChg.vue b/src/views/AgmLocationChg.vue
index fadf7c1b5..877bdc282 100644
--- a/src/views/AgmLocationChg.vue
+++ b/src/views/AgmLocationChg.vue
@@ -14,15 +14,6 @@
       @exit="onPaymentErrorDialogExit()"
     />
 
-    <StaffPaymentDialog
-      :staffPaymentData.sync="staffPaymentData"
-      attach="#agm-location-chg"
-      :dialog="staffPaymentDialog"
-      :loading="filingPaying"
-      @exit="staffPaymentDialog=false"
-      @submit="onClickFilePay(true)"
-    />
-
     <!-- Initial Page Load Transition -->
     <v-fade-transition>
       <div
@@ -307,14 +298,12 @@ import { StatusCodes } from 'http-status-codes'
 import { navigate } from '@/utils'
 import SbcFeeSummary from 'sbc-common-components/src/components/SbcFeeSummary.vue'
 import { Certify, DetailComment } from '@/components/common'
-import { ConfirmDialog, PaymentErrorDialog, StaffPaymentDialog }
-  from '@/components/dialogs'
+import { ConfirmDialog, PaymentErrorDialog } from '@/components/dialogs'
 import { CommonMixin, DateMixin, EnumMixin, FilingMixin, ResourceLookupMixin } from '@/mixins'
 import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
 import { LegalServices } from '@/services/'
-import { FilingCodes, FilingTypes, Routes, SaveErrorReasons, StaffPaymentOptions }
-  from '@/enums'
-import { ConfirmDialogType, StaffPaymentIF } from '@/interfaces'
+import { FilingCodes, FilingTypes, Routes, SaveErrorReasons } from '@/enums'
+import { ConfirmDialogType } from '@/interfaces'
 import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
 import AgmLocation from '@/components/AgmLocationChange/AgmLocation.vue'
 import AgmYear from '@/components/AgmLocationChange/AgmYear.vue'
@@ -328,8 +317,7 @@ import AgmYear from '@/components/AgmLocationChange/AgmYear.vue'
     DetailComment,
     ExpandableHelp,
     PaymentErrorDialog,
-    SbcFeeSummary,
-    StaffPaymentDialog
+    SbcFeeSummary
   }
 })
 export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
@@ -363,10 +351,6 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
   reason = ''
   reasonValid = false
 
-  // variables for staff payment
-  staffPaymentData = { option: StaffPaymentOptions.NONE } as StaffPaymentIF
-  staffPaymentDialog = false
-
   // variables for displaying dialogs
   resumeErrorDialog = false
   saveErrorReason: SaveErrorReasons = null
@@ -481,17 +465,15 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     this.dataLoaded = true
 
     // always include agm location change code
-    // use existing Priority and Waive Fees flags
-    this.updateFilingData('add', FilingCodes.AGM_LOCATION_CHANGE, this.staffPaymentData.isPriority,
-      (this.staffPaymentData.option === StaffPaymentOptions.NO_FEE))
+    // clear Priority flag and set the Waive Fees flag to true
+    this.updateFilingData('add', FilingCodes.AGM_LOCATION_CHANGE, undefined, true)
   }
 
   /**
    * Called when user clicks File and Pay button
    * or when user retries from Save Error dialog
-   * or when user submits from Staff Payment dialog.
    */
-  async onClickFilePay (fromStaffPayment = false): Promise<void> {
+  async onClickFilePay (): Promise<void> {
     // if there is an invalid component, scroll to it
     if (!this.isPageValid) {
       this.showErrors = true
@@ -506,13 +488,6 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     // prevent double saving
     if (this.busySaving) return
 
-    // if this is a staff user clicking File and Pay (not Submit)
-    // then detour via Staff Payment dialog
-    if (this.isRoleStaff && !fromStaffPayment) {
-      this.staffPaymentDialog = true
-      return
-    }
-
     this.filingPaying = true
 
     // save final filing (not draft)
@@ -599,26 +574,7 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
       }
     }
 
-    switch (this.staffPaymentData.option) {
-      case StaffPaymentOptions.FAS:
-        header.header['routingSlipNumber'] = this.staffPaymentData.routingSlipNumber
-        header.header['priority'] = this.staffPaymentData.isPriority
-        break
-
-      case StaffPaymentOptions.BCOL:
-        header.header['bcolAccountNumber'] = this.staffPaymentData.bcolAccountNumber
-        header.header['datNumber'] = this.staffPaymentData.datNumber
-        header.header['folioNumber'] = this.staffPaymentData.folioNumber
-        header.header['priority'] = this.staffPaymentData.isPriority
-        break
-
-      case StaffPaymentOptions.NO_FEE:
-        header.header['waiveFees'] = true
-        break
-
-      case StaffPaymentOptions.NONE: // should never happen
-        break
-    }
+    header.header['waiveFees'] = true
 
     const business: any = {
       business: {
@@ -734,16 +690,6 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
   onHaveChanges (): void {
     this.haveChanges = true
   }
-
-  @Watch('staffPaymentData')
-  onStaffPaymentDataChanged (val: StaffPaymentIF): void {
-    const waiveFees = (val.option === StaffPaymentOptions.NO_FEE)
-
-    // add Waive Fees flag to all filing codes
-    this.updateFilingData('add', FilingCodes.AGM_LOCATION_CHANGE, val.isPriority, waiveFees)
-
-    this.haveChanges = true
-  }
 }
 </script>
 

From 480e5ceca4523380748e3a74c8d896f8c5ace85f Mon Sep 17 00:00:00 2001
From: JazzarKarim <karim.jazzar@gov.bc.ca>
Date: Mon, 30 Oct 2023 11:55:01 -0700
Subject: [PATCH 9/9] update agm location variable

---
 src/views/AgmLocationChg.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/AgmLocationChg.vue b/src/views/AgmLocationChg.vue
index 877bdc282..5c55ae75b 100644
--- a/src/views/AgmLocationChg.vue
+++ b/src/views/AgmLocationChg.vue
@@ -190,6 +190,7 @@
                           v-model="agmLocation"
                           :rules="agmLocationRules"
                           :validateForm="showErrors"
+                          @update:agmLocation="agmLocation=$event"
                           @valid="agmLocationValid=$event"
                         />
                       </v-col>