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 |
|
Michael Abebe
|
57776c4fef
|
feat(freight:backoffice): role and permission seeder
|
2026-06-01 16:28:04 +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
|
426019ebf7
|
feat(iam:demo): added demo permissions for superadmin
|
2026-05-29 11:45:44 +03:00 |
|
yaschalew10
|
22e701b96f
|
Merge pull request #52 from Tria-plc/freight_feature/booking/minio
implement rule engine module with dynamic booking evaluation
|
2026-05-29 11:36:06 +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 |
|
ghost2023
|
e84451ca60
|
fix: unused import causing error
|
2026-05-28 15:54:40 +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
|
cad3dd8e2d
|
fix(freight:api): fixed removed seeder in merge
|
2026-05-26 13:47:58 +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 |
|
yaschalew
|
8a7a56766f
|
add onboarding
|
2026-05-26 10:15:59 +03:00 |
|
marshal
|
f23d570427
|
changes
|
2026-05-26 09:24:47 +03:00 |
|
yaschalew
|
5a4d6baec2
|
user account create
|
2026-05-26 05:40:53 +03:00 |
|
hagiye
|
f90e5e0e1c
|
company detail api and frontend
|
2026-05-26 01:06:06 +03:00 |
|
Michael Abebe
|
235b4b9a93
|
Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice
|
2026-05-25 15:53:35 +03:00 |
|
Michael Abebe
|
516d2c8b45
|
feat(freight:backoffice): added org structure managemnet
|
2026-05-25 15:50:47 +03:00 |
|
yaschalew10
|
ab1dfe0c16
|
Merge pull request #38 from Tria-plc/freight_feature/booking/minio
implement file module and add files relation to booking entity and po…
|
2026-05-25 10:58:56 +03:00 |
|
marshal
|
9432814e3b
|
implement file module and add files relation to booking entity and populate on fetch
|
2026-05-25 10:19:08 +03:00 |
|
ghost2023
|
8a5652d7d9
|
feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs
|
2026-05-23 11:21:17 +03:00 |
|
yaschalew10
|
a252b88dfb
|
Merge pull request #36 from Tria-plc/freight/features/dynamic-terminal-component
Freight/features/dynamic terminal component
|
2026-05-23 11:13:24 +03:00 |
|
marshal
|
ae317540c1
|
feat(bookings): support multiple containers per booking via JSONB array
|
2026-05-23 11:08:35 +03:00 |
|
mengstabketemaw
|
3485ef299d
|
fix local merge conflict
|
2026-05-23 10:52:31 +03:00 |
|
marshal
|
2064e6efda
|
change the schema from public to freight
|
2026-05-23 10:00:40 +03:00 |
|
marshal
|
82c6b1284e
|
implement contract booking functionality and MinIO setup
|
2026-05-23 09:31:52 +03:00 |
|
yaschalew
|
c7347b88d7
|
customer registration api integration
|
2026-05-21 02:21:32 +03:00 |
|
yaschalew
|
51d6df42bb
|
file upload settings
|
2026-05-20 08:15:29 +03:00 |
|
Michael Abebe
|
2940d20e06
|
fix:(freight:auth): finished integrating the freight api with the freight portal
|
2026-05-18 11:07:09 +03:00 |
|
Michael Abebe
|
b46a7765e8
|
fix:(api:auth): added iam migrations to list of migrations
|
2026-05-18 10:48:15 +03:00 |
|