Commit Graph

274 Commits

Author SHA1 Message Date
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
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
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
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
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
ac0076e84e fix(freight:api): migration fix on companies FAN number 2026-06-04 17:08:05 +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
hagiye
71ac89edc7 trains, wagons,containers and cargoes schema and API 2026-06-04 15:56:29 +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
ghost2023
e0473b2ffd fix: add fan_number to companyies 2026-06-03 16:17:58 +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
4ed0e22f55 refactor(bookings): replace RFQ/quotation flow with submit, staff review, approval routing, and payment stubs 2026-06-03 15:45:38 +03:00
marshal
f93a502247 add migration file when the app is starting 2026-06-02 16:43:37 +03:00
marshal
e4859b3eeb solf merge conflict 2026-06-01 23:50:49 +03:00
marshal
452ebdbc0a rule engine and configration and fix booking for custoemr 2026-06-01 23:15:11 +03:00
marshal
badeeff345 complete rule engine and booking flow 2026-05-30 11:52:50 +03:00
marshal
430dc44937 complete rule engine and booking flow 2026-05-30 10:27:59 +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
marshal
d08bc6d3fe add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:34:24 +03:00