From 156747f42fc05688634bf73182a5e3c7e073cddd Mon Sep 17 00:00:00 2001 From: hagiye Date: Tue, 30 Jun 2026 16:48:08 +0300 Subject: [PATCH 1/2] Approve delivery button for customer to sign or acknowlegde delivery --- apps/edr-freight-web/backoffice/src/constants/apiConfig.ts | 5 ++--- apps/edr-freight-web/portal/src/constants/apiConfig.ts | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts index a60559d5d..07496364b 100644 --- a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts +++ b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts @@ -1,6 +1,5 @@ -//export const API_BASE_URL = 'https://edrfreightapi.triaplc.com'; - -export const API_BASE_URL = 'http://localhost:3001'; +export const API_BASE_URL = 'https://edrfreightapi.triaplc.com'; +//export const API_BASE_URL = 'http://localhost:3001'; /** * URL that streams an uploaded file through the API by its UUID. Routes the diff --git a/apps/edr-freight-web/portal/src/constants/apiConfig.ts b/apps/edr-freight-web/portal/src/constants/apiConfig.ts index b2d93ca3a..59324b76f 100644 --- a/apps/edr-freight-web/portal/src/constants/apiConfig.ts +++ b/apps/edr-freight-web/portal/src/constants/apiConfig.ts @@ -1,5 +1,5 @@ -//export const API_BASE_URL = 'https://edrfreightapi.triaplc.com'; -export const API_BASE_URL = 'http://localhost:3001'; +export const API_BASE_URL = 'https://edrfreightapi.triaplc.com'; +//export const API_BASE_URL = 'http://localhost:3001'; /** * URL that streams an uploaded file through the API by its UUID. Routes the From 38db9a4177a40af201f7f79f1d93f6381b7f5305 Mon Sep 17 00:00:00 2001 From: hagiye Date: Tue, 30 Jun 2026 17:05:53 +0300 Subject: [PATCH 2/2] Delivery approval customer handover signature --- .../edr-freight-web/backoffice/src/constants/apiConfig.ts | 8 ++++---- apps/edr-freight-web/portal/src/constants/apiConfig.ts | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts index 0a5ce4647..07e271cb6 100644 --- a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts +++ b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts @@ -1,11 +1,11 @@ -<<<<<<< HEAD + export const API_BASE_URL = 'https://edrfreightapi.triaplc.com'; //export const API_BASE_URL = 'http://localhost:3001'; -======= -export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL; + + // export const API_BASE_URL = 'http://localhost:3001'; ->>>>>>> 8616f6dcdfa44089be2fd7b6a9867b20e320b305 + /** * URL that streams an uploaded file through the API by its UUID. Routes the diff --git a/apps/edr-freight-web/portal/src/constants/apiConfig.ts b/apps/edr-freight-web/portal/src/constants/apiConfig.ts index c51eb9e7b..07496364b 100644 --- a/apps/edr-freight-web/portal/src/constants/apiConfig.ts +++ b/apps/edr-freight-web/portal/src/constants/apiConfig.ts @@ -1,9 +1,5 @@ -<<<<<<< HEAD export const API_BASE_URL = 'https://edrfreightapi.triaplc.com'; //export const API_BASE_URL = 'http://localhost:3001'; -======= -export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL; ->>>>>>> 8616f6dcdfa44089be2fd7b6a9867b20e320b305 /** * URL that streams an uploaded file through the API by its UUID. Routes the