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
yaschalew
83887471a4
fix
2026-07-03 17:25:33 +03:00
natib21
e881e8de84
fix
2026-07-03 14:21:46 +00:00
ghost2023
4a6e42ccd9
fix: logger
2026-07-03 17:21:26 +03: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
7eb62a0ba2
Merge pull request #423 from Tria-plc/freight_feature/usermanagement
...
fix issues
2026-07-03 16:55:26 +03:00
Marshal
57d3752ea5
fix issues
2026-07-03 13:53:17 +00:00
natib21
b53c088eff
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-03 13:50:18 +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
52f48b688d
fix issues
2026-07-03 13:40:10 +00:00
yaschalew
a63a16a0b7
fix
2026-07-03 16:36:08 +03:00
marshal
6570268d91
Merge pull request #422 from Tria-plc/freight_feature/usermanagement
...
fix issues
2026-07-03 16:28:49 +03:00
Marshal
e14df58a47
fix issues
2026-07-03 13:26:40 +00:00
Nathnael
f938107245
chore: add logger to mark-paid
2026-07-03 12:22:46 +00:00
Nathnael
64fa2862eb
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-03 12:19:45 +00:00
Nathnael
79731e58ec
feat: add otp to contract
2026-07-03 12:19:07 +00:00
Nathnael
414c9610dc
chore: migrate to otp table
2026-07-03 11:57:40 +00:00
Nathnael
37ec1c40ab
chore: add loger
2026-07-03 11:48:39 +00:00
Nathnael
4e6e614b48
feat: add email to notification and otp
2026-07-03 10:59:58 +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
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
