From 74b03a28c91ce28bb08a7a6c781b99b8067c8a23 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 11 Mar 2024 17:55:03 +0530
Subject: [PATCH 1/2] Implemented: support to allow user to set shipping name
 for facility address (#154)

---
 src/components/FacilityAddressModal.vue | 17 +++++++++++++++--
 src/locales/en.json                     |  1 +
 src/store/modules/facility/actions.ts   |  2 +-
 src/views/AddFacilityAddress.vue        | 11 ++++++++++-
 src/views/CreateFacility.vue            |  1 +
 src/views/FacilityDetails.vue           |  3 ++-
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/components/FacilityAddressModal.vue b/src/components/FacilityAddressModal.vue
index 8e5ab1e5..656df7c1 100644
--- a/src/components/FacilityAddressModal.vue
+++ b/src/components/FacilityAddressModal.vue
@@ -15,6 +15,10 @@
       <ion-item-divider color="light">
         <ion-label>{{ translate("Address") }}</ion-label>
       </ion-item-divider>
+      <ion-item>
+        <ion-label position="floating">{{ translate("Shipping name") }}</ion-label>
+        <ion-input v-model="address.toName" />
+      </ion-item>
       <ion-item>
         <ion-label position="floating">{{ translate("Address line 1") }} <ion-text color="danger">*</ion-text></ion-label>
         <ion-input v-model="address.address1" />
@@ -128,7 +132,7 @@ export default defineComponent({
       telecomNumberValue: {} as any
     }
   },
-  props: ['facilityId'],
+  props: ['facilityId', 'facilityName'],
   beforeMount() {
     this.address = JSON.parse(JSON.stringify(this.postalAddress))
     this.telecomNumberValue = this.telecomNumber ? JSON.parse(JSON.stringify(this.telecomNumber)) : {}
@@ -139,6 +143,9 @@ export default defineComponent({
       const country = this.countries.find((country: any) => country.geoId === this.address.countryGeoId)
       this.telecomNumberValue.countryCode = getTelecomCountryCode(country.geoCode)
     }
+    if(!this.address.toName) {
+      this.address.toName = this.facilityName
+    }
   },
   methods: {
     closeModal() {
@@ -242,4 +249,10 @@ export default defineComponent({
     };
   },
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+ion-content {
+  --padding-bottom: 80px;
+}
+</style>
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index 2bd0c550..47a7352a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -324,6 +324,7 @@
   "Settings": "Settings",
   "Setting fulfillment capacity to 0 disables new order from being allocated to this facility. Leave this empty if this facility's fulfillment capacity is unrestricted.": "Setting fulfillment capacity to 0 disables new order from being allocated to this facility. Leave this empty if this facility's fulfillment capacity is unrestricted.",
   "Setup Store": "Setup Store",
+  "Shipping name": "Shipping name",
   "Shopify": "Shopify",
   "Shopify facility": "Shopify facility",
   "Shopify location": "Shopify location",
diff --git a/src/store/modules/facility/actions.ts b/src/store/modules/facility/actions.ts
index 81ecd3f7..6e31a051 100644
--- a/src/store/modules/facility/actions.ts
+++ b/src/store/modules/facility/actions.ts
@@ -237,7 +237,7 @@ const actions: ActionTree<FacilityState, RootState> = {
       entityName: "FacilityContactDetailByPurpose",
       orderBy: 'fromDate DESC',
       filterByDate: 'Y',
-      fieldList: ['address1', 'address2', 'city', 'contactMechId', 'countryGeoId', 'countryGeoName', 'latitude', 'longitude', 'postalCode', 'stateGeoId', 'stateGeoName'],
+      fieldList: ['address1', 'address2', 'city', 'contactMechId', 'countryGeoId', 'countryGeoName', 'latitude', 'longitude', 'postalCode', 'stateGeoId', 'stateGeoName', 'toName'],
       viewSize: 1
     }
 
diff --git a/src/views/AddFacilityAddress.vue b/src/views/AddFacilityAddress.vue
index 848194c1..ddaeacd3 100644
--- a/src/views/AddFacilityAddress.vue
+++ b/src/views/AddFacilityAddress.vue
@@ -13,6 +13,12 @@
             <ion-card-title>{{ translate('Address') }}</ion-card-title>
           </ion-card-header>
           <ion-list>
+            <ion-item>
+              <ion-label position="floating">
+                {{ translate('Shipping name') }}
+              </ion-label>
+              <ion-input v-model="formData.toName" />
+            </ion-item>
             <ion-item>
               <ion-label position="floating">
                 {{ translate('Address line 1') }} <ion-text color="danger">*</ion-text>
@@ -163,12 +169,14 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       countries: 'util/getCountries',
-      states: 'util/getStates'
+      states: 'util/getStates',
+      current: 'facility/getCurrent',
     })
   },
   data() {
     return {
       formData: {
+        toName: '',
         address1: '',
         address2: '',
         city: '',
@@ -184,6 +192,7 @@ export default defineComponent({
   },
   props: ['facilityId'],
   async ionViewWillEnter() {
+    this.formData.toName = this.current.facilityName
     await this.store.dispatch('util/fetchCountries', { countryGeoId: "USA" })
   },
   methods: {
diff --git a/src/views/CreateFacility.vue b/src/views/CreateFacility.vue
index 06d0a3d3..c1f84b9f 100644
--- a/src/views/CreateFacility.vue
+++ b/src/views/CreateFacility.vue
@@ -184,6 +184,7 @@ export default defineComponent({
         if (!hasError(resp)) {
           const { facilityId } = resp.data
           showToast(translate("Facility created successfully."))
+          this.store.dispatch('facility/updateCurrentFacility', payload),
           this.router.replace(`/add-facility-address/${facilityId}`)
         } else {
           throw resp.data;
diff --git a/src/views/FacilityDetails.vue b/src/views/FacilityDetails.vue
index e052dcea..1671d5ff 100644
--- a/src/views/FacilityDetails.vue
+++ b/src/views/FacilityDetails.vue
@@ -50,6 +50,7 @@
               <template v-if="postalAddress?.address1">
                 <ion-item lines="full">
                   <ion-label>
+                    <h3>{{ postalAddress.toName }}</h3>
                     <h3>{{ postalAddress.address1 }}</h3>
                     <h3>{{ postalAddress.address2 }}</h3>
                     <p class="ion-text-wrap">{{ postalAddress.postalCode ? `${postalAddress.city}, ${postalAddress.postalCode}` : postalAddress.city }}</p>
@@ -739,7 +740,7 @@ export default defineComponent({
     async openAddressModal() {
       const addressModal = await modalController.create({
         component: FacilityAddressModal,
-        componentProps: { facilityId: this.facilityId }
+        componentProps: { facilityId: this.facilityId, facilityName: this.current.facilityName }
       })
 
       addressModal.onDidDismiss().then(async(result) => {

From 1d1b73a0e96455a584f09867ac4c68e11480347b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 11 Mar 2024 18:01:30 +0530
Subject: [PATCH 2/2] Improved: code to handle case when current is not set in
 facility while facility address creation (#154)

---
 src/views/AddFacilityAddress.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/AddFacilityAddress.vue b/src/views/AddFacilityAddress.vue
index ddaeacd3..ba9d753d 100644
--- a/src/views/AddFacilityAddress.vue
+++ b/src/views/AddFacilityAddress.vue
@@ -192,7 +192,7 @@ export default defineComponent({
   },
   props: ['facilityId'],
   async ionViewWillEnter() {
-    this.formData.toName = this.current.facilityName
+    this.formData.toName = this.current?.facilityName ? this.current.facilityName : ''
     await this.store.dispatch('util/fetchCountries', { countryGeoId: "USA" })
   },
   methods: {