hagiye eda21e22d8 Resolve merge conflicts from Train-Scheduling

2026-06-08 16:51:29 +03:00

..

common

resolve confilict

2026-06-05 14:07:26 +03:00

config

Merge branch 'freight/develop' into freight/feature/telebirr-integration

2026-06-08 16:35:18 +03:00

contracts

booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions

2026-06-05 10:38:31 +03:00

migrations

feat(freight): changed the train schedule

2026-06-06 16:31:19 +03:00

modules

Resolve merge conflicts from Train-Scheduling

2026-06-08 16:51:29 +03:00

scripts

Trains management CRUD issues solved

2026-06-05 21:07:04 +03:00

seed

generate contract by the system, add waggon type,fix ui

2026-06-07 01:20:52 +03:00

app.module.ts

telebirr out in the payment

2026-06-08 11:49:50 +03:00

data-source.ts

feat(freight): added routes and locomotives

2026-06-06 16:23:48 +03:00

main.ts

ui improvemnt

2026-06-06 21:17:20 +00:00