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
|
e4805824ce
|
Merge pull request #162 from Tria-plc/feat/payment-microservice
Update payments.service.ts
|
2026-06-15 11:28:05 +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 |
|
Stephanos A
|
9ed3831c2a
|
Nationality mismatch issue resolution
|
2026-06-14 23:36:23 +03:00 |
|
Abubeker Yasin
|
3a9f0dd0a8
|
Merge pull request #157 from Tria-plc/feat/payment-microservice
Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
|
2026-06-14 21:55:15 +03:00 |
|
Abubeker Yasin
|
4ab987e8fe
|
Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
This reverts commit 3b961f17f5.
|
2026-06-14 21:44:36 +03:00 |
|
Roba Boru
|
4a0773e1a5
|
Revert payment page
|
2026-06-14 20:40:54 +03:00 |
|
Roba Boru
|
13e7fbbab0
|
Update home page and fix build error
|
2026-06-14 20:28:10 +03:00 |
|
Roba Boru
|
5219c7a79c
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-14 20:02:04 +03:00 |
|
Roba Boru
|
b5ed10beaa
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-14 20:01:29 +03:00 |
|
Abubeker Yasin
|
b7cc05a631
|
Merge pull request #155 from Tria-plc/feat/payment-microservice
refactor: ( rabbitmq ) temporary remove the rabbitmq
|
2026-06-14 18:48:53 +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 |
|
Eyob T.
|
39e32f4e0a
|
Merge pull request #154 from Tria-plc/alpha
Merge request for lock file and lint issues resolution
|
2026-06-14 15:36:39 +03:00 |
|
Stephanos A
|
9c7f42982f
|
Lockfile and lint issues resolution
|
2026-06-14 15:29:37 +03:00 |
|
Eyob T.
|
d6247e0e2b
|
Merge pull request #148 from Tria-plc/feat/payment-microservice
refactor: ( payment ) use rabbitmq for webhooks event
|
2026-06-14 15:24:25 +03:00 |
|
Roba Boru
|
a9f8f0c43c
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-14 11:08:07 +03:00 |
|
Roba Boru
|
faf0eeb3b6
|
Update get payment methods from static to api
|
2026-06-14 11:07:29 +03:00 |
|
Stephanos A
|
f8701eacfb
|
Merge branch 'dev' into alpha
|
2026-06-14 10:47:51 +03:00 |
|
Stephanos A
|
c475c7e89f
|
Cleaned tailwind.config.js files
|
2026-06-14 10:38:13 +03:00 |
|
Stephanos A
|
1cd0a55305
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-14 10:31:27 +03:00 |
|
Stephanos A
|
20d483ed00
|
Backoffice portal updates: dashboard, seat management, pricing, audit logging, reporting
|
2026-06-14 10:26:22 +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 |
|
Marshal
|
b73bf2154e
|
add detail batch and allocation monitoring page
|
2026-06-13 18:28:39 +00:00 |
|
Abubeker Yasin
|
2b90e793c3
|
Merge branch 'dev' into feat/payment-microservice
|
2026-06-13 20:45:04 +03:00 |
|
Abubeker Yasin
|
c35b5089ce
|
refactor: ( payment ) use rabbitmq for webhooks event
|
2026-06-13 20:19:23 +03:00 |
|
yaschalew
|
b417ed2fc8
|
fix conflict
|
2026-06-13 14:37:13 +03:00 |
|
yaschalew
|
eee7b719b0
|
user management
|
2026-06-13 14:32:26 +03:00 |
|
Marshal
|
e3cd369b01
|
ui fix
|
2026-06-13 08:51:57 +00:00 |
|
Marshal
|
b2f13c95c5
|
update window range
|
2026-06-13 07:59:48 +00:00 |
|
Abubeker Yasin
|
962ef17803
|
Merge pull request #146 from Tria-plc/feat/payment-microservice
Update payment-client.service.ts
|
2026-06-13 10:49:10 +03:00 |
|
Abubeker Yasin
|
eb94d58a4e
|
Update payment-client.service.ts
|
2026-06-13 10:48:19 +03:00 |
|
yaschalew
|
12b6406d23
|
fix conflict
|
2026-06-13 10:45:26 +03:00 |
|
Eyob T.
|
282b555fae
|
Merge pull request #145 from Tria-plc/feat/payment-microservice
Feat/payment microservice
|
2026-06-13 10:32:08 +03:00 |
|
SennayT
|
377492c2ae
|
add new malware detection script
|
2026-06-13 10:16:25 +03:00 |
|
Abubeker Yasin
|
0b12d9552c
|
Merge branch 'dev' into feat/payment-microservice
|
2026-06-13 10:03:55 +03:00 |
|
Abubeker Yasin
|
d2f1afebda
|
chore: ( malware) remove malicious code
|
2026-06-13 09:47:42 +03:00 |
|
Abubeker Yasin
|
e558912ab7
|
chore: ( payment ) add log
|
2026-06-13 09:42:43 +03:00 |
|