Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,847 Commits 96 Branches 0 Tags
25bac0af529e60a3fbaf3a024ef30a455576e33b
Commit Graph

2962 Commits

Author SHA1 Message Date
mulish77
25bac0af52 Merge pull request #999 from Tria-plc/tests 
Fixing the round trip disabling dates
 2026-07-28 16:27:22 +03:00
mulish77
804f3bc3d4 Update main.ts 2026-07-28 16:25:30 +03:00
mulish77
9231f89736 Update main.ts 2026-07-28 16:24:21 +03:00
mulish77
0e8c6e0345 Update main.ts 2026-07-28 16:18:07 +03:00
Muluhabt
0dfb0cbe28 Fixing the round trip disabling dates 2026-07-28 16:12:44 +03:00
Nathnael Wondisha
8309483d8f Merge pull request #996 from Tria-plc/freight/fix/auth-separation 
feat(auth): add login audience middleware (EDRFREIGHT-415)
 2026-07-28 13:52:42 +03:00
marshal
3e828d3a3b Merge pull request #997 from Tria-plc/freight_feature/usermanagement 
let customers dispute booking duty/tax advice so GL Ethiopia can re-a…
 2026-07-28 13:49:47 +03:00
Marshal
891311d861 let customers dispute booking duty/tax advice so GL Ethiopia can re-advise 2026-07-28 10:48:27 +00:00
Nathnael
e823874d39 feat(auth): add login audience middleware (EDRFREIGHT-415) 2026-07-28 10:46:55 +00:00
mulish77
881f7e1e56 Merge pull request #994 from Tria-plc/tests 
Fixing cors issue in produciton
 2026-07-28 13:37:53 +03:00
Muluhabt
83137ea0ef Fixing cors issue in produciton 2026-07-28 13:37:10 +03:00
Abubeker Yasin
7e1727a7bf Merge pull request #993 from Tria-plc/alpha 
fix: ( bookings ) require explicit tickets:generate to issue reservat…
 2026-07-28 12:19:47 +03:00
Abubeker Yasin
ed09bfd8b6 fix: ( bookings ) require explicit tickets:generate to issue reservations 2026-07-28 12:18:25 +03:00
marshal
9911d862f7 Merge pull request #992 from Tria-plc/freight_feature/usermanagement 
Pre-declaration Djibouti GL assignee request flow
 2026-07-28 12:17:50 +03:00
Marshal
e1c831211f Pre-declaration Djibouti GL assignee request flow 2026-07-28 09:01:23 +00:00
Abubeker Yasin
7276c9881f Merge pull request #991 from Tria-plc/alpha 
Alpha
 2026-07-28 11:41:33 +03:00
Abubeker Yasin
0d46f3715e fix: ( payments ) bounce D-Money checkout via /go and follow user domain 2026-07-28 11:39:48 +03:00
Abubeker Yasin
686350135d refactor: ( payment ) allow payment change based on platform change 2026-07-28 10:42:02 +03:00
marshal
2d8b9203d5 Merge pull request #989 from Tria-plc/freight_feature/usermanagement 
update body-parser implementation to use Nest's API and improve depe…
 2026-07-28 10:25:05 +03:00
Marshal
653d5782ee update body-parser implementation to use Nest's API and improve dependency handling 2026-07-28 07:21:04 +00:00
mulish77
b14c1e9ad8 Merge pull request #988 from Tria-plc/tests 
fix(bookings): apply promo discount to client-subtotal totals in gues…
 2026-07-28 09:58:39 +03:00
Muluhabt
acd4b37d59 fix(bookings): apply promo discount to client-subtotal totals in guest/authenticated booking 
createGuestBooking (ONE_WAY) and createGuestRoundTripBooking overwrote the
authoritative discounted total with an undiscounted client-provided subtotal
(per-seat sum or reviewedTotalMinor) whenever one was present, silently
dropping a valid promos discount at booking-creation time, even though the
same promo was correctly applied in the fare-breakdown/quote step. Only the
no-client-subtotal fallback branch subtracted discountMinor.

Mirrors the existing usedClientSubtotal fix already present in
BookingsService.createOneWayBooking (H-13): subtract discountMinor from the
client subtotal before storing it, in ETB and display currency. TRANSIT and
ROUND_TRIP_TRANSIT were unaffected since neither overrides with a client
subtotal.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
 2026-07-28 09:42:27 +03:00
Abubeker Yasin
99838aa8b6 Merge pull request #987 from Tria-plc/alpha 
Alpha
 2026-07-28 09:36:03 +03:00
marshal
646a029d1a Merge pull request #986 from Tria-plc/freight_feature/usermanagement 
update body-parser implementation to use Nest's API and improve depe…
 2026-07-28 09:34:01 +03:00
