From 4231ca5b9b14d09e41c19a7855b2b9ac0c619354 Mon Sep 17 00:00:00 2001
From: sidharth <sidhj01@gmail.com>
Date: Wed, 19 Jan 2022 22:12:16 +0530
Subject: [PATCH] url fixes
---
.env.development | 6 ++---
.env.staging | 6 ++---
git_info.json | 1 -
src/multipages/retailer.routes.js | 1 +
src/services/block.service.js | 8 +++----
src/services/gate.service.js | 2 +-
src/services/nav.js | 6 ++---
src/services/product.service.js | 40 +++++++++++++++----------------
src/services/user.service.js | 2 +-
src/services/user_cart.service.js | 4 ++--
10 files changed, 38 insertions(+), 38 deletions(-)
delete mode 100644 git_info.json
diff --git a/.env.development b/.env.development
index e9e8cd3..19290a9 100644
--- a/.env.development
+++ b/.env.development
@@ -1,13 +1,13 @@
VUE_APP_BRAINTREE_AUTH_KEY=sandbox_bn48hmp6_cz6p85sw4dr5tp8h
-VUE_APP_MAGENTO_API_URL=https://retailer-stg.crane.com
+VUE_APP_MAGENTO_API_URL=https://m2-stg.crane.com
VUE_APP_CRANE_URL=/shop
VUE_APP_GATE_URL=/gate
VUE_APP_ME_URL=/b2b
VUE_APP_LOGIN_URL=/gate/sign-in
VUE_APP_PERSONALIZE_URL=https://studio-stg.crane.com/personalize
-VUE_APP_IMAGE_PATH_URL=https://retailer-stg.crane.com/media/catalog/product
+VUE_APP_IMAGE_PATH_URL=https://m2-stg.crane.com/media/catalog/product
VUE_APP_RETAILOR_ID=49057567-f789-420c-98b6-2e0443af73f5
-VUE_APP_IMAGE_CATEGORY_PATH_URL=https://retailer-stg.crane.com
+VUE_APP_IMAGE_CATEGORY_PATH_URL=https://m2-stg.crane.com
VUE_APP_NODESLS_API_URL=https://imagelib-sls-stg.crane.com
VUE_APP_HOME_PAGE_URL=https://www-stg.crane.com
diff --git a/.env.staging b/.env.staging
index be3f63b..1bca5b8 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,14 +1,14 @@
NODE_ENV=production
VUE_APP_BRAINTREE_AUTH_KEY=sandbox_bn48hmp6_cz6p85sw4dr5tp8h
-VUE_APP_MAGENTO_API_URL=https://retailer-stg.crane.com
+VUE_APP_MAGENTO_API_URL=https://m2-stg.crane.com
VUE_APP_CRANE_URL=/shop
VUE_APP_GATE_URL=/gate
VUE_APP_ME_URL=/b2b
VUE_APP_LOGIN_URL=/gate/sign-in
VUE_APP_PERSONALIZE_URL=https://studio-stg.crane.com/personalize
-VUE_APP_IMAGE_PATH_URL=https://retailer-stg.crane.com/media/catalog/product
+VUE_APP_IMAGE_PATH_URL=https://m2-stg.crane.com/media/catalog/product
VUE_APP_RETAILOR_ID=49057567-f789-420c-98b6-2e0443af73f5
-VUE_APP_IMAGE_CATEGORY_PATH_URL=https://retailer-stg.crane.com
+VUE_APP_IMAGE_CATEGORY_PATH_URL=https://m2-stg.crane.com
VUE_APP_NODESLS_API_URL=https://imagelib-sls-stg.crane.com
VUE_APP_HOME_PAGE_URL=https://www-stg.crane.com
diff --git a/git_info.json b/git_info.json
deleted file mode 100644
index 18dfbdc..0000000
--- a/git_info.json
+++ /dev/null
@@ -1 +0,0 @@
-{"branch_name":"beta","last_commit_date":"2022-01-19T12:17:18.000Z","last_commit_author":"sidharth","last_commit_hash":"e4e8a8dac80f96405c6591d0be2b37d10cac358b"}
\ No newline at end of file
diff --git a/src/multipages/retailer.routes.js b/src/multipages/retailer.routes.js
index 06cf747..2af9afa 100644
--- a/src/multipages/retailer.routes.js
+++ b/src/multipages/retailer.routes.js
@@ -242,6 +242,7 @@ export default [
{
path: '*',
name: 'RouteNotFound',
+ redirect: '/b2b',
component: () => import( /* webpackChunkName: "craneMain" */'@/routes/retailer/route_not_found.vue'),
}
diff --git a/src/services/block.service.js b/src/services/block.service.js
index 986a03c..c30cf80 100644
--- a/src/services/block.service.js
+++ b/src/services/block.service.js
@@ -11,7 +11,7 @@
...authHeader()
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crcmsBlock/${blockId}`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crcmsBlock/${blockId}`, requestOptions)
});
export const doFetchList = wrapRequest(() => {
@@ -22,9 +22,9 @@
'Authorization': 'Bearer ' + 'q6u1q4thvtw03ajuo5v6q3cb8vlq623v'
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/cmsBlock/search?searchCriteria[filter_groups][0][filters][0][field]=id&searchCriteria[filter_groups][0][filters][0][value]=10&searchCriteria[filter_groups][0][filters][0][condition_type]=eq`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/cmsBlock/search?searchCriteria[filter_groups][0][filters][0][field]=id&searchCriteria[filter_groups][0][filters][0][value]=10&searchCriteria[filter_groups][0][filters][0][condition_type]=eq`, requestOptions)
- // return fetch(`${vueAppMagenotApiUrl}/rest/V1/cmsBlock/search?
+ // return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/cmsBlock/search?
// searchCriteria[filter_groups][0][filters][0][field]=id&
// searchCriteria[filter_groups][0][filters][0][value]=10&
// searchCriteria[filter_groups][0][filters][0][condition_type]=eq&
@@ -38,5 +38,5 @@
...authHeader()
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crcmsPage/search?searchCriteria[filter_groups][0][filters][0][field]=identifier&searchCriteria[filter_groups][0][filters][0][value]=${pageUrlKey}&searchCriteria[filter_groups][0][filters][0][condition_type]=eq`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crcmsPage/search?searchCriteria[filter_groups][0][filters][0][field]=identifier&searchCriteria[filter_groups][0][filters][0][value]=${pageUrlKey}&searchCriteria[filter_groups][0][filters][0][condition_type]=eq`, requestOptions)
});
\ No newline at end of file
diff --git a/src/services/gate.service.js b/src/services/gate.service.js
index 7a50f78..430e818 100644
--- a/src/services/gate.service.js
+++ b/src/services/gate.service.js
@@ -14,7 +14,7 @@ export const doLogin = wrapRequest((loginDetail) => {
password: loginDetail.password
})
};
- return fetch(`${vueAppMagentoApiUrl}/rest/V1/integration/customer/token`, requestOptions);
+ return fetch(`${vueAppMagentoApiUrl}/rest/crn_retailer/V1/integration/customer/token`, requestOptions);
});
////////////////// dummy api //////////////////
diff --git a/src/services/nav.js b/src/services/nav.js
index c8319eb..faef1c8 100644
--- a/src/services/nav.js
+++ b/src/services/nav.js
@@ -68,7 +68,7 @@ const meHandleError = async errorResponse => {
if (localStorage.getItem("cr_changePassowrd") == "true") {
localStorage.clear("cr_changePassowrd")
} else {
- //loginInterrupt(window.location.href, 'There was an access violation caused by your request. You need to sign back in please.');
+ loginInterrupt(window.location.href, 'There was an access violation caused by your request. You need to sign back in please.');
}
break;
}
@@ -127,9 +127,9 @@ const handleError = async errorResponse => {
if (typeof Vue.$snotify != 'undefined') {
Vue.$snotify.error(data_401.message);
}
- throw data_401;
+ // throw data_401;
- //loginInterrupt(window.location.href, 'There was an access violation caused by your request. You need to sign back in please.');
+ loginInterrupt(window.location.href, 'There was an access violation caused by your request. You need to sign back in please.');
break;
}
case 400:
diff --git a/src/services/product.service.js b/src/services/product.service.js
index 0cea622..070d13d 100644
--- a/src/services/product.service.js
+++ b/src/services/product.service.js
@@ -15,7 +15,7 @@ export const doFetchOrderProductsList = wrapRequest((emailId) => {
// ...authHeader()
}
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crorders?searchCriteria[filter_groups][0][filters][0][field]=customer_email&searchCriteria[filter_groups][0][filters][0][value]=${emailId}`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crorders?searchCriteria[filter_groups][0][filters][0][field]=customer_email&searchCriteria[filter_groups][0][filters][0][value]=${emailId}`, requestOptions)
});
export const doFetchOrderProduct = wrapRequest((orderId) => {
@@ -27,7 +27,7 @@ export const doFetchOrderProduct = wrapRequest((orderId) => {
// ...authHeader()
}
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crorders/${orderId}`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crorders/${orderId}`, requestOptions)
});
@@ -146,7 +146,7 @@ export const doFetchProductsList = wrapRequest(() => {
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts?searchCriteria[current_page]=1&searchCriteria[page_size]=27`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts?searchCriteria[current_page]=1&searchCriteria[page_size]=27`, requestOptions)
});
export const doFetchProductsMedia = wrapRequest((sku) => {
const requestOptions = {
@@ -157,7 +157,7 @@ export const doFetchProductsMedia = wrapRequest((sku) => {
'Access-Control-Allow-Origin': '*',
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts/${sku}?fields=sku,media_gallery_entries[file]`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/${sku}?fields=sku,media_gallery_entries[file]`, requestOptions)
});
export const doFetchProductsAttributes = wrapRequest((sku) => {
const requestOptions = {
@@ -168,7 +168,7 @@ export const doFetchProductsAttributes = wrapRequest((sku) => {
'Access-Control-Allow-Origin': '*',
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts/${sku}?fields=sku,custom_attributes`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/${sku}?fields=sku,custom_attributes`, requestOptions)
});
export const doFetchAttributeList = wrapRequest(() => {
const requestOptions = {
@@ -178,7 +178,7 @@ export const doFetchAttributeList = wrapRequest(() => {
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts/attributes?searchCriteria=&fields=items[attribute_id,attribute_code,options,frontend_labels]`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/attributes?searchCriteria=&fields=items[attribute_id,attribute_code,options,frontend_labels]`, requestOptions)
});
export const doFetchFilterOptions = async () => {
@@ -435,7 +435,7 @@ export const doFetchProductDetails = wrapRequest((sku) => {
'Access-Control-Allow-Origin': '*'
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/product/${sku}`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/product/${sku}`, requestOptions)
});
export const doFetchConfiguredProductDetails = wrapRequest((productId) => {
@@ -446,7 +446,7 @@ export const doFetchConfiguredProductDetails = wrapRequest((productId) => {
'Access-Control-Allow-Origin': '*'
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts?searchCriteria[filter_groups][0][filters][0][field]=entity_id&searchCriteria[filter_groups][0][filters][0][value]=${productId}?searchCriteria&fields=items[price,sku,media_gallery_entries,custom_attributes]`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts?searchCriteria[filter_groups][0][filters][0][field]=entity_id&searchCriteria[filter_groups][0][filters][0][value]=${productId}?searchCriteria&fields=items[price,sku,media_gallery_entries,custom_attributes]`, requestOptions)
});
export const doFetchAttributeFilterProducts = wrapRequest(() => {
@@ -500,8 +500,8 @@ export const doFetchSortProducts = wrapRequest((pageNo, pageSize, sortBy, catego
//side filter end//
let query = "";
query = `?searchCriteria[filter_groups][0][filters][0][field]=entity_id&searchCriteria[filter_groups][0][filters][0][value]=${categoryIds}&searchCriteria[filter_groups][0][filters][0][condition_type]=in&searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}`
- console.log('product', `${vueAppMagenotApiUrl}/rest/V1/crproducts/${query}`);
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts/${query}`, requestOptions)
+ console.log('product', `${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/${query}`);
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/${query}`, requestOptions)
} else {
let nameSearchQuery = "";
@@ -526,8 +526,8 @@ export const doFetchSortProducts = wrapRequest((pageNo, pageSize, sortBy, catego
query = `?${extraAttribute}${nameSearchQuery}${filterQuery}searchCriteria[filter_groups][${increment}][filters][0][field]=status&searchCriteria[filter_groups][${increment}][filters][0][value]=1&searchCriteria[filter_groups][${increment}][filters][0][condition_type]=eq&searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=DESC`;
- console.log('productNames', `${vueAppMagenotApiUrl}/rest/V1/crproducts/${query}`);
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts/${query}`, requestOptions)
+ console.log('productNames', `${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/${query}`);
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts/${query}`, requestOptions)
}
});
@@ -539,7 +539,7 @@ export const doFetchCategoryList = wrapRequest(() => {
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crcategories`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crcategories`, requestOptions)
});
/*export const doFetchCategoryList = wrapRequest(() => {
const requestOptions = {
@@ -554,7 +554,7 @@ export const dofetchCategoryListIdWise = wrapRequest(() => {
'Content-type': 'application/json'
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crcategories/list?searchCriteria&fields=items[id,parent_id,name,custom_attributes]`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crcategories/list?searchCriteria&fields=items[id,parent_id,name,custom_attributes]`, requestOptions)
});
export const doFetchCatelogProducts = wrapRequest((searchCriteria) => {
const requestOptions = {
@@ -562,7 +562,7 @@ export const doFetchCatelogProducts = wrapRequest((searchCriteria) => {
headers: { 'Content-type': 'application/json' }
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/suggestion?q=${searchCriteria}`, requestOptions);
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/suggestion?q=${searchCriteria}`, requestOptions);
});
export const doFetchRecentlyViewedList = wrapRequest((sku) => {
@@ -572,7 +572,7 @@ export const doFetchRecentlyViewedList = wrapRequest((sku) => {
'Content-type': 'application/json'
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/crproducts?searchCriteria[filter_groups][0][filters][0][field]=sku&searchCriteria[filter_groups][0][filters][0][value]=${sku}&searchCriteria[filter_groups][0][filters][0][condition_type]=in&searchCriteria[sortOrders][0][direction]=ASC`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crproducts?searchCriteria[filter_groups][0][filters][0][field]=sku&searchCriteria[filter_groups][0][filters][0][value]=${sku}&searchCriteria[filter_groups][0][filters][0][condition_type]=in&searchCriteria[sortOrders][0][direction]=ASC`, requestOptions)
});
export const doSideBarFilter = wrapRequest((pageNo, pageSize, sortBy, categoryId, sideFilter, search) => {
const requestOptions = {
@@ -601,9 +601,9 @@ export const doSideBarFilter = wrapRequest((pageNo, pageSize, sortBy, categoryId
})
}
- console.log('searchCat', `${vueAppMagenotApiUrl}/rest/V1/search?searchCriteria[filter_groups][0][filters][0][field]=category_ids&searchCriteria[filter_groups][0][filters][0][value]=${categoryId}&searchCriteria[filter_groups][1][filters][0][field]=visibility&searchCriteria[filter_groups][1][filters][0][value]=4&${nameSearchQuery}${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=catalog_view_container`);
+ console.log('searchCat', `${vueAppMagenotApiUrl}/rest/crn_retailer/V1/search?searchCriteria[filter_groups][0][filters][0][field]=category_ids&searchCriteria[filter_groups][0][filters][0][value]=${categoryId}&searchCriteria[filter_groups][1][filters][0][field]=visibility&searchCriteria[filter_groups][1][filters][0][value]=4&${nameSearchQuery}${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=catalog_view_container`);
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/search?searchCriteria[filter_groups][0][filters][0][field]=category_ids&searchCriteria[filter_groups][0][filters][0][value]=${categoryId}&searchCriteria[filter_groups][1][filters][0][field]=visibility&searchCriteria[filter_groups][1][filters][0][value]=4&${nameSearchQuery}${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=catalog_view_container`, requestOptions);
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/search?searchCriteria[filter_groups][0][filters][0][field]=category_ids&searchCriteria[filter_groups][0][filters][0][value]=${categoryId}&searchCriteria[filter_groups][1][filters][0][field]=visibility&searchCriteria[filter_groups][1][filters][0][value]=4&${nameSearchQuery}${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=catalog_view_container`, requestOptions);
} else if (search) {
let nameSearchQuery = "";
@@ -626,8 +626,8 @@ export const doSideBarFilter = wrapRequest((pageNo, pageSize, sortBy, categoryId
increment++;
})
}
- console.log('search', `${vueAppMagenotApiUrl}/rest/V1/search?${nameSearchQuery}${filterQuery}searchCriteria[filter_groups][${increment}][filters][0][field]=visibility&searchCriteria[filter_groups][${increment}][filters][0][value]=4&${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=quick_search_container`);
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/search?${nameSearchQuery}${filterQuery}searchCriteria[filter_groups][${increment}][filters][0][field]=visibility&searchCriteria[filter_groups][${increment}][filters][0][value]=4&${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=quick_search_container`, requestOptions);
+ console.log('search', `${vueAppMagenotApiUrl}/rest/crn_retailer/V1/search?${nameSearchQuery}${filterQuery}searchCriteria[filter_groups][${increment}][filters][0][field]=visibility&searchCriteria[filter_groups][${increment}][filters][0][value]=4&${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=quick_search_container`);
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/search?${nameSearchQuery}${filterQuery}searchCriteria[filter_groups][${increment}][filters][0][field]=visibility&searchCriteria[filter_groups][${increment}][filters][0][value]=4&${extraAttribute}searchCriteria[sortOrders][0][field]=${sortBy}&searchCriteria[sortOrders][0][direction]=${sortFlag}&searchCriteria[requestName]=quick_search_container`, requestOptions);
}
});
diff --git a/src/services/user.service.js b/src/services/user.service.js
index e51fac0..b4a34ee 100644
--- a/src/services/user.service.js
+++ b/src/services/user.service.js
@@ -89,7 +89,7 @@ export const doFetchBasicInfo = meWrapRequest(() => {
...authHeader()
},
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/customers/me`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/customers/me`, requestOptions)
});
/*
export const doFetchChangePassword = wrapRequest((token) => {
diff --git a/src/services/user_cart.service.js b/src/services/user_cart.service.js
index dd900a0..1d0bb09 100644
--- a/src/services/user_cart.service.js
+++ b/src/services/user_cart.service.js
@@ -178,7 +178,7 @@ export const doFetchCartProducts = wrapRequest((userCartId) => {
...authHeader()
}
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/cart/data?cartid=${userCartId}`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/cart/data?cartid=${userCartId}`, requestOptions)
});
export const doFetchTotalAmt = wrapRequest(() => {
@@ -277,7 +277,7 @@ export const doFetchGiftMessage = wrapRequest((quoteId, itemId) => {
...authHeader()
}
};
- return fetch(`${vueAppMagenotApiUrl}/rest/V1/item/data?itemId=${itemId}&cartid=${quoteId}`, requestOptions)
+ return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/item/data?itemId=${itemId}&cartid=${quoteId}`, requestOptions)
});
export const doPutCConectionCartItem = wrapRequest((sku, qty, ccid) => {
const requestOptions = {