599 Commits

Author	SHA1	Message	Date
Nathnael	7044dcfb43	payment ui for booking	2026-06-16 09:20:31 +00:00
marshal	00d1263f6d	fix seed issue	2026-06-16 12:15:48 +03:00
Roba Boru	e9f06a52aa	Merge remove changes	2026-06-16 12:14:35 +03:00
Roba Boru	ed49470249	Update telebirr callback page query paramaters	2026-06-16 12:14:10 +03:00
Abubeker Yasin	d65ea24354	Merge pull request #168 from Tria-plc/feat/payment-microservice ... Feat/payment microservice	2026-06-16 12:09:13 +03:00
Abubeker Yasin	38175cbdb7	Update seed.ts	2026-06-16 12:07:38 +03: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
Roba Boru	db54a6870d	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-16 11:13:01 +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
Abubeker Yasin	06c7fea330	Merge branch 'feat/payment-microservice' into alpha	2026-06-16 11:02:41 +03:00
Nathnael	adba481f23	feat: setted up the schedule in the booking	2026-06-16 07:18:59 +00:00
Roba Boru	03c4ec33c3	Added get ticketing info by reference number endpoint and update payment methods to dynamic	2026-06-16 09:47:05 +03: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	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