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
4,793 Commits 96 Branches 0 Tags
edr-dev
Commit Graph

387 Commits

Author SHA1 Message Date
hagiye
f5d6d8e7da Batch 1 to 3 implementation 2026-06-16 11:36:24 +03:00
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +03:00
Abubeker Yasin
8520c3add3 fix: ( payment ) remove /100 2026-06-16 11:02:07 +03:00
Abubeker Yasin
e5877e5339 fix: ( telebirr ) fix query status 2026-06-16 10:52:36 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
Abubeker Yasin
ca9a67837c feat: ( payment ) implement d-money payment 2026-06-16 08:49:41 +03:00
Abubeker Yasin
f3d892f68e Merge pull request #164 from Tria-plc/feat/payment-microservice 
fix: ( telebirr ) redirect_url
 2026-06-15 22:06:28 +03:00
marshal
0aed9824ae cac payemnt integration and cbe rate exchange webscrabing 2026-06-15 14:54:20 +03:00
Abubeker Yasin
96ec2923c2 fix: ( telebirr ) redirect_url 2026-06-15 14:35:14 +03:00
marshal
fe1bed8c4b payment integration 2026-06-15 11:09:58 +03:00
ghost2023
3e2e07bb5f feat(bookings): Implement data-driven service type selection and configuration 2026-06-15 09:57:00 +03:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
ghost2023
6058b870a1 feat(train-scheduling): implement API and types for bookable schedules 2026-06-15 09:52:17 +03:00
Eyob T.
39e32f4e0a Merge pull request #154 from Tria-plc/alpha 
Merge request for lock file and lint issues resolution
 2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f Lockfile and lint issues resolution 2026-06-14 15:29:37 +03:00
marshal
c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:38:19 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration 
UI migration Again
 2026-06-12 15:24:46 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Abubeker Yasin
2b430f8e76 feat: ( payment ) create payment microservice 2026-06-11 15:25:24 +03: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
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Abubeker Yasin
3f1a673356 Merge branch 'alpha' into feat/telebirr-integration 2026-06-10 13:22:47 +03:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00
ghost2023
02621d05d8 chore: migrate to mantine from shadcn for datatable 2026-06-10 10:02:09 +03:00
Abubeker Yasin
66b45ce22c feat(payment-providers): implement Waafi in provider package 2026-06-10 09:14:18 +03:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
ghost2023
4afe07c19b fix 2026-06-09 16:37:11 +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
ghost2023
e152e7e986 fix: the request approaval pricing ui 2026-06-06 11:45:53 +03:00
Abubeker Yasin
1d11cbda4d feat: ( payment ) create payment microservice 2026-06-05 21:29:55 +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
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
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
marshal
8fea963ddb dynamic contract templates and companyId on bookings 2026-06-04 16:53:14 +03:00
marshal
125ee18308 implement booking flow 2026-06-04 15:16:27 +03:00
ghost2023
a267526be5 refactor(bookings): Migrate new booking API payload to use reference data IDs 2026-06-01 16:39:11 +03:00
ghost2023
217f1bf097 feat(bookings): Implement skeleton loaders for new booking form steps 2026-06-01 16:39:11 +03:00
ghost2023
ff3cbed747 feat(freight): Introduce booking reference data endpoint & schemas 2026-06-01 16:39:11 +03:00
Stephanos A
5059a1fe58 First passenger and back office portal commit 2026-05-31 13:15:44 +03:00
ghost2023
bf51ead32d feat(portal): Add Profile page, refactor booking details, and remove documents module 2026-05-29 17:37:02 +03:00
yaschalew10
bd08fb2351 Merge pull request #54 from Tria-plc/freight/feature/ui-sync 
onboarding and bookin ui page
 2026-05-29 16:40:26 +03:00