Commit Graph

538 Commits

Author SHA1 Message Date
Nathnael Wondisha
ab3583d9ee Merge pull request #178 from Tria-plc/freight/fix/fixes
Freight/fix/fixes
2026-06-16 16:19:14 +03:00
Nathnael
edc63379bc fix: type error 2026-06-16 13:16:42 +00:00
Nathnael
9afa23cc47 feat: add dashboard summary endpoint and related DTOs for company KPIs 2026-06-16 13:11:56 +00:00
Nathnael
16f16e7d7e fix: booking payment 2026-06-16 13:11:56 +00:00
ghost2023
1d4edfc98c fix: type error to booking and edit booking 2026-06-16 16:11:07 +03:00
ghost2023
17dfce0d18 fixes 2026-06-16 15:45:58 +03:00
ghost2023
cf3db76bb1 type fixes 2026-06-16 15:13:11 +03:00
ghost2023
e0e6020020 fixes 2026-06-16 14:54:07 +03:00
Nathnael Wondisha
c0b6869232 Merge pull request #172 from Tria-plc/freight/fix/fixes
freight/fix/fixes
2026-06-16 14:28:24 +03:00
ghost2023
e47340c2c8 fixes 2026-06-16 14:27:17 +03:00
ghost2023
d6ad094d5a style: use mantine in settings page 2026-06-16 14:19:52 +03:00
ghost2023
b883c2d878 feat(onboarding): Implement company profile creation on Settings page 2026-06-16 14:10:31 +03:00
marshal
23272f972a Merge pull request #171 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 13:34:18 +03:00
Marshal
3afccbd660 fix priority ui 2026-06-16 10:24:22 +00:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Marshal
0778021d86 implement priority 2026-06-16 09:26:57 +00:00
Nathnael
7044dcfb43 payment ui for booking 2026-06-16 09:20:31 +00:00
Marshal
7151bce288 changes 2026-06-16 08:56:52 +00:00
Nathnael
570c5ee125 feat: setted up the renewal contract 2026-06-16 08:51:23 +00:00
Nathnael
05da2ce27a feat: ui status updates 2026-06-16 08:29:40 +00:00
yaschalew10
0cac604510 Merge pull request #167 from Tria-plc/freight_feature/payments
Freight feature/payments
2026-06-16 11:13:03 +03:00
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +03:00
marshal
a0dbb4ca6f backoffice cleen up 2026-06-16 11:04:36 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
yaschalew10
ba4ebee59d Merge pull request #165 from Tria-plc/freight/feature/user_management
Freight/feature/user management
2026-06-16 09:20:08 +03:00
natib21
a1244609ce auth 2026-06-16 06:17:36 +00:00
natib21
d55cc78bd9 auth 2026-06-16 06:14:44 +00:00
Abubeker Yasin
ca9a67837c feat: ( payment ) implement d-money payment 2026-06-16 08:49:41 +03:00
marshal
1f0a642c03 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-15 16:16:33 +03:00
Marshal
87c6e12fbd fix allocate bookigns 2026-06-15 13:15:22 +00:00
marshal
9ee8262df8 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-15 15:02:25 +03:00
Marshal
28ad9363d1 tracking ui 2026-06-15 12:01:44 +00:00
marshal
0aed9824ae cac payemnt integration and cbe rate exchange webscrabing 2026-06-15 14:54:20 +03:00
Eyob T.
20d6b1b6d8 Security patch 2026-06-15 14:11:39 +03:00
Abubeker Yasin
73eeee175f Update payments.service.ts 2026-06-15 11:26:51 +03:00
marshal
fe1bed8c4b payment integration 2026-06-15 11:09:58 +03:00
ghost2023
d1347892db feat(bookings): Implement unified hierarchical bulk cargo type selection via cargoTypePath 2026-06-15 09:57:00 +03:00
ghost2023
3e2e07bb5f feat(bookings): Implement data-driven service type selection and configuration 2026-06-15 09:57:00 +03:00
ghost2023
44aef8c1b3 feat: add more fields to the reference service array 2026-06-15 09:56:59 +03:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
ghost2023
407cf3ed1f fixes 2026-06-15 09:52:17 +03:00
ghost2023
6058b870a1 feat(train-scheduling): implement API and types for bookable schedules 2026-06-15 09:52:17 +03:00
ghost2023
28f9d58e0a style: fix 2026-06-15 09:52:16 +03:00
ghost2023
e075252639 fix: the direction for the yard 2026-06-15 09:52:16 +03:00
Abubeker Yasin
4ab987e8fe Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
This reverts commit 3b961f17f5.
2026-06-14 21:44:36 +03:00
Abubeker Yasin
3b961f17f5 refactor: ( rabbitmq ) temporary remove the rabbitmq 2026-06-14 18:47:41 +03:00
marshal
484151d909 payments 2026-06-14 15:59:52 +03:00
marshal
c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:38:19 +03:00
marshal
52c0639c8f Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:27:56 +03:00
marshal
87b0ce6339 Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI 2026-06-14 02:13:08 +03:00