marshal
e56905de57
Merge pull request #1096 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-03 22:53:30 +03:00
Marshal
488c2465be
feat: add per-ton cargo loading limits and update related services
2026-08-03 19:16:28 +00:00
Marshal
9afc281d21
fix issue: user trade access
2026-08-03 13:06:43 +00:00
Marshal
106b07a02b
add staff user list endpoint
2026-08-03 12:32:10 +00:00
Nathnael Wondisha
229fc8e2db
Merge pull request #1094 from Tria-plc/fixes
...
Fixes
2026-08-03 15:01:08 +03:00
Nathnael
72532f36cd
fix: seeder
2026-08-03 11:58:33 +00:00
marshal
3a7ed7d24b
Merge pull request #1092 from Tria-plc/freight_feature/usermanagement
...
expose per-side facility flags
2026-08-03 11:59:11 +03:00
Marshal
c12108d953
expose per-side facility flags
2026-08-03 08:49:07 +00:00
marshal
e7d1143c26
Merge pull request #1090 from Tria-plc/freight_feature/usermanagement
...
expose per-side facility flags
2026-08-03 11:22:08 +03:00
Marshal
dfd27efb6b
expose per-side facility flags
2026-08-03 08:20:18 +00:00
Hagernesh
6a62ece814
feat(train-scheduling): auto-place intercity cargo on wagons freed mid-corridor
...
Intercity bookings ride the wagons freed by earlier unloads (e.g. import
containers uncoupled at Dire Dawa). loadBooking now auto-allocates a
DOMESTIC booking onto on-train slots whose cargo has all departed —
greedy in consist order by capacity, container numbers copied for the
marshalling tally. Falls back to unallocated load when nothing is free.
2026-08-02 23:07:59 +00:00
Hagernesh
035369af43
fix intercity unloading at facility
2026-08-02 23:07:59 +00:00
marshal
c3ba0192a9
Merge pull request #1083 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-03 01:40:20 +03:00
Marshal
f4fd469643
per-user trade-direction access scope
2026-08-02 22:29:58 +00:00
ghost2023
12fb756cf5
fix: duplicate
2026-08-03 00:32:38 +03:00
Nathnael Wondisha
62a7e35708
Merge branch 'dev' into staging
2026-08-03 00:24:17 +03:00
Marshal
94c64c2390
configer the stamp
2026-08-02 21:09:37 +00:00
Nathnael
6f137a11c3
fix:cbe and cac
2026-08-02 20:37:16 +00:00
Marshal
950bcc0912
configer the stamp
2026-08-02 20:29:09 +00:00
Marshal
930e39c4fc
Enhance internal payment handling and e2e testing setup
2026-08-02 18:39:17 +00:00
Nathnael
dd0c7af251
fix: internal payment controller
2026-08-02 18:34:12 +00:00
Nathnael
3a3c309a5b
fix: etrade inconsistencies
2026-08-02 18:33:38 +00:00
Nathnael
7762d6c2d3
fix: payemetn race condition
2026-08-02 18:28:40 +00:00
Nathnael
7cebef8c39
fix: min amount of cac
2026-08-02 18:10:12 +00:00
Nathnael
ed27170301
chore: comment out the payment service
2026-08-02 18:07:15 +00:00
Nathnael Wondisha
12bd6052fc
Merge pull request #1072 from Tria-plc/dev
...
Syncing
2026-08-02 20:16:41 +03:00
Marshal
ff772fddef
fix issue
2026-08-02 10:26:36 +00:00
ghost2023
da79cb5acd
fix: opt
2026-08-02 13:20:51 +03:00
Marshal
53d8655dc3
Enhance booking and signature functionalities
...
- Updated MySignaturePage title to Signature
2026-08-01 22:03:18 +00:00
ghost2023
aaf0aa3c92
fix(verifayda): format nested Fayda address objects into strings
2026-08-02 00:11:39 +03:00
Marshal
ea9df9abbe
Add a minimal payment mock server for end-to-end testing
2026-08-01 19:58:17 +00:00
ghost2023
d524f4465c
fix: validation
2026-08-01 15:26:11 +03:00
Marshal
20bb2f274a
resolve merge conflict
2026-08-01 12:16:12 +00:00
Marshal
123f925cc1
add Group 9 delivery scenarios for self-haul and last-mile paths
...
- Implemented G9·S38 tests for customer self-haul truck assignments, ensuring compliance with container limits and truck assignments.
- Added G9·S39 tests for last-mile delivery, self-haul, and yard pickup, verifying independent paths for multiple bookings on the same train.
- Created seed data for Group 1 and Group 2 scenarios, ensuring proper setup for weight and capacity tests.
- Updated booking interface to deprecate in favor of for better clarity in allocations.
2026-08-01 12:14:37 +00:00
ghost2023
eae0552aae
Merge branch 'staging' into freight/fix/pay
2026-08-01 14:21:28 +03:00
Nathnael Wondisha
7ad1b4dff2
Merge branch 'staging' into dev
2026-08-01 14:06:37 +03:00
Nathnael
784f6ac6f2
Merge branch 'dev' into update-freight-migrations
2026-08-01 10:59:41 +00:00
Nathnael
dfdb79301d
chore(freight-api): upgrade api-common and iamapi-common packages
2026-08-01 10:50:40 +00:00
ghost2023
42e227569b
Merge remote-tracking branch 'origin/staging' into freight/fix/pay
...
# Conflicts:
# apps/edr-freight-api/src/modules/billing/billing.service.ts
# apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx
# apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PaymentMethodModal.tsx
# pnpm-lock.yaml
2026-08-01 13:09:14 +03:00
marshal
91f3f56e12
Merge pull request #1063 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-01 13:04:33 +03:00
Marshal
0d8c63328a
add items per wagon map to cargo types and sync bulk rate units
...
- Implemented in the to manage the physical item capacity for each wagon type.
- Added a new migration to create the column in the table.
- Introduced method in to update rate units when cargo type unit of measure changes.
- Updated booking calculations to consider items per wagon for break-bulk cargo.
- Refactored various components to utilize the new items fit logic and ensure consistent date formatting across the application.
- Added tests for the new display timezone functionality to ensure consistent date/time representation across different user settings.
2026-08-01 09:55:21 +00:00
Hagernesh Tadesse
583e635a60
Merge pull request #1061 from Tria-plc/edrmiles
...
fix
2026-08-01 11:37:29 +03:00
Hagernesh
af1d64d0bd
fix
2026-08-01 08:34:59 +00:00
Nathnael Wondisha
938b34b55c
Merge pull request #1060 from Tria-plc/freight/fix/pay
...
fix: hardcoded payment api url
2026-08-01 11:34:57 +03:00
Nathnael Wondisha
04db67ac64
Merge pull request #1059 from Tria-plc/freight/fix/pay
...
fix: hardcoded payment api url
2026-08-01 11:34:02 +03:00
ghost2023
1c508d23ae
fix: hardcoded payment api url
2026-08-01 11:31:30 +03:00
Nathnael Wondisha
61e3a300a9
Merge pull request #1058 from Tria-plc/dev
...
syncing
2026-08-01 10:39:41 +03:00
Nathnael Wondisha
93384ed4e8
Merge pull request #1057 from Tria-plc/freight/chore/payment-test
...
Freight/chore/payment test
2026-08-01 10:34:27 +03:00
Nathnael Wondisha
616269a988
Merge branch 'staging' into dev-to-staging
2026-08-01 10:27:47 +03:00
marshal
71464c6da5
Merge pull request #1055 from Tria-plc/freight_feature/usermanagement
...
enhance contract and train scheduling features
2026-08-01 08:38:52 +03:00
