Commit Graph

262 Commits

Author SHA1 Message Date
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
Tria
7c124d9845 telebirr configured 2026-06-05 11:01:01 +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
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
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
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
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
Tria
da10d067f8 multiple notification strategies 2026-06-03 16:17:36 +03:00
ghost2023
dc9244d66e feat(core): Introduce company and external profile management with dedicated API, services, and data schema 2026-06-03 16:01:07 +03:00
marshal
a5578ce714 refactor(bookings): replace RFQ/quotation flow with submit, staff review, approval routing, and payment stubs 2026-06-03 15:53:25 +03:00
marshal
4ed0e22f55 refactor(bookings): replace RFQ/quotation flow with submit, staff review, approval routing, and payment stubs 2026-06-03 15:45:38 +03:00
ghost2023
c2145b48f5 fix 2026-06-03 15:31:29 +03:00
ghost2023
9e4e44ee6a feat(file-upload-settings): Add API endpoint and logic to retrieve settings by entity 2026-06-03 11:52:05 +03:00
Nathnael Wondisha
36a8002163 Merge pull request #68 from Tria-plc/freight/feature/booking-integration
freight/feature/booking integration
2026-06-03 11:26:35 +03:00
hagiye
18015ceaff Merge freight/develop 2026-06-02 17:11:51 +03:00
marshal
0eeb0e0d6f Merge pull request #69 from Tria-plc/freight_feature/rule_engine_and_design
add migration file when the app is starting
2026-06-02 16:44:50 +03:00
marshal
f93a502247 add migration file when the app is starting 2026-06-02 16:43:37 +03:00
Michael Abebe
5727680ea6 Merge pull request #67 from Tria-plc/freight/feature/edr_org_seeder
Freight/feature/edr org seeder
2026-06-02 16:16:36 +03:00