Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 19:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,095 Commits 96 Branches 0 Tags
01acd071cf3237a27d46721b7f12bdab929e1117
Commit Graph

597 Commits

Author SHA1 Message Date
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
ghost2023
4098b5476f fix(temp): invoice no for the telebirr 2026-07-02 15:37:49 +03:00
natib21
a0f4de05f8 log full error 2026-07-02 12:37:02 +00:00
Nathnael
787da1ccc0 chore: fix the invoice event 2026-07-02 12:35:43 +00:00
natib21
ff7e20d2ee fix 2026-07-02 11:22:35 +00:00
Nathnael
03740ee719 fix: types isses 2026-07-02 11:09:25 +00:00
Marshal
7d3eb39625 fix error 2026-07-02 10:40:31 +00:00
natib21
4519a1d75d fix 2026-07-02 10:33:32 +00:00
ghost2023
cdc2592bc7 fix: script fial 2026-07-02 13:30:09 +03:00
yaschalew
10e442deb1 fix 2026-07-02 13:18:49 +03:00
Marshal
adddb24033 add public to InternalPaymentController 2026-07-02 10:16:58 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
Nathnael Wondisha
e874de25fe Merge pull request #397 from Tria-plc/feight/fix/ui-ux-issues 
Feight/fix/UI ux issues
 2026-07-02 12:49:07 +03:00
Nathnael
41fc0cabdf fix: duplicate invoice 2026-07-02 09:44:56 +00:00