Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,061 Commits 96 Branches 0 Tags
3a3c309a5b450459d20e388415d5419b5b1efc9e
Commit Graph

4061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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