Stephanos A
3ed748234d
fix duplicate entry from schema.prisma
2026-06-24 14:41:38 +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
ee8cba0e6d
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 13:53:50 +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
Abubeker Yasin
1dd141f5d7
Merge pull request #268 from Tria-plc/alpha
...
fix: ( seats ) remove IamModule reference from SeatsModule imports
2026-06-24 12:32:08 +03:00
Abubeker Yasin
56c73cd337
fix: ( seats ) remove IamModule reference from SeatsModule imports
2026-06-24 12:31:34 +03:00
Abubeker Yasin
799e2f5e8d
Merge pull request #267 from Tria-plc/alpha
...
fix: ( schema ) restore optional Passenger.user
2026-06-24 12:26:38 +03:00
Abubeker Yasin
e7bbc8112b
fix: ( schema ) restore optional Passenger.user
2026-06-24 12:25:42 +03:00
Abubeker Yasin
2208454749
Merge pull request #266 from Tria-plc/alpha
...
fix: ( lock file ) missing @types/luxon entry)
2026-06-24 12:18:50 +03:00
Abubeker Yasin
a793950800
fix: ( lock file ) missing @types/luxon entry)
2026-06-24 12:17:59 +03:00
Eyob T.
22c6b3d9ae
Merge pull request #264 from Tria-plc/alpha
...
Update seatmap configuration
2026-06-24 12:07:09 +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
3496a041ac
Merge pull request #263 from Tria-plc/passenger/feat/iam
...
Passenger/feat/iam
2026-06-24 11:54:12 +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
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
Abubeker Yasin
1dfe4b9c37
refactor: ( iam ) add public decorator for public endpoins
2026-06-24 11:39:31 +03:00
yaschalew10
99078b7cf2
Merge pull request #261 from Tria-plc/freight/feature/vehicle_2
...
Freight/feature/vehicle 2
2026-06-24 11:23:15 +03: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
marshal
7c2ed993d1
Merge pull request #260 from Tria-plc/freight_feature/profile
...
fix(freight-web): switch API_BASE_URL from localhost to production
2026-06-24 11:18:09 +03: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
741e3e2e45
Merge pull request #259 from Tria-plc/freight_feature/profile
...
Freight feature/profile
2026-06-24 11:12:34 +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
yaschalew10
1ec72a879a
Merge pull request #256 from Tria-plc/freight/develop
...
fix hot fix
2026-06-24 10:44:42 +03:00
yaschalew
7d1474896e
fix hot fix
2026-06-24 10:43:25 +03:00
yaschalew10
0d19e090b1
Merge pull request #255 from Tria-plc/freight/develop
...
Freight/develop
2026-06-24 10:10:00 +03:00
yaschalew
5897dc342d
fix conflict
2026-06-24 10:08:19 +03:00
yaschalew10
ef6e4800da
Merge pull request #253 from Tria-plc/freight/feature/vehicle_2
...
Freight/feature/vehicle 2
2026-06-24 09:59:04 +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
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
