Commit Graph

136 Commits

Author SHA1 Message Date
Abubeker Yasin
0ca94fc4a0 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-24 14:23:32 +03:00
Abubeker Yasin
dd966df5e9 fix ( lock file and seed ) 2026-06-24 14:23:08 +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
Roba Boru
350759ce25 Fix build errors 2026-06-24 13:49:27 +03:00
Roba Boru
4c9c5f7e2f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:56:30 +03:00
Roba Boru
4ac72c3271 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:55:18 +03:00
Abubeker Yasin
c79e63231c Merge branch 'dev' into passenger/feat/iam 2026-06-24 11:53:33 +03:00
Roba Boru
bdcadeca81 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:53:32 +03:00
marshal
fd4cc8f080 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 10:58:57 +03:00
yaschalew
5897dc342d fix conflict 2026-06-24 10:08:19 +03:00
yaschalew
f851948634 fix conflict 2026-06-24 09:41:52 +03:00
yaschalew
ef6cefbb3c fix lock file 2026-06-24 09:39:33 +03:00
Abubeker Yasin
b98534f3fd Merge branch 'dev' into passenger/feat/iam 2026-06-24 09:33:24 +03:00
Marshal
8ef7641048 feat(bookings): add contract validity window and customs clearing features
- Introduced contract validity days, valid from and valid until fields in the booking model.
- Updated booking acceptance logic to enforce validity window constraints.
- Added customs clearing agent and first/last mile pickup/delivery coordinates to the booking model.
- Implemented LocationPicker component for address selection with map integration using Leaflet.
- Enhanced booking review step to display customs clearing agent details.
- Updated API and DTOs to accommodate new booking fields.
- Added migration scripts for database schema changes.
- Implemented tests for booking acceptance and DTO transformations.
2026-06-24 00:21:01 +00:00
SennayT
94585a36d9 fix tria package on edr freight frontends 2026-06-23 11:34:52 +03:00
SennayT
b2767a1cbf fix package issue for freight api 2026-06-23 11:22:41 +03:00
Abubeker Yasin
707e32c43c feat: ( iam ) update the iam package 2026-06-23 09:43:12 +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
b031ddb204 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-22 11:43:38 +00:00
yaschalew
7f51f24a77 fix conflict 2026-06-22 14:23:43 +03:00
Dagimassefa
b3bfa899f5 update 2026-06-22 12:29:48 +03:00
Muluhabt
41c51b7986 Adding local packages 2026-06-22 11:53:17 +03:00
Abubeker Yasin
177e1cea8d Merge branch 'dev' into passenger/feat/iam 2026-06-22 10:12:39 +03:00
Marshal
dc708a2473 Refactor phone input handling across onboarding and settings forms
- Replaced PhoneInput component with ControlledPhoneField for better integration with react-hook-form.
- Updated validation for phone numbers using isValidPhone function to ensure proper formatting.
- Removed country code handling from forms, simplifying phone number management.
- Introduced new phone field component with consistent styling and behavior.
- Added phone number validation on the backend using class-validator.
- Removed unused phone utility functions and cleaned up related code.
2026-06-21 10:34:40 +00:00
Dagimassefa
8111606e89 switch user management to package implmentation 2026-06-21 12:11:35 +03:00
natib21
b47fb2c475 fix data table 2026-06-20 09:54:05 +00:00
natib21
8d69630f01 vehicle 2026-06-19 11:42:27 +00:00
Abubeker Yasin
fcbc59e95b refactor: ( notifications ) remove dead SendGrid/Twilio adapters and legacy code 2026-06-19 11:41:31 +03:00
marshal
e815b4d976 Refactor API base URL configuration to use centralized constant across applications 2026-06-16 23:06:46 +03:00
marshal
82954b1ec1 Merge pull request #182 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 17:31:28 +03:00
marshal
10364fe924 ass signature on the profile 2026-06-16 17:30:22 +03:00
Nathnael Wondisha
b82e4ac46e Merge branch 'dev' into freight/develop 2026-06-16 16:22:38 +03:00
Stephanos A
a61130cd51 Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.1.24 and its dependencies 2026-06-16 14:56:35 +03:00
marshal
3ca564f073 simplify build script and add tinymce dependency 2026-06-16 14:26:47 +03:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
marshal
484151d909 payments 2026-06-14 15:59:52 +03:00
Eyob T.
39e32f4e0a Merge pull request #154 from Tria-plc/alpha
Merge request for lock file and lint issues resolution
2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f Lockfile and lint issues resolution 2026-06-14 15:29:37 +03:00
marshal
c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:38:19 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
yaschalew
eee7b719b0 user management 2026-06-13 14:32:26 +03:00
yaschalew
12b6406d23 fix conflict 2026-06-13 10:45:26 +03:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration
UI migration Again
2026-06-12 15:24:46 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Abubeker Yasin
2b430f8e76 feat: ( payment ) create payment microservice 2026-06-11 15:25:24 +03:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00