Hagernesh Tadesse
f0eb96d2f9
Merge pull request #426 from Tria-plc/naming_convention
...
Naming convention no digit or symbol allowed
2026-07-03 17:45:18 +03:00
Hagernesh
44317a6bbc
Naming convention no digit or symbol allowed
2026-07-03 14:39:47 +00:00
yaschalew
47f87e8435
fix conflict
2026-07-03 17:31:29 +03:00
natib21
c2535bec5e
fix
2026-07-03 14:14:35 +00:00
natib21
e14e02e7f2
fix
2026-07-03 14:07:43 +00:00
Hagernesh
01bd01cc05
approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed
2026-07-03 14:06:34 +00:00
Hagernesh
bf5b0b5dc8
approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed
2026-07-03 14:03:02 +00:00
Marshal
57d3752ea5
fix issues
2026-07-03 13:53:17 +00:00
natib21
782f4184ef
fix
2026-07-03 13:49:55 +00:00
Hagernesh
e2867e3086
import loading backend
2026-07-03 13:47:45 +00:00
Marshal
e14df58a47
fix issues
2026-07-03 13:26:40 +00:00
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
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
Nathnael
515d59fb53
fix: file preview
2026-07-03 08:35:57 +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
Hagernesh
46971fd5c5
Export Djbouti unloading queue
2026-07-03 08:09:21 +00:00
Nathnael
3925a11dd4
feat: add invoice to customer detail on backoffice
2026-07-03 07:21:19 +00:00
Nathnael
1611c6be22
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-03 06:28:38 +00:00
Nathnael
1e408536aa
feat: add invoice pages and api to the backoffice
2026-07-03 06:21:25 +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
c71849c487
chnage the base url
2026-07-03 06:49:43 +03: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
4c6920d297
Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 22:08:17 +03:00
marshal
e2e72075c9
merge conflickt
2026-07-02 22:08:02 +03:00
Marshal
18c158fb61
changes
2026-07-02 19:06:22 +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
2b7e67b227
fix
2026-07-02 17:56:17 +03:00
natib21
eb5d8a7411
fix
2026-07-02 14:42:04 +00:00
natib21
2424e96e74
fix
2026-07-02 14:34:22 +00:00
natib21
e5fed081fc
fix
2026-07-02 14:27:09 +00:00
natib21
7d85f5dc2e
fix
2026-07-02 14:18:53 +00:00
natib21
c2c29f0735
fix
2026-07-02 14:14:13 +00:00
natib21
34b87bbcee
fix
2026-07-02 14:06:45 +00:00
natib21
d8f1ed8899
fix issue
2026-07-02 13:44:19 +00:00
Marshal
860af20e0d
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:29:10 +00:00
Marshal
fec2a5d320
update import gl flow
2026-07-02 13:27:59 +00:00
hagiye
5af45c2643
Customer Truck Assignment and Portal Delivary Approval
2026-07-02 15:54:16 +03:00
natib21
c8b7d76073
fix
2026-07-02 12:50:49 +00:00
natib21
43a32f192f
fix
2026-07-02 12:47:10 +00:00
natib21
58b3805d0b
fix
2026-07-02 12:43:03 +00:00
natib21
657f3bd2ab
fix
2026-07-02 12:39:47 +00:00
natib21
adde596289
fix
2026-07-02 11:32:16 +00:00
