3465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nathnael	94af5fd6c2	chore: packages	2026-07-18 09:44:44 +00:00
Nathnael	f9286e781b	feat: setup the attachment to the passenger clients	2026-07-18 09:44:33 +00:00
Nathnael	bdcd5e957e	feat: setup the attachment to the passenger api	2026-07-18 09:44:14 +00:00
Nathnael	4f043ea4bf	chore: chat types update	2026-07-18 09:36:35 +00:00
Stephanos A	cca822cab8	Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha	2026-07-18 12:31:28 +03:00
Stephanos A	56057a1e16	Migration conflict issues resolution	2026-07-18 12:31:19 +03:00
marshal	9ce669b6b5	Merge pull request #787 from Tria-plc/freight_feature/usermanagement ... split export	2026-07-18 12:29:16 +03:00
Marshal	a7041ee70f	split export	2026-07-18 09:28:41 +00:00
Stephanos A	8f0670ff9c	Passengers report	2026-07-18 12:27:59 +03:00
marshal	bc6999cd10	Merge pull request #786 from Tria-plc/freight_feature/usermanagement ... split export	2026-07-18 12:20:48 +03:00
Marshal	406fbf6c45	split export	2026-07-18 09:12:52 +00:00
natib21	dc4512c15b	gMerge branch 'dev' of github.com:Tria-plc/edr-platform into dev	2026-07-18 09:04:52 +00:00
natib21	d5e87449b5	fix gps	2026-07-18 09:04:34 +00:00
Nathnael	5425379974	Merge branch 'dev' into freight/feat/chat-app	2026-07-18 08:52:45 +00:00
Nathnael	6126b55784	feat: setup attachment to the freight chat	2026-07-18 08:52:06 +00:00
Stephanos A.	2fcea650f4	Merge pull request #785 from Tria-plc/alpha ... Alpha	2026-07-18 11:50:09 +03:00
Abubeker Yasin	ce95646479	Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha	2026-07-18 11:49:42 +03:00
Stephanos A	19b1a8d13d	Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha	2026-07-18 11:47:45 +03:00
Abubeker Yasin	aecd02933c	Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha	2026-07-18 11:46:29 +03:00
Stephanos A	282bb949ba	Migration issue resolution	2026-07-18 11:45:35 +03:00
Stephanos A	af39ab0394	Migration issue resolution	2026-07-18 11:44:11 +03:00
natib21	20eb54521b	fix	2026-07-18 08:34:43 +00:00
Stephanos A.	6ed6f82372	Merge pull request #784 from Tria-plc/alpha ... Seat reservation unique constrains, package totalMinor updates	2026-07-18 11:32:48 +03:00
Stephanos A	854177c93b	Seat reservation unique constrains, package totalMinor updates	2026-07-18 11:30:43 +03:00
Abubeker Yasin	4806768cea	Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha	2026-07-18 09:55:31 +03:00
Abubeker Yasin	85de05cb40	feat: ( payments ) add merchant-order and booking/PNR payment status lookups	2026-07-18 09:55:09 +03:00
marshal	5702933870	Merge pull request #783 from Tria-plc/freight_feature/usermanagement ... fix	2026-07-18 02:34:47 +03:00
Marshal	6100a121d2	fix	2026-07-17 23:33:47 +00:00
marshal	f8d5030e97	Merge pull request #782 from Tria-plc/freight_feature/usermanagement ... add lashing surcharge for cargo types with hasLashing flag	2026-07-18 02:27:50 +03:00
Marshal	3a1a08b1e1	add lashing surcharge for cargo types with hasLashing flag ... add lashing surcharge for cargo types with hasLashing flag	2026-07-17 23:25:53 +00:00
Stephanos A.	8b84356988	Merge pull request #781 from Tria-plc/alpha ... Dashboard updates	2026-07-18 00:42:25 +03:00
Stephanos A	0669635095	Dashboard updates	2026-07-18 00:41:26 +03:00
Stephanos A.	6135b8554d	Merge pull request #780 from Tria-plc/alpha ... Dashboard, seats report, package pricing updates	2026-07-18 00:35:38 +03:00
Stephanos A	8eb0582e4e	Dashboard, seats report, package pricing updates	2026-07-18 00:34:12 +03:00
Stephanos A.	19e8b666eb	Merge pull request #779 from Tria-plc/alpha ... Package pricing issue resolution, passenger report updates	2026-07-17 23:51:49 +03:00
Stephanos A	eee14a5051	Package pricing issue resolution, passenger report updates	2026-07-17 23:48:49 +03:00
Stephanos A.	68e9ff8aa7	Merge pull request #778 from Tria-plc/alpha ... Alpha	2026-07-17 23:23:30 +03:00
Stephanos A	1d9238fa39	Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha	2026-07-17 23:20:10 +03:00
Stephanos A	f2c037a5b7	Package pricing issue resolution, passenger report, tickets filter updates	2026-07-17 23:18:52 +03:00
Eyob T.	23ff122baf	Merge pull request #777 from Tria-plc/alpha ... Enable skip fayda for dev	2026-07-17 23:01:42 +03:00
Roba Boru	d7a66cfac5	Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-17 22:41:45 +03:00
Roba Boru	b2e5f58119	Enable skip fayda for dev	2026-07-17 22:41:03 +03:00
Eyob T.	4863eff19f	Merge pull request #776 from Tria-plc/alpha ... Added Checkin duration configuration	2026-07-17 22:16:48 +03:00
Roba Boru	ab500cd6f3	Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-17 22:14:22 +03:00
Roba Boru	7e1966d469	Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-17 22:13:31 +03:00
Roba Boru	4a4e58043f	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-07-17 22:13:13 +03:00
Roba Boru	738b7df5cf	Added Checkin duration configuration	2026-07-17 22:12:54 +03:00
mulish77	5f000edbed	Merge pull request #775 from Tria-plc/stephpaymentfix ... Steph payment isssues fix	2026-07-17 19:51:18 +03:00
Muluhabt	ffafd9bcfc	Steph payment isssues fix	2026-07-17 19:50:35 +03:00
Stephanos A	2567e25173	Supplementary amount issue resolution	2026-07-17 19:47:11 +03:00