Merge pull request #269 from ymaheshwari1/#268

Fixed: issue when redirecting to commerce after successfull upload of inventory or PO file(#268)
hotwax · Mar 18, 2024 · b740b23 · b740b23
2 parents 731b797 + ce2d6c9
commit b740b23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/views/InventoryReview.vue b/src/views/InventoryReview.vue
@@ -258,7 +258,8 @@ export default defineComponent({
                     text: translate('View'),
                     role: 'view',
                     handler: () => {
-                      window.open(`https://${this.instanceUrl}.hotwax.io/commerce/control/ImportData?configId=RESET_INVENTORY`, '_blank');
+                      const omsURL = (this.instanceUrl.startsWith('http') ? this.instanceUrl.replace(/\/api\/?|\/$/, "") : `https://${this.instanceUrl}.hotwax.io`) + `/commerce/control/ImportData?configId=RESET_INVENTORY`
+                      window.open(omsURL, '_blank');
                     }
                   }])
                   this.router.push("/inventory");

diff --git a/src/views/PurchaseOrderReview.vue b/src/views/PurchaseOrderReview.vue
@@ -283,7 +283,8 @@ export default defineComponent({
                   text: translate('View'),
                   role: 'view',
                   handler: () => {
-                    window.open(`https://${this.instanceUrl}.hotwax.io/commerce/control/ImportData?configId=IMP_PO`, '_blank');
+                    const omsURL = (this.instanceUrl.startsWith('http') ? this.instanceUrl.replace(/\/api\/?|\/$/, "") : `https://${this.instanceUrl}.hotwax.io`) + `/commerce/control/ImportData?configId=IMP_PO`
+                    window.open(omsURL, '_blank');
                   }
                 }])
                 this.router.push("/purchase-order");