1846 Commits

Author	SHA1	Message	Date
hagiye	3d1f972e52	Merge freight/develop into wagon-types	2026-06-08 09:34:02 +03:00
hagiye	b78796d76b	mantine added to Train, wagon, containers and cargoes	2026-06-08 09:29:34 +03:00
Abubeker Yasin	ac153fb0d0	chore( iam ): remove dead auth DTOs and @nestjs/jwt; migrate fayda/passenger to iamUserId	2026-06-08 09:02:54 +03:00
Nathnael Wondisha	95fb544ec2	Merge pull request #116 from Tria-plc/freight/feat/payment ... freight/feat/payment	2026-06-08 08:52:39 +03:00
ghost2023	df725015a1	fix(api): improve payment status API handling and frontend user experience	2026-06-08 08:51:54 +03:00
hagiye	bffa5020ac	wagon types added UI with API integrations	2026-06-07 21:56:33 +03:00
Stephanos A.	67319a467e	Merge pull request #115 from Tria-plc/alpha ... Update Prisma migration script to use deploy command	2026-06-07 19:43:50 +03:00
Stephanos A	193485d911	Update Prisma migration script to use deploy command	2026-06-07 19:43:02 +03:00
Stephanos A.	cfff533066	Merge pull request #114 from Tria-plc/alpha ... Fix Prisma schema path in package.json	2026-06-07 19:26:46 +03:00
Stephanos A	e3fb81317e	Fix Prisma schema path in package.json	2026-06-07 19:24:46 +03:00
Stephanos A.	0666fd06cf	Merge pull request #113 from Tria-plc/alpha ... Add Prisma schema configuration to package.json	2026-06-07 19:11:09 +03:00
Stephanos A	09317a3d56	Add Prisma schema configuration to package.json	2026-06-07 19:10:00 +03:00
Stephanos A.	12fabc3fa1	Merge pull request #112 from Tria-plc/alpha ... Update PORT configuration in .env.example from 3002 to 4000	2026-06-07 18:58:15 +03:00
Stephanos A	75b7ec1baf	Update PORT configuration in .env.example from 3002 to 4000	2026-06-07 18:57:34 +03:00
Stephanos A.	f3400b36f2	Merge pull request #111 from Tria-plc/alpha ... Coaches, seats, schedules, and pricing related updates	2026-06-07 17:53:19 +03:00
Stephanos A	bb10e7fdf2	Coaches, seats, schedules, and pricing related updates	2026-06-07 17:41:31 +03:00
marshal	4993453993	generate contract by the system, add waggon type,fix ui	2026-06-07 01:20:52 +03:00
marshal	3fa1f54e3a	fix ui	2026-06-07 00:32:07 +03:00
Marshal	08b46c306f	ui improvemnt	2026-06-06 21:17:20 +00:00
Michael Abebe	b45421d2a2	feat(freight): changed the train schedule	2026-06-06 16:31:19 +03:00
Michael Abebe	a9c2f2eb97	feat(freight): added routes and locomotives	2026-06-06 16:23:48 +03:00
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