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 |
|
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
|
c5859dba6c
|
feat(bookings): Implement document upload API for DRAFT bookings
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
9e4e44ee6a
|
feat(file-upload-settings): Add API endpoint and logic to retrieve settings by entity
|
2026-06-03 11:52:05 +03:00 |
|
Michael Abebe
|
27ce600706
|
Merge branch 'freight/develop' into freight/feature/edr_org_seeder
|
2026-06-02 16:05:01 +03:00 |
|
Michael Abebe
|
88a280eea2
|
WIP
|
2026-06-02 13:50:54 +03:00 |
|
Michael Abebe
|
2a489ca18d
|
WIP
|
2026-06-02 12:12:28 +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 |
|
Michael Abebe
|
25fa26e65d
|
Fix merge conflict of Merge branch 'freight/develop' into freight/feature/edr_org_seeder
|
2026-06-01 17:28:07 +03:00 |
|
Michael Abebe
|
fab6819151
|
feat(freight:backoffice): temp add user UI
|
2026-06-01 17:17:54 +03:00 |
|
yaschalew10
|
973fc2cc85
|
Merge pull request #61 from Tria-plc/freight/rule_engine_ui
Freight/rule engine UI
|
2026-06-01 16:09:37 +03:00 |
|
hagiye
|
3682bda85c
|
rule engine UI, services and API integration
|
2026-06-01 16:01:51 +03:00 |
|
marshal
|
4285e704bd
|
changes
|
2026-06-01 15:14:03 +03:00 |
|
marshal
|
6b6a1d56d6
|
update the Consolidation and wagon filling on booking and Add GET /bookings/reference-data endpoint for booking form catalog (yards, containers, services, shipping lines, cargo types)
|
2026-05-30 12:45:52 +03:00 |
|
marshal
|
badeeff345
|
complete rule engine and booking flow
|
2026-05-30 11:52:50 +03:00 |
|
marshal
|
7bbb95e9fd
|
complete rule engine and booking flow
|
2026-05-30 10:28:51 +03:00 |
|
marshal
|
430dc44937
|
complete rule engine and booking flow
|
2026-05-30 10:27:59 +03:00 |
|
Michael Abebe
|
ec103a0e84
|
Merge branch 'freight/develop' into freight/feature/backoffice_iam_demo
|
2026-05-29 12:15:00 +03:00 |
|
Michael Abebe
|
be5f3e1811
|
feat(freight:backoffice): demo iam
|
2026-05-29 11:21:04 +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
|
3b53042cf8
|
add service-types and cargo-types CRUD modules with pagination, filtering
|
2026-05-28 11:58:04 +03:00 |
|
marshal
|
e1d05d5475
|
add service-types and cargo-types CRUD modules with pagination, filtering
|
2026-05-28 11:52:29 +03:00 |
|
marshal
|
429459ef29
|
add service-types and cargo-types CRUD modules with pagination, filtering
|
2026-05-28 11:37:12 +03:00 |
|
marshal
|
d08bc6d3fe
|
add service-types and cargo-types CRUD modules with pagination, filtering
|
2026-05-28 11:34:24 +03:00 |
|
yaschalew10
|
2e9a93d9e2
|
Merge pull request #43 from Tria-plc/freight_feature/booking/minio
allow customers booking
|
2026-05-28 10:37:24 +03:00 |
|
marshal
|
6d49c38f48
|
allow customers booking
|
2026-05-28 10:31:31 +03:00 |
|
yaschalew
|
217069fb74
|
fix conflict
|
2026-05-28 08:44:26 +03:00 |
|
Michael Abebe
|
39c3f3cf43
|
Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice
|
2026-05-26 13:37:34 +03:00 |
|
Michael Abebe
|
b487d47055
|
feat(freight:backoffice): migrated smart-office user-management
|
2026-05-26 12:50:40 +03:00 |
|
yaschalew
|
ffd38f8025
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/user_registration
|
2026-05-26 10:16:41 +03:00 |
|