Commit Graph

1566 Commits

Author SHA1 Message Date
Marshal
08977fcd19 feat(bookings): add estimated shipment date handling and validation for binding shipment day 2026-06-25 00:28:54 +00:00
marshal
6ab9699c94 refactor(first-mile): update module imports to use forwardRef for circular dependency resolution 2026-06-25 03:01:56 +03:00
Marshal
d4c58e7d78 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 23:56:07 +00:00
Marshal
e0c3044933 feat(train-sets): implement multi-locomotive support for train sets
- Added TrainSetLocomotive entity to link multiple locomotives to a train set.
- Updated TrainSet entity to include a OneToMany relationship with TrainSetLocomotive.
- Modified the train scheduling logic to require at least two locomotives for a train set.
- Enhanced the UI components to support selecting multiple locomotives.
- Introduced new permissions for viewing customs clearance.
- Updated migrations to create the train_set_locomotives table and backfill existing data.
- Implemented utility functions for managing train numbers based on cargo type and direction.
- Added tests for train number utilities to ensure correct functionality.
2026-06-24 23:54:45 +00:00
Marshal
15ab9f906e feat(bookings): enhance booking process with customs clearing and document handling
- Update bookings service to prioritize uploaded documents over profile snapshots.
- Refactor pricing data seeder to remove unused service types and streamline cargo type seeding.
- Add customs clearing information to BookingRouteServiceCard, displaying agent details if applicable.
- Extend BookingDetail type to include customs clearing options.
- Modify NewBookingPage to remove the scheduling step, integrating estimated shipment date into the route step.
- Update StepIndicator to reflect the new step structure.
- Revise document handling in StepDocuments to allow for user uploads while displaying onboarding documents.
- Adjust Step2ServiceType to manage customs clearing agent input based on service type.
- Implement shipment date input in Step4Route for one-time bookings.
- Revise Step8Review to reflect changes in document handling and scheduling.
2026-06-24 23:37:55 +00:00
hagiye
503878110f DJbouti port Export Unloading 2026-06-24 23:25:34 +03:00
Muluhabt
2e138a73ea Updating package 2026-06-24 22:56:32 +03:00
Eyob T.
bdf43e7ba2 Merge pull request #282 from Tria-plc/alpha
Merge request for passenger apps updates
2026-06-24 21:34:31 +03:00
Stephanos A
9e84a022df Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 19:54:37 +03:00
Stephanos A
58967e6e3d IAM related required updates 2026-06-24 19:53:05 +03:00
natib21
6cf0ae09f5 fix issue 2026-06-24 14:50:26 +00:00
natib21
a1bb458a91 fix ui 2026-06-24 14:37:45 +00:00
natib21
f7bdd19a07 fix ui 2026-06-24 14:32:04 +00:00
natib21
c43201639d Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:25:27 +00:00
natib21
5b9fcc0f89 fix btn color 2026-06-24 14:25:04 +00:00
yaschalew
28675cd5dc fix vehicle 2026-06-24 17:05:25 +03:00
yaschalew
6239358bf2 fix url 2026-06-24 16:56:02 +03:00
natib21
ae947955aa fix issue 2026-06-24 13:51:19 +00:00
Nathnael
f7bbb03cc1 fix: make the reference generate on apporaval 2026-06-24 13:22:20 +00:00
hagiye
46bfa9cb87 Release Order plus Storage Allocation Rule and fee 2026-06-24 16:21:45 +03:00
Nathnael
083a87ab9e fix: rm the otp on signup 2026-06-24 13:21:03 +00:00
yaschalew
ed44cb5675 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 16:19:59 +03:00
yaschalew
cefcaa7184 fix conflict 2026-06-24 16:18:35 +03:00
natib21
b0a5494405 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 13:14:59 +00:00
natib21
5b1d2e2984 fix 2026-06-24 13:14:33 +00:00
yaschalew10
aa59d80937 Merge pull request #277 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-24 16:13:34 +03:00
Abubeker Yasin
5d9e2cee53 refactor: ( iam ) add ispublic to public endpoints 2026-06-24 16:06:53 +03:00
hagiye
060d6b5988 Release Order plus Storage Allocation Rule and fee 2026-06-24 15:51:03 +03:00
Nathnael
2261675e21 chore: add api errors 2026-06-24 12:48:42 +00:00
Nathnael
b31b27ce52 fix: the company onboading flow 2026-06-24 12:45:10 +00:00
Abubeker Yasin
6e33075b05 fix: ( seats ) restore @IsPublic() on GET /seats/seatmap/:scheduleId 2026-06-24 15:32:45 +03:00
hagiye
9719bd02d7 Release Order plus Storage Allocation Rule and fee 2026-06-24 15:27:38 +03:00
hagiye
c69dd3c238 Release Order plus Storage fee 2026-06-24 15:23:50 +03:00
Nathnael
66d3ae8093 fix: onboarding 2026-06-24 12:18:31 +00:00
Abubeker Yasin
e2e10e0a44 fix: ( seed ) add @InjectDataSource() to PassengerStaffUsersSeeder constructor 2026-06-24 15:03:48 +03:00
yaschalew
409d79fb6b Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:52:47 +03:00
natib21
23e47c7319 fix 2026-06-24 11:52:17 +00:00
Nathnael
9b48955eaf feat: centralized the user onboaridn requriements 2026-06-24 11:50:28 +00:00
Nathnael
43be6892aa fix: block the user from booking if not approved 2026-06-24 11:50:04 +00:00
yaschalew
66e45d2cd5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:47:33 +03:00
natib21
f1b9989730 fix 2026-06-24 11:47:02 +00:00
Stephanos A
3ed748234d fix duplicate entry from schema.prisma 2026-06-24 14:41:38 +03:00
Abubeker Yasin
cae90919f2 fix: ( prisma ) remove duplicated passenger 2026-06-24 14:29:48 +03:00
Stephanos A
755b8b2939 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 14:18:33 +03:00
Stephanos A
86760933e8 IAM, package, luggage, app health, rate limit, and more 2026-06-24 14:02:51 +03:00
Abubeker Yasin
51c400bb6e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-24 14:01:00 +03:00
Abubeker Yasin
567ba29185 fix: ( migration ) 2026-06-24 14:00:01 +03:00
Roba Boru
3a99b182e0 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 13:53:32 +03:00
Roba Boru
350759ce25 Fix build errors 2026-06-24 13:49:27 +03:00
yaschalew
5eaab8164a Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 13:02:42 +03:00