From 5b881b4cbab3631d68c9f44674cd198104f6c5c2 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 28 Dec 2023 18:55:43 +0530 Subject: [PATCH 01/14] Improved: app to upgrade ionic to v7.6.0(#246) --- package-lock.json | 96 ++++++++++++++++++++++++++++++++++------------- package.json | 6 +-- 2 files changed, 73 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73c18fca..7f1e8ff1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,9 +14,9 @@ "@hotwax/apps-theme": "^1.1.0", "@hotwax/dxp-components": "^1.11.0", "@hotwax/oms-api": "^1.10.0", - "@ionic/core": "6.7.5", - "@ionic/vue": "6.7.5", - "@ionic/vue-router": "6.7.5", + "@ionic/core": "^7.6.0", + "@ionic/vue": "^7.6.0", + "@ionic/vue-router": "^7.6.0", "@types/file-saver": "^2.0.4", "@types/papaparse": "^5.3.1", "core-js": "^3.6.5", @@ -2808,6 +2808,50 @@ "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", @@ -3035,12 +3079,12 @@ } }, "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==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.0.tgz", + "integrity": "sha512-pDX8G915puz8OcLhxfb9MwuvpYZsUOCngJdd+61ibJ6UF+NA2mGatsMqHKzcgelTXtwcHDpi9ZLUD/HNmupqaQ==", "dependencies": { - "@stencil/core": "^2.18.0", - "ionicons": "^6.1.3", + "@stencil/core": "^4.8.1", + "ionicons": "^7.2.1", "tslib": "^2.1.0" } }, @@ -3050,20 +3094,20 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "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==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.6.0.tgz", + "integrity": "sha512-2CWLcVNS8kLQ6BK4UmRdc7a0HSsS6MqyTQh7+0qT88z+Ih05dCcZ3CiJ27F3F2a7jsOi48ggXt97zOpBbZENlg==", "dependencies": { - "@ionic/core": "6.7.5", - "ionicons": "^6.1.3" + "@ionic/core": "7.6.0", + "ionicons": "^7.0.0" } }, "node_modules/@ionic/vue-router": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@ionic/vue-router/-/vue-router-6.7.5.tgz", - "integrity": "sha512-nupLaWFARdy5vOCNg2xw6YpecaR/hPEew+tWjUJE1INlwvB88o7Uct/R480vqFj3fB436W4O4ViJd4/g0ZBZ8A==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@ionic/vue-router/-/vue-router-7.6.0.tgz", + "integrity": "sha512-grzMyURlZX3EqkQFBXeKuhxN2psbNKAI8CVwPi56xRPwCvSp32KFYtGxj20k1QBl+Kzg7/RbxTERArxZRtPWJw==", "dependencies": { - "@ionic/vue": "6.7.5" + "@ionic/vue": "7.6.0" } }, "node_modules/@isaacs/cliui": { @@ -3555,15 +3599,15 @@ "dev": true }, "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==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.9.0.tgz", + "integrity": "sha512-aWSkhBmk3yPwRAkUwBbzRwmdhb8hKiQ/JMr9m5jthpBZLjtppYbzz6PN2MhSMDfRp6K93eQw5WogSEH4HHuB6w==", "bin": { "stencil": "bin/stencil" }, "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" + "node": ">=16.0.0", + "npm": ">=7.10.0" } }, "node_modules/@surma/rollup-plugin-off-main-thread": { @@ -10610,11 +10654,11 @@ } }, "node_modules/ionicons": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz", - "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz", + "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==", "dependencies": { - "@stencil/core": "^2.18.0" + "@stencil/core": "^4.0.3" } }, "node_modules/ipaddr.js": { diff --git a/package.json b/package.json index dfdac66b..16808e6f 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "@hotwax/apps-theme": "^1.1.0", "@hotwax/dxp-components": "^1.11.0", "@hotwax/oms-api": "^1.10.0", - "@ionic/core": "6.7.5", - "@ionic/vue": "6.7.5", - "@ionic/vue-router": "6.7.5", + "@ionic/core": "^7.6.0", + "@ionic/vue": "^7.6.0", + "@ionic/vue-router": "^7.6.0", "@types/file-saver": "^2.0.4", "@types/papaparse": "^5.3.1", "core-js": "^3.6.5", From 50ae9e82a6fe60a25c098c52becf91c3bf6268c1 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 28 Dec 2023 18:57:59 +0530 Subject: [PATCH 02/14] Improved: apps theme version to latest release 1.2.6(#246) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f1e8ff1..55fb1c4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@capacitor/android": "^2.4.7", "@capacitor/core": "^2.4.7", "@hotwax/app-version-info": "^1.0.0", - "@hotwax/apps-theme": "^1.1.0", + "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "^1.11.0", "@hotwax/oms-api": "^1.10.0", "@ionic/core": "^7.6.0", @@ -2785,9 +2785,9 @@ "integrity": "sha512-PnJTqTbFvvl9N23yi1DjL4aNmTkpYFrayyoJyfH1qDJXADFbQ9kB7gJmKcfiPpyYMGR86Yf3Is5ct0+wReUJGQ==" }, "node_modules/@hotwax/apps-theme": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.5.tgz", - "integrity": "sha512-3Vec4pGWJVs6vDbL/pO5hYqoF1zn2w8liXuleqDJ7waI2R5JuF2eaJmYcUQETnk/DZIg47bDdyOSxihQltB2Ow==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.6.tgz", + "integrity": "sha512-zpUjGoY7LBlKeiP0V7tonrmoey8HQ5THQmyixQ+IDtrjmEJNBjynW/Ef3gC0FUNNPuVqxWPZdT5CVgaETLGTwg==" }, "node_modules/@hotwax/dxp-components": { "version": "1.11.0", diff --git a/package.json b/package.json index 16808e6f..0ad2329e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@capacitor/android": "^2.4.7", "@capacitor/core": "^2.4.7", "@hotwax/app-version-info": "^1.0.0", - "@hotwax/apps-theme": "^1.1.0", + "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "^1.11.0", "@hotwax/oms-api": "^1.10.0", "@ionic/core": "^7.6.0", From a96aa690cb6c9e86e27eee2df3aa8518c4374f9b Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 28 Dec 2023 19:09:35 +0530 Subject: [PATCH 03/14] Improved: usage of ion-radio as per changes in ionic7(#246) --- src/components/MissingSkuModal.vue | 24 +++++++++++++----------- src/views/TimezoneModal.vue | 5 +---- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/components/MissingSkuModal.vue b/src/components/MissingSkuModal.vue index 4ee2db8e..81919858 100644 --- a/src/components/MissingSkuModal.vue +++ b/src/components/MissingSkuModal.vue @@ -32,11 +32,12 @@ - - {{ item.shopifyProductSKU }} -

{{ item.orderId }}

-
- + + + {{ item.shopifyProductSKU }} +

{{ item.orderId }}

+
+
@@ -45,12 +46,13 @@ - -

{{ item.parentProductName }}

- {{ item.updatedSku }} -

{{ item.orderId }}

-
- + + +

{{ item.parentProductName }}

+ {{ item.updatedSku }} +

{{ item.orderId }}

+
+
diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue index c801eb01..06a590d0 100644 --- a/src/views/TimezoneModal.vue +++ b/src/views/TimezoneModal.vue @@ -24,8 +24,7 @@ - {{ timeZone.label }} ({{ timeZone.id }}) - + {{ timeZone.label }} ({{ timeZone.id }}) @@ -49,7 +48,6 @@ import { IonHeader, IonItem, IonIcon, - IonLabel, IonList, IonRadioGroup, IonRadio, @@ -76,7 +74,6 @@ export default defineComponent({ IonHeader, IonIcon, IonItem, - IonLabel, IonList, IonRadioGroup, IonRadio, From ab9656931abb264802afb56fd61ce173da2e6cb7 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 28 Dec 2023 19:29:58 +0530 Subject: [PATCH 04/14] Improved: usage of ion-input as per changes in ionic7(#246) --- src/components/BulkAdjustmentModal.vue | 6 ++---- src/components/BulkInventoryAdjustmentModal.vue | 3 +-- src/components/ConfigureDateTimeFormatModal.vue | 3 +-- src/components/CreateMappingModal.vue | 3 +-- src/components/DateTimeParseErrorModal.vue | 2 +- src/components/MappingConfiguration.vue | 10 ++-------- src/views/Settings.vue | 2 +- 7 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/components/BulkAdjustmentModal.vue b/src/components/BulkAdjustmentModal.vue index 824e7062..a21090b1 100644 --- a/src/components/BulkAdjustmentModal.vue +++ b/src/components/BulkAdjustmentModal.vue @@ -13,13 +13,11 @@ - {{ $t("Buffer days") }} - + - {{ $t("Order buffer") }} - + diff --git a/src/components/BulkInventoryAdjustmentModal.vue b/src/components/BulkInventoryAdjustmentModal.vue index 685eebae..9ae138b1 100644 --- a/src/components/BulkInventoryAdjustmentModal.vue +++ b/src/components/BulkInventoryAdjustmentModal.vue @@ -13,8 +13,7 @@ - {{ $t("Buffer quantity") }} - + diff --git a/src/components/ConfigureDateTimeFormatModal.vue b/src/components/ConfigureDateTimeFormatModal.vue index 73d09df0..1660a49b 100644 --- a/src/components/ConfigureDateTimeFormatModal.vue +++ b/src/components/ConfigureDateTimeFormatModal.vue @@ -20,8 +20,7 @@ {{ currentDate }} - {{ $t("Custom date format") }} - + diff --git a/src/components/CreateMappingModal.vue b/src/components/CreateMappingModal.vue index dd837f81..ce40b9be 100644 --- a/src/components/CreateMappingModal.vue +++ b/src/components/CreateMappingModal.vue @@ -11,8 +11,7 @@ - {{ $t("Mapping name") }} - + diff --git a/src/components/DateTimeParseErrorModal.vue b/src/components/DateTimeParseErrorModal.vue index 8aa9ec4b..4e8d5fe0 100644 --- a/src/components/DateTimeParseErrorModal.vue +++ b/src/components/DateTimeParseErrorModal.vue @@ -20,7 +20,7 @@ - + diff --git a/src/components/MappingConfiguration.vue b/src/components/MappingConfiguration.vue index accb205c..7e4c13a4 100644 --- a/src/components/MappingConfiguration.vue +++ b/src/components/MappingConfiguration.vue @@ -1,17 +1,13 @@