Commit Graph

1293 Commits

Author SHA1 Message Date
Marshal
2b4dfc6490 feat: implement staff price adjustment feature for bookings 2026-06-23 22:54:32 +00:00
marshal
13f0c92821 feat: add showFreeTextBox field to cargo type seeder and improve reference data validation in draft bookings seed 2026-06-24 01:22:53 +03:00
marshal
72df5ce689 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 01:22:31 +03:00
Marshal
196e296275 feat: update terminology for shipment date to estimated shipment date in booking forms 2026-06-23 22:21:12 +00:00
Marshal
733bfd1e5e feat: reorder cargo and route steps in booking form; update related logic and UI components 2026-06-23 22:15:29 +00:00
Marshal
6485cbdd71 feat: implement document clearance workflow for bookings
- Added ClearanceCard component to display and manage clearance documents in ReadonlyBookingView.
- Introduced new API endpoints for clearance operations: getClearance, submitClearanceDocuments, and proceedToOperation.
- Created BookingDocumentReview entity and migration for document review status tracking.
- Developed GlClearancePage for Global Logistics to review and manage document submissions.
- Implemented utility functions for determining clearance setting codes based on trade direction and freight type.
- Added tests for booking transition clearance logic and clearance utility functions.
2026-06-23 21:33:34 +00:00
Marshal
29f6928059 feat: add unit of measure selection for cargo types and update related calculations in booking forms 2026-06-23 21:00:51 +00:00
Marshal
080a08229d feat: enhance booking flow with multi-route support and onboarding document integration
- Introduced multi-route functionality in the booking process, allowing users to add additional routes for general contracts.
- Updated the StepDocuments component to display onboarding documents automatically attached to bookings.
- Refactored Step4Route to manage extra routes and quantities dynamically.
- Improved Step8Review to reflect the new onboarding document handling and updated submission readiness checks.
- Added new API endpoints and services for managing contract route lines and rejecting bookings.
- Removed the allowConsolidation field from the booking model as it is now managed by the system.
- Created migrations for the new contract route lines table and updated related entities.
2026-06-23 20:40:48 +00:00
natib21
2737866366 fix first mile 2026-06-23 15:40:21 +00:00
natib21
dbb9870cb6 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-23 15:19:23 +00:00
natib21
448b7fe969 fix last first mile 2026-06-23 15:18:32 +00:00
Marshal
eb85f8d32d refactor booking priority logic and constants; adjust scoring thresholds and remove unused service types 2026-06-23 14:25:54 +00:00
yaschalew10
6d648b2553 Merge pull request #252 from Tria-plc/freight/fix/type-errors
Fixes and improvements
2026-06-23 17:22:00 +03:00
Nathnael
10d74a65b0 fix: type error and fixes 2026-06-23 14:20:16 +00:00
Nathnael
cbbad02b29 fix: type error and other fixes 2026-06-23 13:14:06 +00:00
ghost2023
cdfe7c1f5b fix: type errors 2026-06-23 15:02:25 +03:00
Marshal
6a63ae2fa6 refactor login page to simplify identifier normalization and remove unused login methods 2026-06-23 11:33:04 +00:00
Nathnael Wondisha
76f38b75cf Merge pull request #249 from Tria-plc/hot-fix
fix: unused imports
2026-06-23 14:04:55 +03:00
ghost2023
3174f97e24 fix: unused imports 2026-06-23 14:04:07 +03:00
Marshal
6fd1b68389 enhance company approval workflow and TIN validation; add pending approval handling in booking and onboarding forms 2026-06-23 08:37:15 +00:00
SennayT
94585a36d9 fix tria package on edr freight frontends 2026-06-23 11:34:52 +03:00
Yonas Tewabe
0a13fd0605 Update deploy.yml 2026-06-23 11:26:46 +03:00
SennayT
b2767a1cbf fix package issue for freight api 2026-06-23 11:22:41 +03:00
yaschalew10
18989c97e6 Merge pull request #248 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-23 11:15:22 +03:00
Marshal
1d77f377f3 enhance service filtering and dashboard functionality with company profile support 2026-06-23 07:54:36 +00:00
yaschalew
c8f7445b4d Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-23 10:54:20 +03:00
yaschalew
eeb7ce8cae fix user module 2026-06-23 10:53:57 +03:00
Nathnael Wondisha
fd1fc1ca69 Merge pull request #247 from Tria-plc/freight/fix/api
fix
2026-06-23 10:04:28 +03:00
ghost2023
fab05569d4 fix 2026-06-23 10:03:54 +03:00
yaschalew10
4655392e70 Merge pull request #246 from Tria-plc/freight/style/ui-sync
Feat: add the company profile management to the backoffice
2026-06-23 09:54:06 +03:00
Nathnael Wondisha
56968e0709 Merge branch 'freight/develop' into freight/style/ui-sync 2026-06-23 09:51:24 +03:00
Nathnael
a6f3fd5643 feat: finish company profile in the backoffice 2026-06-23 06:45:29 +00:00
Abubeker Yasin
aede976973 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev 2026-06-22 20:09:56 +03:00
Eyob T.
e6cdefdf69 Merge pull request #244 from Tria-plc/alpha
Added manage booking,voucher download options and fix email and phone number for guest user
2026-06-22 18:34:44 +03:00
Yonas Tewabe
be1461c792 Update deployment workflow to use dynamic runner 2026-06-22 17:00:57 +03:00
Muluhabt
ee90d178ae Adding local packages 2026-06-22 16:52:49 +03:00
Nathnael
f7cbb6af6f fix: query key 2026-06-22 13:52:34 +00:00
Roba Boru
9cfd0fc2eb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:55 +03:00
Roba Boru
aadf1644fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:44 +03:00
Nathnael
2700a3edec refactor: migrate from most of the custom hooks into the api.ts 2026-06-22 13:46:38 +00:00
Roba Boru
1456ca7e9c Added download voucher option and manage booking 2026-06-22 16:46:24 +03:00
Muluhabt
f25a237dc0 Remove malware 2026-06-22 16:27:02 +03:00
mulish77
387fc5efdd Add files via upload 2026-06-22 16:25:57 +03:00
mulish77
712579bf92 Delete local-packages/tria-plc-api-common-1.4.3.tgz 2026-06-22 16:23:01 +03:00
marshal
02427f72f1 Merge pull request #243 from Tria-plc/freight_feature/profile
Freight feature/profile
2026-06-22 15:49:25 +03:00
marshal
af3a03750b Merge pull request #236 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-22 15:49:06 +03:00
Marshal
39f2c99395 feat: add phone number normalization to Ethiopian E.164 format in CompanyProfileForm 2026-06-22 12:35:01 +00:00
Nathnael
c6bc636495 feat(customers): implement customer management page with mock data
- Created CustomersPage component to display a list of companies with search and pagination features.
- Added mock data for companies, including various statuses and profiles.
- Implemented a service layer to simulate API calls for fetching company data, bookings, documents, and payments.
- Defined TypeScript types for company and related entities to ensure type safety.
- Integrated Mantine components for UI consistency and improved user experience.
2026-06-22 12:32:52 +00:00
Marshal
30b022356c feat: update onboarding and company role handling to support multiple service types 2026-06-22 12:30:44 +00:00
Nathnael
d66ccc5363 refactor: migrated of the customer hooks for warehouse data fetching 2026-06-22 12:25:20 +00:00