Nathnael
acd2cfbe8c
feat: add drain tail to the payments
2026-08-04 08:59:33 +00:00
Nathnael
a20498fd77
chore: more it test
2026-08-04 08:57:25 +00:00
Nathnael
3b45990023
chore: more test cases
2026-08-03 12:57:32 +00:00
Nathnael
72532f36cd
fix: seeder
2026-08-03 11:58:33 +00:00
Nathnael
f103b51de5
feat: integration tests
2026-08-03 10:51:43 +00:00
Nathnael
6f137a11c3
fix:cbe and cac
2026-08-02 20:37:16 +00:00
Nathnael
da1da7befb
fix: cbe freight base url
2026-08-02 20:10:42 +00:00
Nathnael
2ead1d0782
fix: cbe not appearing
2026-08-02 20:09:27 +00:00
ghost2023
16baa1dd1d
fix: cbe callback
2026-08-02 23:01:29 +03:00
Nathnael
ae037fd29d
fix: padding
2026-08-02 18:42:38 +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
a9e6c0dc6f
fix: etrade phone verification
2026-08-02 18:02:20 +00:00
Nathnael
d0cc5c19ee
fix
2026-08-02 17:52:20 +00:00
Nathnael Wondisha
12bd6052fc
Merge pull request #1072 from Tria-plc/dev
...
Syncing
2026-08-02 20:16:41 +03:00
marshal
ec4bf8a5ab
Merge pull request #1071 from Tria-plc/freight_feature/usermanagement
...
fix issue
2026-08-02 13:30:01 +03:00
Marshal
ff772fddef
fix issue
2026-08-02 10:26:36 +00:00
Nathnael Wondisha
90f78b019f
Merge pull request #1070 from Tria-plc/otp-fix
...
fix: opt
2026-08-02 13:22:41 +03:00
ghost2023
da79cb5acd
fix: opt
2026-08-02 13:20:51 +03:00
ghost2023
7619952b74
fix: etrade loading
2026-08-02 01:39:46 +03:00
ghost2023
e6ce19ad22
style: ui fixes
2026-08-02 01:11:04 +03:00
marshal
b2edb6e5b8
Merge pull request #1069 from Tria-plc/freight_feature/usermanagement
...
Enhance booking and signature functionalities
2026-08-02 01:04:23 +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
c28f0607d1
Merge pull request #1068 from Tria-plc/freight_feature/usermanagement
...
Add a minimal payment mock server for end-to-end testing
2026-08-01 23:41:23 +03:00
Marshal
ea9df9abbe
Add a minimal payment mock server for end-to-end testing
2026-08-01 19:58:17 +00:00
marshal
550c70fd48
Merge pull request #1067 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-01 22:00:52 +03:00
Marshal
21fdf144ca
Add a minimal payment mock server for end-to-end testing
2026-08-01 18:59:14 +00:00
Marshal
8ccb0e1558
Refactor booking process to use bookAndClear utility
...
- Replaced instances of bookContainers with bookAndClear across multiple test files to streamline booking and acceptance process.
- Updated import statements to include bookAndClear where necessary.
- Removed redundant acceptOperation calls after booking, as bookAndClear handles this internally.
- Adjusted comments and documentation to reflect changes in booking logic.
- Modified forceReservationExpiry function to ensure payment deadlines are set correctly, preventing issues with booking promotions.
2026-08-01 18:42:45 +00:00
Abubeker Yasin
34e91e92f5
Merge pull request #1066 from Tria-plc/alpha
...
Update pnpm-lock.yaml
2026-08-01 18:57:28 +03:00
Abubeker Yasin
7ccdd1dd37
Update pnpm-lock.yaml
2026-08-01 18:55:48 +03:00
Nathnael Wondisha
6af63717ea
Merge pull request #1065 from Tria-plc/freight/fix/pay
...
Freight/fix/pay
2026-08-01 15:27:04 +03: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
08df953a35
fix: pnpm lock
2026-08-01 14:22:14 +03:00
ghost2023
eae0552aae
Merge branch 'staging' into freight/fix/pay
2026-08-01 14:21:28 +03:00
Nathnael Wondisha
859ca5b90e
Merge pull request #1064 from Tria-plc/dev
...
Syncing
2026-08-01 14:06:53 +03:00
Nathnael Wondisha
7ad1b4dff2
Merge branch 'staging' into dev
2026-08-01 14:06:37 +03:00
Nathnael Wondisha
4e4e5a52ce
Merge pull request #951 from Tria-plc/update-freight-migrations
...
update migration to before deployment in freight api
2026-08-01 14:00:39 +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
3424dacd5f
fix issue
2026-08-01 10:03:56 +00: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
e3e1a148b4
Merge pull request #1062 from Tria-plc/edrmiles
...
fix(freight-portal): add missing /api prefix to bulk truck upload end…
2026-08-01 11:44:58 +03:00
