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
natib21
0e351fa0b4
sms
2026-06-24 10:02:16 +00:00
yaschalew
967969af65
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 12:36:52 +03:00
natib21
9c7300dcac
fix
2026-06-24 09:35:54 +00:00
yaschalew
86c4e37cc9
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 12:34:08 +03:00
natib21
8c3827c70b
fix
2026-06-24 09:33:37 +00:00
hagiye
8ee31789c6
merge conflict fix
2026-06-24 12:31:59 +03:00
Abubeker Yasin
56c73cd337
fix: ( seats ) remove IamModule reference from SeatsModule imports
2026-06-24 12:31:34 +03:00
yaschalew
b455d81ede
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 12:30:57 +03:00
yaschalew
833e55385d
fix
2026-06-24 12:30:43 +03:00
natib21
79860c807c
fix
2026-06-24 09:30:11 +00:00
Abubeker Yasin
e7bbc8112b
fix: ( schema ) restore optional Passenger.user
2026-06-24 12:25:42 +03:00
yaschalew
d4578f215b
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 12:18:02 +03:00
natib21
930fa9e9d9
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 09:17:40 +00:00
marshal
49ae46934a
fix(freight-api): call acceptBooking after payment completion
2026-06-24 12:16:03 +03:00
natib21
b1e0a403a6
fix
2026-06-24 09:02:09 +00: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
Nathnael
c9694177d8
style: ui improvement to kpi in portal
2026-06-24 08:55:09 +00: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
Roba Boru
9320e0e9ab
Update seatmap configuration
2026-06-24 11:50:44 +03:00
Abubeker Yasin
d78b5114ff
feat: ( d-money ) create d-money success page
2026-06-24 11:49:07 +03:00
natib21
97a5ee61d9
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 08:43:57 +00:00
Abubeker Yasin
1dfe4b9c37
refactor: ( iam ) add public decorator for public endpoins
2026-06-24 11:39:31 +03:00
natib21
4f6a925e80
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 08:34:32 +00:00
natib21
9fcbf2783a
booking id
2026-06-24 08:33:51 +00:00
yaschalew
f99e6b87db
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 11:21:44 +03:00
yaschalew
a1b72e591e
fix issue
2026-06-24 11:21:13 +03:00
Nathnael
9d5c195d94
style: improvment to the booking
2026-06-24 08:16:49 +00:00
natib21
7fed72ea7a
fix
2026-06-24 08:16:24 +00:00
marshal
bd7c97a8a8
fix(freight-web): switch API_BASE_URL from localhost to production
2026-06-24 11:15:45 +03:00
marshal
b1dfdeb4c5
fix(freight-web): comment out unused onBlur prop and UserCheck import
2026-06-24 11:09:45 +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
hagiye
0255adffe6
changes
2026-06-24 09:56:12 +03:00
natib21
f6ffea2b87
fix return value
2026-06-24 06:38:03 +00:00
Abubeker Yasin
b98534f3fd
Merge branch 'dev' into passenger/feat/iam
2026-06-24 09:33:24 +03:00
marshal
baf12fd38e
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 04:33:15 +03:00
Marshal
d7688fce21
feat(freight-web): polish document clearance, general contracts list and detail UIs
2026-06-24 01:32:40 +00:00
marshal
9bd9ff99d1
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 03:40:30 +03:00
Marshal
3655e50f2e
feat(bookings): refactor location handling for first/last mile and improve geocoding logic
2026-06-24 00:39:43 +00:00
Marshal
7ec06f2ff0
feat(bookings): enhance operation request flow and add location selection for first/last mile
2026-06-24 00:36:01 +00:00
Marshal
5be181aba8
feat(bookings): enhance operation request flow and add location selection for first/last mile
2026-06-24 00:35:37 +00:00
marshal
5d3aa1b66a
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 03:21:22 +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
marshal
44b46c99e7
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 02:49:34 +03:00
marshal
0379de8147
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 02:49:24 +03:00
