Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 23:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,102 Commits 96 Branches 0 Tags
33ca30461ed86ab0796b4871ff601c40fbb429ff
Commit Graph

828 Commits

Author SHA1 Message Date
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
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
0bf81490fe Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:49:18 +03:00
Marshal
488a135054 changes 2026-07-02 18:49:00 +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
Nathnael Wondisha
9d14414bf1 Merge pull request #410 from Tria-plc/freight/feat/fixes-v1 
fix: merge marker in invoice detial page
 2026-07-02 17:14:40 +03:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
Nathnael
635d674bbe fix: merge marker in invoice detial page 2026-07-02 14:11:34 +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
71894ae2d3 merge conflict 2026-07-02 13:43:07 +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
natib21
ff7e20d2ee fix 2026-07-02 11:22:35 +00:00
Nathnael
03740ee719 fix: types isses 2026-07-02 11:09:25 +00:00
natib21
bab329e8e5 fix 2026-07-02 10:57:35 +00:00
natib21
e59a8f9802 fix delete api 2026-07-02 10:54:43 +00:00
natib21
f4f98575f1 fix error 2026-07-02 10:48:31 +00:00
ghost2023
79490d5979 fix 2026-07-02 13:44:20 +03:00
natib21
4519a1d75d fix 2026-07-02 10:33:32 +00:00
natib21
1c88bd8d68 fix 2026-07-02 10:27:01 +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
natib21
e0010695be fix 2026-07-02 09:41:52 +00:00
hagiye
ad9f9de7a8 Truck Assign by customer plus Handover signature on portal 2026-07-02 12:32:18 +03:00
marshal
56bb75c9a8 fix transi permit file upload 2026-07-02 12:22:07 +03:00
Nathnael
602453ff7a fix: invoice based payment on the client 2026-07-02 09:22:07 +00:00
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +03:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +03:00