Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 13:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,018 Commits 96 Branches 0 Tags
dev
Commit Graph

3838 Commits

Author SHA1 Message Date
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
SennayT
b6136b0a65 modify nextjs deployment 2026-06-05 11:28:33 +00: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
35c9bdfce4 resolve confilict 2026-06-05 14:07:26 +03:00
Abubeker Yasin
04765bdd78 fix: ( migration ) Create migration.sql 2026-06-05 14:01:56 +03:00
marshal
d59c192137 resolve confilict 2026-06-05 13:06:16 +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
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
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
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
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
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