Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved: baseUrl for login, fetching userProfile and availableTimeZones using the admin component (#27) #28

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Improved: baseUrl for login, fetching userProfile and availableTimeZones using the admin component (#27) #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe67ac
Fixed: typo in the translation entry of country text (#27)
amansinghbais Jun 25, 2024
9133dce
Improved: baseUrl for logging, fetching userProfile and timeZones usi…
amansinghbais Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"Configure when no further order information is needed prior to order approval.": "Configure when no further order information is needed prior to order approval.",
"Confirm": "Confirm",
"Control what your customers are allowed to edit on their own when they are editing their order on Re-route Fulfillment.": "Control what your customers are allowed to edit on their own when they are editing their order on Re-route Fulfillment.",
"Country": "{count} country",
"country": "{count} country",
"countries": "{count} countries",
"Create a new product store": "Create a new product store",
"Create deadline days": "Create deadline days",
Expand Down
6 changes: 3 additions & 3 deletions src/services/UserService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { hasError } from "@/utils";

const login = async (token: string): Promise <any> => {
const url = store.getters["user/getBaseUrl"]
const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url.replace("admin", "available-to-promise") : `${url}/rest/s1/available-to-promise/` : `https://${url}.hotwax.io/rest/s1/available-to-promise/`;
const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url : `${url}/rest/s1/admin/` : `https://${url}.hotwax.io/rest/s1/admin/`;
let api_key = ""

try {
Expand Down Expand Up @@ -33,7 +33,7 @@ const login = async (token: string): Promise <any> => {

const getUserProfile = async (token: any): Promise<any> => {
const url = store.getters["user/getBaseUrl"]
const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url.replace("admin", "available-to-promise") : `${url}/rest/s1/available-to-promise/` : `https://${url}.hotwax.io/rest/s1/available-to-promise/`;
const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url : `${url}/rest/s1/admin/` : `https://${url}.hotwax.io/rest/s1/admin/`;
try {
const resp = await client({
url: "user/profile",
Expand All @@ -53,7 +53,7 @@ const getUserProfile = async (token: any): Promise<any> => {

const getAvailableTimeZones = async (): Promise <any> => {
const url = store.getters["user/getBaseUrl"]
const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url.replace("admin", "available-to-promise") : `${url}/rest/s1/available-to-promise/` : `https://${url}.hotwax.io/rest/s1/available-to-promise/`;
const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url : `${url}/rest/s1/admin/` : `https://${url}.hotwax.io/rest/s1/admin/`;
return client({
url: "user/getAvailableTimeZones",
method: "get",
Expand Down
Loading