Commit Graph

4007 Commits

Author SHA1 Message Date
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
hagiye
c66b57d599 Merge freight/develop into feature/trains-management 2026-06-05 10:21:39 +03:00
ghost2023
0184db9040 feat(bookings): Introduce DRAFT booking workflow with comprehensive features for pricing, document management, submission, and cancellation. 2026-06-05 09:51:13 +03:00
ghost2023
c5859dba6c feat(bookings): Implement document upload API for DRAFT bookings 2026-06-05 09:51:12 +03:00
ghost2023
c7617b1b6e chore: deps 2026-06-05 09:51:12 +03:00
Hagernesh Tadesse
523d7e5842 Merge pull request #94 from Tria-plc/freight/feature/add_train_scheduling
Freight/feature/add train scheduling reviewed
2026-06-05 09:38:30 +03:00
Michael Abebe
993d96d1b2 fix(freight:api): ton number conversion 2026-06-04 17:14:55 +03:00
Michael Abebe
cd907eb263 feat(freight:api): added additional booking entry 2026-06-04 17:08:41 +03:00
Michael Abebe
ac0076e84e fix(freight:api): migration fix on companies FAN number 2026-06-04 17:08:05 +03:00
marshal
bdcb316685 Merge pull request #93 from Tria-plc/freight_feature/booking_flow
dynamic contract templates and companyId on bookings
2026-06-04 16:58:50 +03:00
marshal
810bbc1168 dynamic contract templates and companyId on bookings 2026-06-04 16:57:07 +03:00
marshal
8fea963ddb dynamic contract templates and companyId on bookings 2026-06-04 16:53:14 +03:00
Michael Abebe
8b3aaad5fd feat(freight): basics of train scheduling 2026-06-04 16:50:38 +03:00
Stephanos A.
474c87a8ec Merge pull request #91 from Tria-plc/alpha
Add device management to user profile and enhance seat hold expiratio…
2026-06-04 16:41:02 +03:00
Stephanos A
af14535e08 Add device management to user profile and enhance seat hold expiration handling 2026-06-04 16:38:58 +03:00
Stephanos A.
18c61dfe2e Merge pull request #90 from Tria-plc/alpha
Booking and ticketing related updates
2026-06-04 16:22:39 +03:00
Stephanos A
bc4d6d079b Booking and ticketing related updates 2026-06-04 16:21:22 +03:00
Tria
93020b3153 working on payment 2026-06-04 16:18:14 +03:00
hagiye
71ac89edc7 trains, wagons,containers and cargoes schema and API 2026-06-04 15:56:29 +03:00
Nathnael Wondisha
ec0d789502 Merge pull request #89 from Tria-plc/freight/feat/onboarding-docs
freight/feat/onboarding docs
2026-06-04 15:42:56 +03:00
ghost2023
ac964bace8 feat(WIP): setting and upload logic 2026-06-04 15:40:38 +03:00
ghost2023
ad895d695e feat(companies): Introduce API endpoint and UI for company registration document uploads 2026-06-04 15:40:38 +03:00
ghost2023
8045415113 refactor: clean up 2026-06-04 15:40:38 +03:00
ghost2023
8ddd166dca feat: setup the ui for document uploading in accounts onboarding 2026-06-04 15:40:38 +03:00
ghost2023
d61c3813cb feat(seed): Add file upload settings seeder for company onboarding 2026-06-04 15:40:38 +03:00
ghost2023
9d12d334d4 fix: key 2026-06-04 15:40:38 +03:00
marshal
30d2c123a5 Merge pull request #88 from Tria-plc/freight_feature/booking_flow
Freight feature/booking flow
2026-06-04 15:27:09 +03:00
marshal
324935a334 implement booking flow 2026-06-04 15:24:18 +03:00
marshal
125ee18308 implement booking flow 2026-06-04 15:16:27 +03:00
Stephanos A.
e44e80c200 Merge pull request #87 from Tria-plc/alpha
Add endpoint to retrieve bookings by device ID and update related API…
2026-06-04 14:35:27 +03:00
Stephanos A
681825f36c Add endpoint to retrieve bookings by device ID and update related API methods 2026-06-04 14:28:49 +03:00
Abubeker Yasin
3922d813b1 fix: ( telebirr ): fix payment status 2026-06-04 14:24:38 +03:00
Stephanos A.
ef940a61bd Merge pull request #85 from Tria-plc/alpha
Alpha
2026-06-04 13:46:33 +03:00
Stephanos A
87a27677d9 Passenger portal UI and UX updates: landing mini site added 2026-06-04 13:45:23 +03:00
Abubeker Yasin
ffdb095a28 Update telebirr-webhook.service.ts 2026-06-04 11:26:01 +03:00
Abubeker Yasin
1784f05d31 Update webhooks.controller.ts 2026-06-04 10:38:11 +03:00
Abubeker Yasin
26cec36685 refactor: ( telebirr ) update the webhook to accept any request 2026-06-04 10:15:20 +03:00
Michael Abebe
6b82b11757 Merge pull request #84 from Tria-plc/freight/fix/user-signup
freight/fix/user signup
2026-06-04 09:51:06 +03:00
Abubeker Yasin
1fbedff810 Update payments.types.ts 2026-06-04 09:01:19 +03:00
Abubeker Yasin
848cb530ee fix: ( telebirr ) : change the payer id to appid 2026-06-04 08:46:37 +03:00
Stephanos A
6ad051fba4 Update Tailwind CSS configuration after UX updates 2026-06-04 08:25:51 +03:00
Stephanos A
375cd184c4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-04 08:19:52 +03:00
Stephanos A
d9ae1c7f76 Passenger apss UI and UX updates 2026-06-04 08:19:36 +03:00
Stephanos A
d80f77b941 Passenger portal build issues resolution 2026-06-03 08:12:40 -07:00
Stephanos A
9d75a5bc66 Passenger portal issues resolution 2 2026-06-03 16:58:42 +03:00
Eyosiyas Girma
8b60cdf134 Merge pull request #83 from Tria-plc/freight/feature/notification
multiple notification strategies
2026-06-03 16:21:15 +03:00
ghost2023
f9357ed1b2 feat(api): Introduce dedicated company management API and service 2026-06-03 16:19:04 +03:00
ghost2023
e0473b2ffd fix: add fan_number to companyies 2026-06-03 16:17:58 +03:00
Stephanos A.
1bde9d401a Merge pull request #82 from Tria-plc/alpha
Passenger portal build issue resolution
2026-06-03 16:17:43 +03:00