1564 Commits

Author	SHA1	Message	Date
Marshal	18c158fb61	changes	2026-07-02 19:06:22 +00:00
Marshal	488a135054	changes	2026-07-02 18:49:00 +00:00
Marshal	8d056c5014	finalize gl flow for import	2026-07-02 18:15:16 +00:00
Marshal	dd47068a4b	finilize gl flow for export	2026-07-02 17:55:59 +00:00
Marshal	f77e4d150b	Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2	2026-07-02 13:44:50 +00:00
Nathnael Wondisha	17f2ef9c85	Merge pull request #406 from Tria-plc/freight/feat/fixes-v1 ... Freight/feat/fixes v1	2026-07-02 16:44:43 +03:00
ghost2023	2c5e553d7c	Merge branch 'dev' into freight/feat/fixes-v1	2026-07-02 16:43:16 +03:00
Marshal	71894ae2d3	merge conflict	2026-07-02 13:43:07 +00:00
Abubeker Yasin	8e19089e89	Merge pull request #407 from Tria-plc/passenger/feat/iam ... feat: ( iam ) add portal auth registration, forgot/change password, …	2026-07-02 16:39:13 +03:00
Abubeker Yasin	60e0c26943	feat: ( iam ) add portal auth registration, forgot/change password, Fayda setup	2026-07-02 16:35:54 +03:00
ghost2023	df60c4750e	fix: warehouse query	2026-07-02 16:32:35 +03: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
ghost2023	b75a3ab54b	fix: first-mile error	2026-07-02 16:25:45 +03:00
Marshal	fe40d9f4be	update import gl flow	2026-07-02 13:24:39 +00:00
ghost2023	79c3293a72	fix: booking paid trigger	2026-07-02 16:18:46 +03:00
Roba Boru	83eafacee1	Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-02 16:08:20 +03:00
Roba Boru	93f2d12d3c	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-02 16:07:46 +03:00
Roba Boru	f2ee62b95f	Refine booking flow	2026-07-02 16:03:57 +03:00
hagiye	5af45c2643	Customer Truck Assignment and Portal Delivary Approval	2026-07-02 15:54:16 +03:00
ghost2023	4098b5476f	fix(temp): invoice no for the telebirr	2026-07-02 15:37:49 +03:00
Nathnael	787da1ccc0	chore: fix the invoice event	2026-07-02 12:35:43 +00:00
Nathnael	03740ee719	fix: types isses	2026-07-02 11:09:25 +00:00
ghost2023	79490d5979	fix	2026-07-02 13:44:20 +03:00
Marshal	7d3eb39625	fix error	2026-07-02 10:40:31 +00:00
ghost2023	cdc2592bc7	fix: script fial	2026-07-02 13:30:09 +03:00
Marshal	adddb24033	add public to InternalPaymentController	2026-07-02 10:16:58 +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
Nathnael	41fc0cabdf	fix: duplicate invoice	2026-07-02 09:44:56 +00:00
Nathnael	5aafa436c1	fixes	2026-07-02 09:38:14 +00:00
hagiye	ad9f9de7a8	Truck Assign by customer plus Handover signature on portal	2026-07-02 12:32:18 +03:00
Nathnael	63937db32b	fix: update the updateStatus iss	2026-07-02 09:22:25 +00: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
ghost2023	1c012ce1e2	refactor(payment): centralize invoice processing with detailed tracking and configurable logging	2026-07-02 11:47:35 +03:00
yaschalew	db8ead322c	Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix	2026-07-02 11:29:27 +03:00
yaschalew	54b2114e7f	fix issue	2026-07-02 11:28:56 +03:00
Abubeker Yasin	d6938df66c	feat: ( iam ) add forgot and change password to passenger backoffice	2026-07-02 10:27:08 +03:00
Abubeker Yasin	448e64da02	feat: ( iam ) add Station Master and Ticket Officer roles with positions	2026-07-02 09:38:30 +03:00
yaschalew	8b8a993953	fix conflict	2026-07-02 09:28:02 +03:00
hagiye	129448e437	frist mile receive to warehouse and last mile truck arrival integration	2026-07-02 01:08:37 +03:00
marshal	9c18d086d7	changes	2026-07-01 20:55:17 +03:00
Roba Boru	305e850073	Added tour package booking option	2026-07-01 20:45:40 +03:00
Roba Boru	5bfcde0c40	Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-01 19:26:49 +03:00
hagiye	14a00af341	train gate pass, Telebirr and Wafi	2026-07-01 16:23:52 +03:00
Nathnael Wondisha	0d41d4bd20	Merge pull request #393 from Tria-plc/freight/feat/invoice ... Freight/feat/invoice integration enhancement expiry,payment and booking	2026-07-01 16:18:09 +03:00
ghost2023	2f79178496	fix: booking invoice issue	2026-07-01 16:11:47 +03:00