Merge pull request #143 from hotwax/131_facility_type_login_card

Fixed: Displayed facility type instead of facility parent type on login card (#131).

src/components/CreateFacilityLoginModal.vue

@@ -6,7 +6,7 @@
           <ion-icon slot="icon-only" :icon="closeOutline" />
         </ion-button>
       </ion-buttons>
-      <ion-title>{{ `Create ${parentFacilityTypeDesc} login` }}</ion-title>
+      <ion-title>{{ translate(`Create ${facilityTypeDesc} login`) }}</ion-title>
     </ion-toolbar>
   </ion-header>
 
@@ -100,7 +100,7 @@ export default defineComponent({
       emailAddress: '',
     }
   },
-  props: ["currentFacility", "parentFacilityTypeDesc"],
+  props: ["currentFacility", "facilityTypeDesc"],
   methods: {
     closeModal() {
       modalController.dismiss({ dismissed: true });

src/components/FacilityLoginActionPopover.vue

@@ -49,7 +49,7 @@ export default defineComponent({
     IonList,
     IonListHeader
   },
-  props: ['currentFacility', 'currentFacilityUser', "parentFacilityTypeDesc"],
+  props: ['currentFacility', 'currentFacilityUser', "facilityTypeDesc"],
   methods: {
     async viewDetails() {
       const userDetailUrl = `${process.env.VUE_APP_USERS_APPLICATION_URL}/user-details/${this.currentFacilityUser.partyId}`
@@ -161,7 +161,7 @@ export default defineComponent({
     async unlinkFacilityLoginAlert() {
       const message = 'Unlinking this login as an official facility login will not prevent this user from being used to login at this facility. Do you also want to block this user from logging into this facility?'
       const alert = await alertController.create({
-        header: translate(`Unlink ${this.parentFacilityTypeDesc} login`),
+        header: translate(`Unlink ${this.facilityTypeDesc} login`),
         message: translate(message, { space: "<br><br>" }),
         inputs: [
           {

src/locales/en.json

@@ -64,7 +64,6 @@
   "Description": "Description",
   "Dismiss": "Dismiss",
   "Distribution Center": "Distribution Center",
-  "Distribution Center login": "Distribution Center login",
   "Failed to associate calendar to the facility.": "Failed to associate calendar to the facility.",
   "Filters": "Filters",
   "Edit": "Edit",
@@ -215,6 +214,10 @@
   "orders allocated today": "{orderCount} orders allocated today",
   "orders in fulfillment queue": "{orderCount} orders in fulfillment queue",
   "Others": "Others",
+  "Outlet Store login": "Outlet Store login",
+  "Outlet Store logins": "Outlet Store logins",
+  "Outlet Warehouse login": "Outlet Warehouse login",
+  "Outlet Warehouse logins": "Outlet Warehouse logins",
   "Parking": "Parking",
   "Parking archived successfully.": "Parking archived successfully.",
   "Parking renamed successfully.": "Parking renamed successfully.",
@@ -227,7 +230,6 @@
   "party id": "party id",
   "Pending allocation": "Pending allocation",
   "Physical Store": "Physical Store",
-  "Physical Store login": "Physical Store login",
   "Please check start time and end time entries. End time cannot be less than start time.": "Please check start time and end time entries. End time cannot be less than start time.",
   "Please update atleast one party role.": "Please update atleast one party role.",
   "Password": "Password",
@@ -257,6 +259,8 @@
   "Rename parking": "Rename parking", 
   "Reset": "Reset",
   "Reset password email": "Reset password email",
+  "Retail Store login": "Retail Store login",
+  "Retail Store logins": "Retail Store logins",
   "Role": "Role",
   "role": "role",
   "Saturday": "Saturday",
@@ -323,6 +327,10 @@
   "Unlimited orders": "Unlimited orders",
   "Unlink": "Unlink",
   "Unlink and block": "Unlink and block",
+  "Unlink Outlet Store login": "Unlink Outlet Store login",
+  "Unlink Outlet Warehouse login": "Unlink Outlet Warehouse login",
+  "Unlink Retail Store login": "Unlink Retail Store login",
+  "Unlink Warehouse login": "Unlink Warehouse login",
   "Unlinking this login as an official facility login will not prevent this user from being used to login at this facility. Do you also want to block this user from logging into this facility?": "Unlinking this login as an official facility login will not prevent this user from being used to login at this facility. {space} Do you also want to block this user from logging into this facility?",
   "Update days to ship": "Update days to ship",
   "Updated default days to ship": "Updated default days to ship",
@@ -334,6 +342,8 @@
   "View order count history": "View order count history",
   "View other schedules": "View other schedules",
   "Warehouses": "Warehouses",
+  "Warehouse login": "Warehouse login",
+  "Warehouse logins": "Warehouse logins",
   "Wednesday": "Wednesday",
   "Would you like to update your time zone to . Your profile is currently set to . This setting can always be changed from the settings menu.": "Would you like to update your time zone to {localTimeZone}. Your profile is currently set to {profileTimeZone}. This setting can always be changed from the settings menu.",
   "Zipcode": "Zipcode"

src/views/FacilityDetails.vue

@@ -246,7 +246,7 @@
           <ion-card>
             <ion-card-header>
               <ion-card-title>
-                {{ `${facilityTypes[current.parentFacilityTypeId]?.description} logins` }}
+                {{ translate(`${facilityTypes[current.facilityTypeId]?.description} logins`) }}
               </ion-card-title>
               <ion-button v-if="current.facilityLogins?.length" @click="createFacilityLoginModal()" fill="clear">
                 <ion-icon :icon="addCircleOutline" slot="end" />
@@ -1189,7 +1189,7 @@ export default defineComponent({
     async openFacilityLoginActionPopover(ev: Event, facilityUser: any) {
       const popover = await popoverController.create({
         component: FacilityLoginActionPopover,
-        componentProps: { currentFacility: this.current, currentFacilityUser: facilityUser, parentFacilityTypeDesc: this.facilityTypes[this.current.parentFacilityTypeId]?.description },
+        componentProps: { currentFacility: this.current, currentFacilityUser: facilityUser, facilityTypeDesc: this.facilityTypes[this.current.facilityTypeId]?.description },
         event: ev,
         showBackdrop: false
       });
@@ -1198,7 +1198,7 @@ export default defineComponent({
     async createFacilityLoginModal() {
       const facilityLoginModal = await modalController.create({
       component: CreateFacilityLoginModal,
-        componentProps: { currentFacility: this.current, parentFacilityTypeDesc: this.facilityTypes[this.current.parentFacilityTypeId]?.description }
+        componentProps: { currentFacility: this.current, facilityTypeDesc: this.facilityTypes[this.current.facilityTypeId]?.description }
       })
       facilityLoginModal.present()
     },