108 Commits

Author	SHA1	Message	Date
Marshal	cde3e462ba	automate the schedule	2026-06-11 19:42:23 +00:00
Marshal	f85c13ce8c	Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule	2026-06-11 11:15:29 +00:00
marshal	c871330f7f	resolve merge conflict	2026-06-11 10:52:37 +03:00
marshal	10b011de8f	merge conflict	2026-06-10 16:45:45 +03:00
Marshal	088295d81f	schedule logic	2026-06-10 09:22:57 +00:00
Marshal	257428be18	ui design for schedule	2026-06-09 23:25:52 +00:00
marshal	5774d7db9d	booking operations and trains scheduling also allocations	2026-06-10 00:48:32 +03:00
hagiye	eda21e22d8	Resolve merge conflicts from Train-Scheduling	2026-06-08 16:51:29 +03:00
Eyosiyas Girma	7c5e7408b0	Merge branch 'freight/develop' into freight/feature/telebirr-integration	2026-06-08 16:35:18 +03:00
Eyosiyas	3a66242f8b	working on dmoney	2026-06-08 16:29:20 +03:00
Eyosiyas	a1940c4901	telebirr out in the payment	2026-06-08 11:49:50 +03:00
marshal	675975bc08	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine	2026-06-08 10:05:48 +03:00
marshal	88df20be6b	change price logic on the ,rule engine ui, auto generate the contrat	2026-06-08 10:04:23 +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
marshal	4993453993	generate contract by the system, add waggon type,fix ui	2026-06-07 01:20:52 +03: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
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
Michael Abebe	e731051320	fix(freight): fixed some issues	2026-06-06 11:12:59 +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
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
marshal	35c9bdfce4	resolve confilict	2026-06-05 14:07:26 +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
Tria	7c124d9845	telebirr configured	2026-06-05 11:01:01 +03:00
marshal	ba65a3f4cc	booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions	2026-06-05 11:01:00 +03:00
hagiye	b33517f47d	resolve conflict	2026-06-05 10:59:52 +03:00
hagiye	1ce41cddde	Fix train scheduling and booking seeder	2026-06-05 10:46:08 +03:00
marshal	d226d7ef22	booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions	2026-06-05 10:38:31 +03:00
ghost2023	a991139cc2	feat(bookings): Integrate auto-pricing into DRAFT booking UI, and refactor customer-company relationships across services.	2026-06-05 10:27:21 +03:00
hagiye	ed9ef2b8e1	Merge freight/develop into feature/trains-management	2026-06-05 10:25:05 +03:00
hagiye	c66b57d599	Merge freight/develop into feature/trains-management	2026-06-05 10:21:39 +03:00
ghost2023	c5859dba6c	feat(bookings): Implement document upload API for DRAFT bookings	2026-06-05 09:51:12 +03:00
Hagernesh Tadesse	523d7e5842	Merge pull request #94 from Tria-plc/freight/feature/add_train_scheduling ... Freight/feature/add train scheduling reviewed	2026-06-05 09:38:30 +03:00
Michael Abebe	993d96d1b2	fix(freight:api): ton number conversion	2026-06-04 17:14:55 +03:00
marshal	bdcb316685	Merge pull request #93 from Tria-plc/freight_feature/booking_flow ... dynamic contract templates and companyId on bookings	2026-06-04 16:58:50 +03:00
marshal	810bbc1168	dynamic contract templates and companyId on bookings	2026-06-04 16:57:07 +03:00