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
Abubeker Yasin
93615158ab
fix: ( booking ) remove duplicated auditservice
2026-07-27 11:27:21 +03:00
Hagernesh
500668a415
Truck detention was timed once per delivery, so every truck on a multi-truck last mile was billed the same number of days regardless of when it actually arrived or was released. Each truck now carries its own detention clock (destination arrival → release) with its own rule match, chargeable days and amount; the modal records and displays the window per truck, and the summary shows the longest detention plus the combined total. Also corrected a false no detention rule matches warning that appeared whenever more than one truck was assigned.
2026-07-27 08:24:07 +00:00
Abubeker Yasin
3e2ae80e5a
Merge pull request #969 from Tria-plc/alpha
...
Alpha
2026-07-27 11:08:44 +03:00
Abubeker Yasin
f5bdc6971d
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-27 11:07:44 +03:00
Abubeker Yasin
afcae037fc
refactor: ( bookings ) unify authenticated booking flow with guest service
2026-07-27 11:07:33 +03:00
Nathnael
1fe10ee3c2
feat(seed): implement local IAM baseline seeder with configurable settings
2026-07-27 07:09:09 +00:00
marshal
89a0bc6948
Merge pull request #968 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-27 09:00:59 +03:00
Marshal
15d78e1d67
fix issue
2026-07-27 05:59:49 +00:00
Marshal
773456c256
refactor DocReviewAlertButton and FreightDashboardHeader comments for clarity and accuracy
2026-07-27 05:07:09 +00:00
marshal
fe407d8d40
Merge pull request #967 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-26 22:20:01 +03:00
Marshal
bcf25538b6
add contract hazard declaration, DO collection dates, and booking request currency migrations; implement article body diff component and integrate into contract revision timeline
2026-07-26 19:14:39 +00:00
Marshal
5fa012cad3
add contract hazard declaration, DO collection dates, and booking request currency migrations; implement article body diff component and integrate into contract revision timeline
2026-07-26 19:09:01 +00:00
marshal
952078086e
Merge pull request #966 from Tria-plc/freight_feature/usermanagement
...
add dispute functionality for contract duty and implement collection…
2026-07-26 21:24:17 +03:00
Marshal
af85f20789
add dispute functionality for contract duty and implement collection dates
2026-07-26 18:23:37 +00:00
marshal
2da27ef127
Merge pull request #965 from Tria-plc/freight_feature/usermanagement
...
add dispute functionality for contract duty and implement collection…
2026-07-26 20:59:16 +03:00
Marshal
225d2c8229
add dispute functionality for contract duty and implement collection dates
2026-07-26 17:58:37 +00:00
marshal
12bab14b06
Merge pull request #964 from Tria-plc/freight_feature/usermanagement
...
add dispute functionality for contract duty and implement collection…
2026-07-26 20:30:31 +03:00
Marshal
bfea9de660
add dispute functionality for contract duty and implement collection dates
2026-07-26 17:30:00 +00:00
