Commit Graph

65 Commits

Author SHA1 Message Date
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
Abubeker Yasin
96ec2923c2 fix: ( telebirr ) redirect_url 2026-06-15 14:35:14 +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
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
Abubeker Yasin
2b430f8e76 feat: ( payment ) create payment microservice 2026-06-11 15:25:24 +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
Abubeker Yasin
66b45ce22c feat(payment-providers): implement Waafi in provider package 2026-06-10 09:14:18 +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
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
ghost2023
b58e2ee2be refactor(bookings): Consolidate and remove steps for streamlined booking flow 2026-05-29 13:08:27 +03:00
yaschalew10
22e701b96f Merge pull request #52 from Tria-plc/freight_feature/booking/minio
implement rule engine module with dynamic booking evaluation
2026-05-29 11:36:06 +03:00
marshal
800f036005 implement rule engine module with dynamic booking evaluation, 7 entities, and Postman endpoints 2026-05-29 10:00:45 +03:00
ghost2023
6457b692b8 chore: update create customer dto 2026-05-28 15:54:40 +03:00
ghost2023
67d9d13591 chore: sync Ibooking 2026-05-28 15:54:26 +03:00
Michael Abebe
39c3f3cf43 Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice 2026-05-26 13:37:34 +03:00
Michael Abebe
516d2c8b45 feat(freight:backoffice): added org structure managemnet 2026-05-25 15:50:47 +03:00
ghost2023
dc41da3731 feat: wire up the create booking form 2026-05-23 11:54:13 +03:00
ghost2023
8a5652d7d9 feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs 2026-05-23 11:21:17 +03:00
Michael Abebe
2272255bef Merge remote-tracking branch 'origin/freight/develop' into freight/feature/bootstrap_backoffice 2026-05-22 17:58:43 +03:00
Michael Abebe
27e2cfcf6b feat(freight:backoffice): added login page and basic authorization 2026-05-22 17:55:20 +03:00
Michael Abebe
2c9ca6f16b feat(freight:backoffice): added basic frontend integration with auth(login) page 2026-05-22 17:15:46 +03:00
ghost2023
6287022a53 style: improve the switch component 2026-05-22 15:42:56 +03:00
ghost2023
37916a0cae chore: add switch component from shadcn to ui-common 2026-05-22 11:37:24 +03:00
ghost2023
9fbe27e634 chore: add field component from shadcn to ui-common 2026-05-22 10:45:13 +03:00
yaschalew
c7347b88d7 customer registration api integration 2026-05-21 02:21:32 +03:00
yaschalew
fea308a6af improve endpoints 2026-05-21 01:11:51 +03:00
ghost2023
995030a72c feat: build a global smart file input field 2026-05-20 16:08:38 +03:00
ghost2023
5d3164074b fix: styling conflict issues 2026-05-20 14:32:03 +03:00
ghost2023
0440206c06 chore: add dropdown and also updated tables to use dropdown instead 2026-05-20 13:49:17 +03:00
ghost2023
e1aa01724f style: add components 2026-05-20 12:03:15 +03:00
Nathnael Wondisha
841d8c803f Merge branch 'develop' into ui-comps 2026-05-20 11:40:54 +03:00