Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 16:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,506 Commits 96 Branches 0 Tags
1d946a2fdccb59f1571798e8152b23c70c2ecf80
Commit Graph

1962 Commits

Author SHA1 Message Date
marshal
1d946a2fdc Merge pull request #523 from Tria-plc/freight_feature/usermanagement 
resolve conflict
 2026-07-08 01:25:17 +03:00
Marshal
88b1e548a2 resolve conflict 2026-07-07 22:24:42 +00:00
marshal
719f017a82 Merge pull request #522 from Tria-plc/freight_feature/usermanagement 
feat: add isGeneral flag to identify general contracts in NewContract…
 2026-07-08 00:58:53 +03:00
Marshal
70a917510e feat: add isGeneral flag to identify general contracts in NewContractPage 2026-07-07 21:58:06 +00:00
marshal
8128ae6164 Merge pull request #521 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-08 00:47:23 +03:00
Marshal
94904ea6d0 resolve conflict 2026-07-07 21:46:25 +00:00
Stephanos A
63fa6996b1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-08 00:43:24 +03:00
Stephanos A
73e8dc19b3 Fare engine formula updates 2026-07-08 00:43:05 +03:00
Marshal
518eec6286 enhance train scheduling and booking management 2026-07-07 21:42:59 +00:00
Marshal
87a95b37bf enhance train scheduling and booking management 2026-07-07 21:38:45 +00:00
Roba Boru
8f23f85e63 Set nationality required on booking widget 2026-07-07 23:55:35 +03:00
Roba Boru
18043de7a2 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-07 23:06:40 +03:00
Roba Boru
1970eb7b9c Fix duplicate hold seat 2026-07-07 23:05:45 +03:00
Stephanos A
46d0d63611 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-07 22:58:11 +03:00
Stephanos A
8cc2d9445d Manuel ticket generation, seat management by route added 2026-07-07 22:58:01 +03:00
Marshal
8addfdf3e2 changes 2026-07-07 18:40:32 +00:00
Roba Boru
84169776b3 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-07 21:19:56 +03:00
Roba Boru
bf3fa746eb Update manage booking 2026-07-07 21:19:04 +03:00
Stephanos A
d32392b66a Build issue resolution 2026-07-07 20:20:20 +03:00
Stephanos A
3ebe5bdab2 Free child seat issue resolution 2026-07-07 20:04:20 +03:00
Marshal
b57840c907 add CUSTOMS type to priority configs and update related logic 2026-07-07 16:42:57 +00:00
Stephanos A.
2ef1f8561e Merge pull request #512 from Tria-plc/alpha 
Alpha
 2026-07-07 19:38:28 +03:00
Stephanos A
46f0b1e3a3 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-07 19:35:32 +03:00
Stephanos A
9126091fbd Seat price related updates 2026-07-07 19:35:19 +03:00
Eyob T.
e0def1b4b6 Merge pull request #510 from Tria-plc/alpha 
Update booking amount currency converstion
 2026-07-07 18:19:12 +03:00
Nathnael Wondisha
268511c7ff Merge pull request #511 from Tria-plc/freight/feat/chat-app 
chat app support to the passenger with websocket and anonymous
 2026-07-07 17:16:10 +03:00
Nathnael
9cd3ac42b4 feat: add the support to the client 2026-07-07 14:09:28 +00:00
Nathnael
db21f691c7 chore: add socket io pkg to the passenger client 2026-07-07 14:07:50 +00:00
Nathnael
105605f904 feat: add the support feature to the passenger api 2026-07-07 14:07:15 +00:00
Nathnael
24fc27854a chore: db migration 2026-07-07 14:06:38 +00:00
Nathnael
b949d8fd4c chore: add guest support to the schema 2026-07-07 14:06:31 +00:00
Roba Boru
5e59199b7c Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-07 16:53:38 +03:00
Roba Boru
fb1d510bcf Update booking amount currency converstion 2026-07-07 16:52:58 +03:00
Nathnael
17b7a4f6dc chore: update the supportconversation schema 2026-07-07 13:26:59 +00:00
Nathnael
692a24f5d3 chore: add socket to packages api 2026-07-07 13:25:48 +00:00
Stephanos A
222687f4ac Build issues resolution 2026-07-07 15:46:46 +03:00
Marshal
f300600bfa changes 2026-07-07 12:28:47 +00:00
Stephanos A
1ee01a4c83 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-07 15:17:40 +03:00
Stephanos A
f424ca9f58 Package seat selection updates, round trip alternative trips updates 2026-07-07 15:17:25 +03:00
Abubeker Yasin
fb72ae21df Merge branch 'dev' into alpha 2026-07-07 15:14:07 +03:00
Abubeker Yasin
2398e24c1a fix( dmoney ): make D-Money /go redirect 2026-07-07 15:12:16 +03:00
Hagernesh Tadesse
ec23faa5db Merge pull request #507 from Tria-plc/Truckdetantion 
Truckdetantion
 2026-07-07 14:49:41 +03:00
Abubeker Yasin
5763a3946d refactor: ( iam ) revert deleted EDR-branded OTP SMS messages 2026-07-07 14:40:01 +03:00
Roba Boru
fb4f571a6c Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-07 14:27:13 +03:00
Roba Boru
214afe64a5 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-07 14:26:59 +03:00
Roba Boru
543b044734 Set email field optional in passenger information 2026-07-07 14:26:37 +03:00
Hagernesh
25c9bdeecd Export Load on train 2026-07-07 10:21:17 +00:00
Hagernesh
35ccf1bc95 truck type detantion 2026-07-07 10:02:43 +00:00
natib21
b300fd1de5 user permition 2026-07-07 10:00:48 +00:00
Marshal
1c18fdbd52 Enhance contract management by adding booking windows section and updating invoice logic for offloaded cargo 2026-07-07 09:49:12 +00:00