marshal
07e524eea4
user managemnt and wight limit rule
2026-07-03 13:56:34 +03:00
marshal
02ee4cc743
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-07-03 13:54:29 +03:00
natib21
48db0b240b
fix fayda
2026-07-03 09:32:41 +00:00
Marshal
35cb20da0b
feat: implement 20ft container weight-pairing validation
...
- Added ContainerValidationService to handle 20ft weight-pairing logic.
- Introduced validate20ftWeightPairing utility function to check weight differences.
- Updated BookingPricingService to include overweight line details and pairing errors in price response.
- Enhanced BookingTransitionService to reject submissions with unpairable 20ft containers.
- Created ShipmentValidation interface for pre-submit validation of container contracts.
- Integrated shipment validation into the contract booking process, providing warnings for overweight containers and hard blocks for pairing errors.
- Updated front-end components to display validation results and prevent submission when errors are present.
2026-07-03 09:26:27 +00:00
natib21
b218179d72
:wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-03 09:10:31 +00:00
natib21
e4b0c73c63
fix fayda
2026-07-03 09:10:05 +00:00
marshal
4d17787dbd
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-07-03 11:28:55 +03:00
Marshal
d832e83b4a
update
2026-07-03 08:13:51 +00:00
Nathnael
43f7a039ad
fix: payment api crash
2026-07-03 07:20:31 +00:00
Nathnael
1611c6be22
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-03 06:28:38 +00:00
Nathnael
53fed882be
feat: setup pagination to find all invoice api
2026-07-03 06:20:05 +00:00
Marshal
75cda22a48
Implement consolidated booking handling and UI updates for shared wagons
2026-07-03 05:07:23 +00:00
Marshal
bb2cedc87f
Add allocation management features and update permissions for container allocation
2026-07-03 04:15:16 +00:00
marshal
01acd071cf
Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-03 06:39:02 +03:00
Marshal
56de90892d
Add booking window management and locomotive scheduling features
...
- Implemented migration to release stuck assigned locomotives.
- Added schedule window phases to train schedules.
- Created booking batch offers table for partial capacity bookings.
- Developed BookingSplitService to handle partial booking offers and splits.
- Introduced BookingWindowService to manage booking window lifecycle and transitions.
- Added BookingBatchOffer entity to represent offers made during booking splits.
- Enhanced locomotive options with warnings for scheduling.
- Created UpcomingWindowsSection component to display upcoming booking windows.
2026-07-03 03:36:06 +00:00
marshal
fc5d49f34c
Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 21:15:45 +03:00
Marshal
8d056c5014
finalize gl flow for import
2026-07-02 18:15:16 +00:00
marshal
d4561b948a
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 21:02:22 +03:00
Marshal
dd47068a4b
finilize gl flow for export
2026-07-02 17:55:59 +00:00
yaschalew
49036abf7f
fix
2026-07-02 18:07:21 +03:00
yaschalew
26e2974d87
fix
2026-07-02 18:02:23 +03:00
yaschalew
2b7e67b227
fix
2026-07-02 17:56:17 +03:00
yaschalew
8f24544f78
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:42:21 +03:00
natib21
eb5d8a7411
fix
2026-07-02 14:42:04 +00:00
yaschalew
71e1ab98f4
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:37:54 +03:00
natib21
b7da024968
fix
2026-07-02 14:37:38 +00:00
yaschalew
9198fcd3e7
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:34:40 +03:00
natib21
2424e96e74
fix
2026-07-02 14:34:22 +00:00
yaschalew
60eba409ae
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:27:25 +03:00
natib21
e5fed081fc
fix
2026-07-02 14:27:09 +00:00
yaschalew
86090d5c37
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:19:09 +03:00
natib21
7d85f5dc2e
fix
2026-07-02 14:18:53 +00:00
yaschalew
8f152466e8
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:14:31 +03:00
natib21
c2c29f0735
fix
2026-07-02 14:14:13 +00:00
yaschalew
86b1534ed4
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 16:56:04 +03:00
yaschalew
fb8dcb0217
fix
2026-07-02 16:55:51 +03:00
natib21
7f6c9c6313
fix
2026-07-02 13:55:08 +00:00
Marshal
f77e4d150b
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:44:50 +00:00
ghost2023
2c5e553d7c
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-02 16:43:16 +03:00
Marshal
71894ae2d3
merge conflict
2026-07-02 13:43:07 +00:00
ghost2023
df60c4750e
fix: warehouse query
2026-07-02 16:32:35 +03:00
Marshal
860af20e0d
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:29:10 +00:00
ghost2023
b75a3ab54b
fix: first-mile error
2026-07-02 16:25:45 +03:00
Marshal
fe40d9f4be
update import gl flow
2026-07-02 13:24:39 +00:00
ghost2023
79c3293a72
fix: booking paid trigger
2026-07-02 16:18:46 +03:00
natib21
1869790eab
fix
2026-07-02 13:18:34 +00:00
natib21
e429a2cebf
fix
2026-07-02 13:15:44 +00:00
natib21
64e346324b
fix issue
2026-07-02 13:11:12 +00:00
hagiye
5af45c2643
Customer Truck Assignment and Portal Delivary Approval
2026-07-02 15:54:16 +03:00
natib21
58b3805d0b
fix
2026-07-02 12:43:03 +00:00
