Commit Graph

4038 Commits

Author SHA1 Message Date
Marshal
930e39c4fc Enhance internal payment handling and e2e testing setup 2026-08-02 18:39:17 +00:00
Marshal
ff772fddef fix issue 2026-08-02 10:26:36 +00:00
Marshal
53d8655dc3 Enhance booking and signature functionalities
- Updated MySignaturePage title to Signature
2026-08-01 22:03:18 +00:00
Marshal
ea9df9abbe Add a minimal payment mock server for end-to-end testing 2026-08-01 19:58:17 +00: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
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
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
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
Hagernesh
1998c74b9e fix(freight-portal): add missing /api prefix to bulk truck upload endpoint
BulkTruckUploadModal hand-built its POST URL and omitted the global
/api prefix every other booking call uses, causing a 404. Added
CUSTOMER_TRUCKS_BULK to URL_CONSTANTS.BOOKINGS and switched the modal
to use it.
2026-08-01 08:42:18 +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
e066d3e7f0 Merge pull request #1056 from Tria-plc/dev-to-staging
Syncing Staging
2026-08-01 10:31:17 +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
Marshal
a8788eb549 enhance contract and train scheduling features
- Added pricing service integration to ContractsService for pre-persistence contract pricing.
- Updated LegCapacityPanel to display cargo weight instead of gross weight for better clarity on booked cargo.
- Enhanced train scheduling service to include cargo weight in booking details.
- Modified ClearanceDocumentsPage to include FULLY_EXECUTED status in booking status options.
- Refactored FileUploadSettingsPage to categorize file upload settings into tabs for better organization.
- Removed legacy onboarding fields and settings from file upload settings seeder.
- Improved type definitions for train scheduling to include cargo weight without wagon tare.
2026-08-01 05:37:46 +00:00
robiman
f0788ee892 Merge pull request #1054 from Tria-plc/alpha
Add nationality selection on package
2026-07-31 21:20:22 +03:00
robiman
adf93791af Merge pull request #1053 from Tria-plc/fix/package
Fix/package
2026-07-31 21:19:31 +03:00
Roba Boru
30d1d43858 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into fix/package 2026-07-31 21:18:33 +03:00
Roba Boru
932f4ad2ba Update package image 2026-07-31 21:17:53 +03:00
marshal
a084a98e84 Merge pull request #1052 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-31 20:55:41 +03:00
Marshal
6a4067ec42 fix issue 2026-07-31 17:54:10 +00:00
Roba Boru
eb4e7eed0a Add nationality selection on package 2026-07-31 20:44:20 +03:00
Nathnael
4f81a0bbb8 feat(freight): non-terminal change-request review + unified customer timeline
Backoffice can now "Request changes" on a pending settings change
request without rejecting it outright: a new ChangesRequested status
keeps the row open so the customer's next edit appends into the same
request instead of starting a fresh cycle, and the reviewer's note
persists across that round instead of being cleared on resubmit.

Version History and Review History (previously two separate,
differently-shaped lists) are merged into one chronological timeline
under a new History tab, including document changes shown as a real
previous-vs-current diff (both files openable).

Bug fixes surfaced while wiring this up:
- Replacing a single-file document slot left the old file live
  alongside the new one instead of retiring it (customer settings +
  onboarding uploads).
- The "previous" file in a document diff 404'd once superseded —
  the preview route now also matches soft-deleted records.
- A document replace was recorded twice in the timeline (once at
  upload, once again at change-request approval).
2026-07-31 14:12:30 +00:00
Hagernesh Tadesse
0a03074ba1 Merge pull request #1051 from Tria-plc/edrmiles
fix(freight-api): auto-unload bookings on final-yard bulk arrival
2026-07-31 16:35:09 +03:00
Hagernesh
ec48a8462f fix(freight-api): auto-unload bookings on final-yard bulk arrival
autoArriveAtFinalYard() bulk-updated booking status to ARRIVED/COMPLETED
via raw SQL but never emitted booking.unloadedAtYard, so
WarehouseInventoryService's listener never created the warehouse_inventory
row — bookings caught by this fallback (e.g. KALITY import arrivals)
stayed on awaiting unload indefinitely. Emit the event per row, covering
both intercity (DOMESTIC) and IMPORT as the listener already expects.
2026-07-31 13:34:05 +00:00
marshal
2605184b74 Merge pull request #1050 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-31 16:29:19 +03:00
Marshal
b74b51dcc1 fix issue 2026-07-31 13:27:44 +00:00
Hagernesh Tadesse
b808b057cf Merge pull request #1049 from Tria-plc/edrmiles
Fix 2 — lastmile should only be yes if EDR last mile.
2026-07-31 16:10:49 +03:00
Hagernesh
d229808fd8 Fix 2 — lastmile should only be yes if EDR last mile. 2026-07-31 13:07:18 +00:00
marshal
be75a9e867 Merge pull request #1048 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-31 16:06:43 +03:00
Marshal
66062ac1a2 fix issue 2026-07-31 13:05:04 +00:00
Abubeker Yasin
327f3b140c Merge pull request #1047 from Tria-plc/cbe-integration
feat: ( payment ) specific CBE query descriptions + Payment_Reason
2026-07-31 16:04:44 +03:00
Abubeker Yasin
aa4ce7fd23 feat: ( payment ) specific CBE query descriptions + Payment_Reason 2026-07-31 16:03:28 +03:00
marshal
f03ed7ca53 Merge pull request #1046 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-31 15:30:39 +03:00
Marshal
950d539e37 fix issue 2026-07-31 12:28:37 +00:00
Marshal
7e85c16141 fix issue 2026-07-31 12:23:41 +00:00
marshal
5169558c07 Merge pull request #1045 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-31 15:14:40 +03:00