706 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	8520c3add3	fix: ( payment ) remove /100	2026-06-16 11:02:07 +03:00
Abubeker Yasin	e5877e5339	fix: ( telebirr ) fix query status	2026-06-16 10:52:36 +03: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
Abubeker Yasin	96ec2923c2	fix: ( telebirr ) redirect_url	2026-06-15 14:35:14 +03:00
Abubeker Yasin	73eeee175f	Update payments.service.ts	2026-06-15 11:26:51 +03:00
marshal	e3c66bfa5e	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments	2026-06-15 11:14:48 +03:00
marshal	fe1bed8c4b	payment integration	2026-06-15 11:09:58 +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	614b4ab16b	Merge pull request #151 from Tria-plc/freight_feature/payments ... Freight feature/payments	2026-06-14 02:35:55 +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	91f5c7fe40	Merge pull request #147 from Tria-plc/freight/feature/user_management ... Freight/feature/user management	2026-06-14 02:25:31 +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
Yonas Tewabe	a1f493d12c	Update docker-compose.yaml	2026-06-13 12:05:29 +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	b6ece3dd6f	Add scan report	2026-06-13 10:27:37 +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
marshal	2d70f892a4	Merge pull request #144 from Tria-plc/freight_feature/schedule ... backoffice ui fix	2026-06-13 09:39:17 +03:00
SennayT	cccb06b32d	remove critical severity code	2026-06-13 09:15:08 +03:00
Sennay	4b7a5990d7	Update .gitignore to remove malicious entries ... Remove temporary files from .gitignore	2026-06-13 09:13:39 +03:00
Marshal	d3a479c142	ui fix	2026-06-12 14:21:07 +00:00
Marshal	6b79348074	ui fix	2026-06-12 12:59:01 +00:00
Marshal	db39e77e90	fix batch page ui	2026-06-12 12:46:51 +00:00
yaschalew10	9076664545	Merge pull request #142 from Tria-plc/freight/feat/ui-migration ... UI migration Again	2026-06-12 15:24:46 +03:00
marshal	da387fd310	fix merge conflict	2026-06-12 14:58:39 +03:00
marshal	c2f44198d6	Merge pull request #141 from Tria-plc/freight_feature/schedule ... auto allocation and batch managemnt, tracking the train	2026-06-12 14:46:47 +03:00
marshal	1288a18bbf	fix merge conflict	2026-06-12 14:44:52 +03:00
Yonas Tewabe	5c535f8f8a	Update Dockerfile	2026-06-12 04:29:32 -07:00