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
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
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
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
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
ee94833a9e
Merge pull request #265 from Tria-plc/freight_feature/profile
...
Freight feature/profile
2026-06-24 12:16:57 +03: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
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
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
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
70c30bd17b
Merge pull request #258 from Tria-plc/freight_feature/profile
...
Freight feature/profile
2026-06-24 11:04:01 +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
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
Marshal
07cd7dc111
feat: enhance booking operations to support freight forwarder variants and improve consolidation handling
2026-06-23 23:48:45 +00:00
Marshal
9d81a2e1ee
integrate global logistics staff user into seeder
...
refactor pricing data seeder to fold surcharge types into rates
update route meta subtitle to remove surcharge types
enhance RuleEngineFormDialog to support conditional field visibility
remove surcharge types from URL constants and related services
add cargo leaf options query for bulk cargo type selection
update RuleEngineResourcePage to utilize cargo leaf options
modify resources configuration to remove surcharge types
implement migration to fold surcharge types into rates
create utility to derive legacy rate types from new rate structure
2026-06-23 23:15:32 +00:00
