Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
301 Commits 96 Branches 0 Tags
2f798fb080f22c8bb6591e93890cfa5a8f3c6615
Commit Graph

301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Abebe
2f798fb080 Merge pull request #109 from Tria-plc/freight/feature/add_train_routing 
Freight/feature/add train routing
 2026-06-06 16:31:45 +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
7625c31331 Merge pull request #107 from Tria-plc/freight/fix/train_scheduling 
fix(freight): fixed some issues
 2026-06-06 11:14:36 +03:00
Michael Abebe
e731051320 fix(freight): fixed some issues 2026-06-06 11:12:59 +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
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
Nathnael Wondisha
bf36e55040 Merge pull request #105 from Tria-plc/freight/feat/contract-signuture 
freight/feat/contract signuture
 2026-06-06 09:12:46 +03: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
Eyosiyas Girma
06276764e0 Merge pull request #104 from Tria-plc/freight/feature/payment 
minor update
 2026-06-06 08:17:29 +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
Hagernesh Tadesse
08fc53899a Merge pull request #103 from Tria-plc/feature/trains-management 
feat: complete train scheduling integration
 2026-06-06 05:56:22 +03:00
hagiye
788de5381e feat: complete train scheduling integration 2026-06-06 05:52:47 +03:00
Hagernesh Tadesse
29247d4140 Merge pull request #102 from Tria-plc/feature/trains-management 
Feature/trains management
 2026-06-05 21:15:15 +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
Eyosiyas Girma
04d79cd568 Merge pull request #101 from Tria-plc/freight/feature/payment 
Freight/feature/payment
 2026-06-05 17:36:19 +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
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
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
55a1d45f58 Merge pull request #99 from Tria-plc/freight_feature/booking_flow 
Freight feature/booking flow
 2026-06-05 14:08:03 +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
21d443db15 Merge pull request #98 from Tria-plc/freight/feature/payment 
Freight/feature/payment
 2026-06-05 13:02:06 +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
ghost2023
f77dd54390 feat: setup the recent booking endpoint and ui fixes 2026-06-05 11:36:13 +03:00
ghost2023
6e4b70be34 chore: install date-fns 2026-06-05 11:28:43 +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
Hagernesh Tadesse
ec3f83c9fb Merge pull request #95 from Tria-plc/feature/trains-management 
Feature/trains management
 2026-06-05 11:00:38 +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
Nathnael Wondisha
bd6ad54eea Merge pull request #96 from Tria-plc/freight/feat/booking-pricing 
freight/feat/booking pricing
 2026-06-05 10:43:12 +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