Marshal
7fcf3a7084 update body-parser implementation to use Nest's API and improve dependency handling 2026-07-28 06:33:26 +00:00
Abubeker Yasin
236d55580a fix: ( bookings ) restrict reservation issuance to admins 2026-07-28 09:31:01 +03:00
mulish77
3646f4cfb8 Merge pull request #985 from Tria-plc/tests 
fix(search): compute next-day date bound with real arithmetic, not st…
 2026-07-28 09:30:13 +03:00
Muluhabt
1d6f89df29 fix(search): compute next-day date bound with real arithmetic, not string padding 
Searching on the last day of a month (e.g. 2026-07-31) built an invalid
"next day" string like "2026-07-32" for the Prisma date-range filter,
crashing POST /search with a PrismaClientValidationError in production.
Affected searchSchedules, searchAlternatives, classifyEmptySearch, and
searchTransitOptions — all four built the bound the same way.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
 2026-07-28 09:28:34 +03:00
marshal
161bdfff71 Merge pull request #984 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-28 09:21:12 +03:00
Marshal
c1c35e78d4 increase JSON body size limit, update awaiting shipment endpoint handling, and enhance contract document editor UI 2026-07-28 06:18:04 +00:00
Marshal
8319aad5c3 increase JSON body size limit, update awaiting shipment endpoint handling, and enhance contract document editor UI 2026-07-28 06:16:56 +00:00
marshal
bd3ff193d6 Merge pull request #983 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-28 08:58:28 +03:00
Marshal
f40a079420 update contract document handling and improve clarity in UI messages 2026-07-28 05:51:24 +00:00
Marshal
8477de41a9 changes 2026-07-28 05:10:01 +00:00
marshal
f47a99c034 Merge pull request #982 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-28 08:03:48 +03:00
Marshal
2429f6b629 implement contract cancellation feature and update contract statuses 
- Added functionality to cancel contracts, allowing users to provide a reason for cancellation.
- Updated contract statuses to include SUSPENDED and changed CLOSED to COMPLETED.
- Enhanced the UI to reflect the new cancellation option and updated messaging for contract statuses.
- Refactored contract booking actions to accommodate changes in booking logic for ONE_TIME and GENERAL contracts.
- Removed clearance document management from the contract detail page, as it is now handled per booking.
- Introduced a SQL script to reset bookings and train schedules for development purposes.
 2026-07-28 05:02:58 +00:00
Marshal
481878e553 paginate wagons, locomotives and routes lists server-side 2026-07-27 21:27:36 +00:00
marshal
260a3b1198 Merge pull request #981 from Tria-plc/freight_feature/usermanagement 
update locaomotive and fix wagon transfer issue
 2026-07-27 23:55:12 +03:00
Marshal
496c66017f update locaomotive and fix wagon transfer issue 2026-07-27 20:34:14 +00:00
marshal
691195c9f9 Merge pull request #980 from Tria-plc/freight_feature/usermanagement 
fix: correct column name in orderBy clause for listRequests method
 2026-07-27 17:49:35 +03:00
Marshal
deadc59277 fix: correct column name in orderBy clause for listRequests method 2026-07-27 14:44:16 +00:00
Muluhabt
11e6d226df Fixing build issues 2026-07-27 15:30:28 +03:00
Muluhabt
e51d60d836 Adding train delay minutes and also disabling no schedule days in the booking selection 2026-07-27 15:10:10 +03:00
mulish77
fd699e824e Merge branch 'dev' into tests 2026-07-27 14:59:00 +03:00
Muluhabt
d9998ffba7 Merge remote-tracking branch 'origin/dev' into tests 
Merging remote repo
 2026-07-27 14:44:50 +03:00
Muluhabt
d71f6dc1b3 Adding train delay minutes and also disabling no schedule days in the booking selection 2026-07-27 14:42:57 +03:00
Nathnael Wondisha
8449ce0ef3 Merge pull request #972 from Tria-plc/freight/nati-1 
IAM Seeder centralized
 2026-07-27 14:11:16 +03:00
Hagernesh
101bf69271 feat(warehouses): map GRN numbers to the goods owner 
GRN-<DIR>-<DATE>-<REF8> carried no owner, so a note couldn't be
identified by who owns the cargo. Add an owner segment sourced from the
booking's company at every generation point (import, export, facility,
manual receive), keep REF8 for uniqueness, and label the GRN document
row Owner's Name.
 2026-07-27 09:57:59 +00:00
Hagernesh Tadesse
2a97bd4235 Merge pull request #973 from Tria-plc/milesfixes 
Truck detention was timed once per delivery, so every truck on a mult…
 2026-07-27 12:37:37 +03:00
Nathnael
03b8ca0ce7 refactor: centralized the iam seeder 2026-07-27 08:42:27 +00:00