From 8232c4e50357eeb7c2e35a6ca9180844d910f800 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Tue, 9 Jan 2024 19:38:12 +0530
Subject: [PATCH 1/3] Improved: components import from dxp-components and their
 usage

---
 src/components/ProductListItem.vue | 7 ++++---
 src/views/Settings.vue             | 4 ++--
 src/views/Upload.vue               | 6 +++---
 src/views/count.vue                | 6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/ProductListItem.vue b/src/components/ProductListItem.vue
index a0d288b3..870549fe 100644
--- 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,7 +21,7 @@ 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",
@@ -28,7 +29,7 @@ export default defineComponent({
     IonItem,
     IonThumbnail,
     IonLabel,
-    ShopifyImg
+    DxpShopifyImg
   },
   props: ["product"],
   methods: {
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 8ae47b36..a9e2777f 100644
--- 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
index 6e92d3d7..534dd591 100644
--- 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
index 011f270f..72baf8c1 100644
--- 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({

From 66641b10ea40fbd3d6e20c022b1af6a57246e940 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 10 Jan 2024 10:35:00 +0530
Subject: [PATCH 2/3] Improved: dxp-components package to latest release

---
 package-lock.json | 89 ++++-------------------------------------------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 83 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cecca6ed..b23f7e73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,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",
@@ -2813,68 +2813,22 @@
       "integrity": "sha512-zpUjGoY7LBlKeiP0V7tonrmoey8HQ5THQmyixQ+IDtrjmEJNBjynW/Ef3gC0FUNNPuVqxWPZdT5CVgaETLGTwg=="
     },
     "node_modules/@hotwax/dxp-components": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.11.0.tgz",
-      "integrity": "sha512-z9UNzi1veT8Aj8Y1WWAGBGOR+I0s6A58qrsFj+L3LkpxTkq6zGN/JS80tTv29obEeeOfONm6XyLHvNOM6TFKyA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.12.1.tgz",
+      "integrity": "sha512-5soKaVBFd7klZnHBCi68j4CZwTlrBCzvPsyd+wHMbenezU+lOwMK0ftdWXrQcQPedeGdVtQXvvgSPWnLL310bg==",
       "dependencies": {
         "@hotwax/oms-api": "^1.8.1",
-        "@ionic/core": "^6.7.5",
-        "@ionic/vue": "^6.7.5",
-        "@types/vue-barcode-reader": "^0.0.0",
+        "@ionic/core": "^7.6.0",
+        "@ionic/vue": "^7.6.0",
         "firebase": "^10.3.1",
         "luxon": "^3.3.0",
         "pinia": "2.0.36",
         "pinia-plugin-persistedstate": "^3.1.0",
         "register-service-worker": "^1.7.2",
         "vue": "^3.3.4",
-        "vue-barcode-reader": "^1.0.3",
         "vue-i18n": "^9.2.2"
       }
     },
-    "node_modules/@hotwax/dxp-components/node_modules/@ionic/core": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
-      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
-      "dependencies": {
-        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.1.3",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/@ionic/vue": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.7.5.tgz",
-      "integrity": "sha512-6JBEaHCT2vVUzYqyfBiEUN8Wo7FezxY5Y3n+HGqI61J4qVay+8IxZRTYeX+O72QglbYOkzvfjE6SgS25oS+S9A==",
-      "dependencies": {
-        "@ionic/core": "6.7.5",
-        "ionicons": "^6.1.3"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/@stencil/core": {
-      "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/ionicons": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
-      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
-      "dependencies": {
-        "@stencil/core": "^2.18.0"
-      }
-    },
-    "node_modules/@hotwax/dxp-components/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
     "node_modules/@hotwax/dxp-components/node_modules/vue-i18n": {
       "version": "9.8.0",
       "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.8.0.tgz",
@@ -3911,36 +3865,6 @@
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true
     },
-    "node_modules/@types/vue-barcode-reader": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/@types/vue-barcode-reader/-/vue-barcode-reader-0.0.0.tgz",
-      "integrity": "sha512-yngQhd35qGjCxMXWIqsAtF7qmxe0qUYRVd9qW5I/CcRPWDdBpqVkHnQSh6ro5BIBl3NQ3ppky7kMKS4pr+XwCQ==",
-      "dependencies": {
-        "vue": "^2.0.0"
-      }
-    },
-    "node_modules/@types/vue-barcode-reader/node_modules/@vue/compiler-sfc": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
-      "dependencies": {
-        "@babel/parser": "^7.23.5",
-        "postcss": "^8.4.14",
-        "source-map": "^0.6.1"
-      },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
-      }
-    },
-    "node_modules/@types/vue-barcode-reader/node_modules/vue": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
-      "dependencies": {
-        "@vue/compiler-sfc": "2.7.16",
-        "csstype": "^3.1.0"
-      }
-    },
     "node_modules/@types/webpack-env": {
       "version": "1.18.4",
       "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.4.tgz",
@@ -13844,6 +13768,7 @@
       "version": "2.8.8",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true,
       "optional": true,
       "bin": {
         "prettier": "bin-prettier.js"
diff --git a/package.json b/package.json
index 9666e391..5d31bcf9 100644
--- 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",

From e35f09269bf9e11bccef5543271ee74d43732989 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 10 Jan 2024 10:36:19 +0530
Subject: [PATCH 3/3] Added: static text in en.json

---
 src/locales/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/locales/en.json b/src/locales/en.json
index 07b5d7d1..6d470b43 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -42,6 +42,7 @@
   "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",
@@ -49,6 +50,7 @@
   "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",