Merge branch 'main' into remove_scanner_comp

hotwax · Jan 9, 2024 · 5cdf5fd · 5cdf5fd
2 parents 281d33c + 3e7e1da
commit 5cdf5fd
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@hotwax/oms-api": "^1.8.1",
-    "@ionic/core": "^6.7.5",
-    "@ionic/vue": "^6.7.5",
+    "@ionic/core": "^7.6.0",
+    "@ionic/vue": "^7.6.0",
     "firebase": "^10.3.1",
     "luxon": "^3.3.0",
     "pinia": "2.0.36",

diff --git a/src/components/LanguageSwitcher.vue b/src/components/LanguageSwitcher.vue
@@ -9,8 +9,7 @@
       {{ $t('Select your preferred language.') }}
     </ion-card-content>
     <ion-item lines="none">
-      <ion-label>{{ $t("Choose language") }}</ion-label>
-      <ion-select interface="popover" :value="currentLocale" @ionChange="setLocale($event.detail.value)">
+      <ion-select :label="$t('Choose language')" interface="popover" :value="currentLocale" @ionChange="setLocale($event.detail.value)">
         <ion-select-option v-for="locale in Object.keys(locales)" :key="locale" :value="locale">{{ locales[locale] }}</ion-select-option>
       </ion-select>
     </ion-item>

diff --git a/src/components/ProductIdentifier.vue b/src/components/ProductIdentifier.vue
@@ -12,14 +12,12 @@
     </ion-card-content>
 
     <ion-item>
-      <ion-label>{{ "Primary Product Identifier" }}</ion-label>
-      <ion-select interface="popover" :placeholder="'primary identifier'" :value="productIdentificationPref.primaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'primaryId')">
+      <ion-select :label="$t('Primary')" interface="popover" :placeholder="'primary identifier'" :value="productIdentificationPref.primaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'primaryId')">
         <ion-select-option v-for="identification in productIdentificationOptions" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
       </ion-select>
     </ion-item>
-    <ion-item>
-      <ion-label>{{ "Secondary Product Identifier" }}</ion-label>
-      <ion-select interface="popover" :placeholder="'secondary identifier'" :value="productIdentificationPref.secondaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'secondaryId')">
+    <ion-item lines="none">
+      <ion-select :label="$t('Secondary')" interface="popover" :placeholder="'secondary identifier'" :value="productIdentificationPref.secondaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'secondaryId')">
         <ion-select-option v-for="identification in productIdentificationOptions" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
         <ion-select-option value="">{{ "None" }}</ion-select-option>
       </ion-select>
@@ -28,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonItem, IonLabel, IonSelect, IonSelectOption } from '@ionic/vue';
+import { IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonItem, IonSelect, IonSelectOption } from '@ionic/vue';
 import { appContext } from 'src';
 import { useProductIdentificationStore } from 'src/store/productIdentification';
 import { computed, onMounted } from 'vue';