Merge pull request #250 from ymaheshwari1/fix/identifier-comp

Improved: dxp-component package to latest release
hotwax · Jan 10, 2024 · 5b53a11 · 5b53a11
2 parents 3c48286 + e35f092
commit 5b53a11
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 94 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.8.0",
+    "@hotwax/dxp-components": "^1.12.1",
     "@hotwax/oms-api": "^1.10.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",

diff --git a/src/components/ProductListItem.vue b/src/components/ProductListItem.vue
@@ -1,8 +1,9 @@
 <template>
   <ion-item button @click="viewProduct()" detail="true" lines="none">
     <ion-thumbnail slot="start">
-      <ShopifyImg :src="product.mainImageUrl" size="small" />
+      <DxpShopifyImg :src="product.mainImageUrl" size="small" />
     </ion-thumbnail>
+
     <ion-label>
       <p>{{ getProductIdentificationValue(productIdentificationPref.secondaryId, product) }}</p>
       <h3>{{ getProductIdentificationValue(productIdentificationPref.primaryId, product) ? getProductIdentificationValue(productIdentificationPref.primaryId, product) : product.productName }}</h3>
@@ -20,15 +21,15 @@ import {
 } from '@ionic/vue'
 import { useRouter } from 'vue-router'
 import { useStore } from 'vuex';
-import { getProductIdentificationValue, ShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
+import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: "ProductListItem",
   components: {
     IonItem,
     IonThumbnail,
     IonLabel,
-    ShopifyImg
+    DxpShopifyImg
   },
   props: ["product"],
   methods: {

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -42,13 +42,15 @@
   "OMS instance": "OMS instance",
   "Password": "Password",
   "Please contact the administrator.": "Please contact the administrator.",
+  "Primary": "Primary",
   "Quantity": "Quantity",
   "Quantity on hand": "Quantity on hand",
   "Remove": "Remove",
   "Save":"Save",
   "Scan": "Scan",
   "Search": "Search",
   "Search time zones": "Search time zones",
+  "Secondary": "Secondary",
   "Select facility": "Select facility",
   "Select time zone": "Select time zone",
   "Set facility": "Set facility",

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -34,7 +34,7 @@
         <h1>{{ $t('OMS') }}</h1>
       </div>
       <section>
-        <OmsInstanceNavigator />
+        <DxpOmsInstanceNavigator />
 
         <ion-card>
           <ion-card-header>
@@ -61,7 +61,7 @@
         <p class="overline">{{ "Built: " + getDateTime(appInfo.builtTime) }}</p>
       </div>
       <section>
-        <ProductIdentifier />
+        <DxpProductIdentifier />
 
         <ion-card>
           <ion-card-header>

diff --git a/src/views/Upload.vue b/src/views/Upload.vue
@@ -10,7 +10,7 @@
       <ion-card v-for="product in uploadProducts" :key="product.productId">
         <ion-item lines="none">
           <ion-thumbnail slot="start">
-            <ShopifyImg :src="product.mainImageUrl" size="small"/>
+            <DxpShopifyImg :src="product.mainImageUrl" size="small"/>
           </ion-thumbnail>
           <ion-label @click="viewProduct(product)">
             <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, product) }}</p>
@@ -70,7 +70,7 @@ import { computed, defineComponent } from 'vue';
 import { colorPaletteOutline, resize, cloudUploadOutline } from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
-import { getProductIdentificationValue, ShopifyImg , useProductIdentificationStore } from '@hotwax/dxp-components';
+import { getProductIdentificationValue, DxpShopifyImg , useProductIdentificationStore } from '@hotwax/dxp-components';
 import { Actions, hasPermission } from '@/authorization';
 import { showToast } from '@/utils';
 
@@ -92,7 +92,7 @@ export default defineComponent({
     IonThumbnail,
     IonTitle,
     IonToolbar,
-    ShopifyImg
+    DxpShopifyImg
   },
   computed: {
     ...mapGetters({

diff --git a/src/views/count.vue b/src/views/count.vue
@@ -9,7 +9,7 @@
 
       <ion-content>
         <div class="product-image">
-            <ShopifyImg :src="product.mainImageUrl"/>
+          <DxpShopifyImg :src="product.mainImageUrl"/>
         </div>
 
         <div class="product-info">
@@ -130,7 +130,7 @@
   import { hasError, showToast } from "@/utils";
   import { translate } from "@/i18n";
   import { useRouter } from "vue-router";
-  import { getProductIdentificationValue, ShopifyImg, useProductIdentificationStore } from "@hotwax/dxp-components";
+  import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from "@hotwax/dxp-components";
   import { UtilService } from "@/services/UtilService";
   import { ProductService } from '@/services/ProductService';
   import { StockService } from '@/services/StockService';
@@ -157,7 +157,7 @@
       IonSelectOption,
       IonTitle,
       IonToolbar,
-      ShopifyImg
+      DxpShopifyImg
     },
     computed: {
       ...mapGetters({