2675 Commits

Author	SHA1	Message	Date
ghost2023	bc5e6f900c	feat(WIP): booking payment integration	2026-06-06 12:07:18 +03:00
ghost2023	e152e7e986	fix: the request approaval pricing ui	2026-06-06 11:45:53 +03:00
ghost2023	c76c6dbf90	feat(bookings): Revamp Edit Booking page to a single-form experience with enhanced details	2026-06-06 11:45:53 +03:00
ghost2023	efdcb9a7c8	fix: signup am	2026-06-06 11:45:53 +03:00
ghost2023	5898634cd7	refactor(settings): decompose monolithic SettingsPage into modular tab components	2026-06-06 11:45:53 +03:00
ghost2023	ea040a40cf	fix: wrong url	2026-06-06 11:45:53 +03:00
ghost2023	af6804eb91	feat(bookings): implement booking editing functionality	2026-06-06 11:45:53 +03:00
ghost2023	4994e19d57	signup update	2026-06-06 11:45:53 +03:00
Eyosiyas Girma	e067da29df	Merge pull request #108 from Tria-plc/freight/feature/payment ... providers	2026-06-06 11:45:19 +03:00
Eyosiyas	b5f64bc9ad	providers	2026-06-06 11:32:14 +03:00
Abubeker Yasin	b509fccf93	Merge branch 'alpha' into passenger/feat/iam-integration	2026-06-06 11:17:53 +03:00
Michael Abebe	e731051320	fix(freight): fixed some issues	2026-06-06 11:12:59 +03:00
marshal	b62ea3f95f	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine	2026-06-06 10:45:34 +03:00
Michael Abebe	a39366867a	fix(freight): iam module import fix	2026-06-06 10:43:33 +03:00
Michael Abebe	4ae83896d3	dep(freight): iam module upgrade	2026-06-06 10:43:17 +03:00
Abubeker Yasin	254d2a171c	refactor( iam ): remove local auth service delegate OTP and password reset to IAM	2026-06-06 10:23:53 +03:00
marshal	3e3841cf6f	changes	2026-06-06 10:08:55 +03:00
marshal	0794a77678	changes	2026-06-06 10:01:40 +03:00
SennayT	5a4f5969d4	fix port mapping	2026-06-06 09:56:57 +03:00
Michael Abebe	c8768ba70b	Merge remote-tracking branch 'origin/freight/develop' into freight/develop	2026-06-06 09:45:10 +03:00
Michael Abebe	c31d87fc35	dep(freight): updated iam imports	2026-06-06 09:45:00 +03:00
Marshal	053b4f35c5	changes	2026-06-06 06:32:04 +00:00
ghost2023	da0f1e4cc9	feat(bookings): enhance contract viewer and backoffice UI consistency	2026-06-06 09:11:30 +03:00
ghost2023	7a19a161e1	fix: redirects	2026-06-06 09:11:30 +03:00
ghost2023	f356c00ba2	fix: booking api url s	2026-06-06 09:11:30 +03:00
Abubeker Yasin	023522c3fb	refactor( iam ): migrate session, logout, and guards to IAM	2026-06-06 08:58:42 +03:00
Abubeker Yasin	d06debf1ca	feat( iam ): integrate IAM for auth — register, login, lazy provisioning	2026-06-06 08:29:26 +03:00
Eyosiyas Girma	10f3c517f3	Merge branch 'freight/develop' into freight/feature/payment	2026-06-06 08:17:17 +03:00
Tria	828f93d160	minor update	2026-06-06 08:13:38 +03:00
hagiye	788de5381e	feat: complete train scheduling integration	2026-06-06 05:52:47 +03:00
Abubeker Yasin	1d11cbda4d	feat: ( payment ) create payment microservice	2026-06-05 21:29:55 +03:00
hagiye	55e6ca4a3f	Merge branch 'freight/develop' of https://github.com/Tria-plc/edr-platform into feature/trains-management	2026-06-05 21:07:36 +03:00
hagiye	dc42838a43	Trains management CRUD issues solved	2026-06-05 21:07:04 +03:00
Marshal	f8270175a2	fix the seed for rules	2026-06-05 17:25:44 +00:00
Marshal	67037ba748	fix the seed for rules	2026-06-05 17:25:16 +00:00
Tria	ebe59f491a	payment | webhook	2026-06-05 17:34:33 +03:00
Tria	6786bdd210	receipt template	2026-06-05 17:23:21 +03:00
Tria	620607e50c	add fan number	2026-06-05 15:59:12 +03:00
Tria	21bc6948e8	receipt	2026-06-05 15:56:29 +03:00
Nathnael Wondisha	4a0dee9b7b	Merge pull request #97 from Tria-plc/freight/feat/booking-pricing ... Booking request approval ui	2026-06-05 15:02:24 +03:00
SennayT	b6136b0a65	modify nextjs deployment	2026-06-05 11:28:33 +00:00
hagiye	9676a6bb56	resolve conflict	2026-06-05 14:17:48 +03:00
hagiye	c3e92dbe70	resolve conflict	2026-06-05 14:13:35 +03:00
marshal	35c9bdfce4	resolve confilict	2026-06-05 14:07:26 +03:00
Abubeker Yasin	04765bdd78	fix: ( migration ) Create migration.sql	2026-06-05 14:01:56 +03:00
marshal	d59c192137	resolve confilict	2026-06-05 13:06:16 +03:00
Eyosiyas Girma	03a997fad2	Merge branch 'freight/develop' into freight/feature/payment	2026-06-05 13:01:42 +03:00
Tria	02018c339d	payment	2026-06-05 12:57:44 +03:00
Tria	c0dc9f5fc5	payment	2026-06-05 12:54:35 +03:00
ghost2023	2760e715c7	feat: add more statuses to the booking deailt page and added handling of request approval	2026-06-05 11:40:44 +03:00