Commit Graph

2695 Commits

Author SHA1 Message Date
Muluhabt
f2ae9c883f Adding all the tests and fixes to the passengers app 2026-07-21 13:45:49 +03:00
Muluhabt
8ce2d2d874 Merge remote-tracking branch 'origin/dev' into tests
Merging dev to issuefix branch
.
2026-07-21 13:43:59 +03:00
Marshal
9ca4075c1e Implement intercity document handling and rejection notes for contracts 2026-07-21 10:39:21 +00:00
Marshal
6f8456631c Implement intercity document handling and rejection notes for contracts 2026-07-21 10:20:36 +00:00
Marshal
ceb32e0a80 Implement intercity document handling and rejection notes for contracts 2026-07-21 10:15:18 +00:00
Hagernesh
92a0cc197b feat(fleet): make the dashboard stat cards link to their detail
The four headline cards — total vehicles, drivers, fuel spend, maintenance —
were static numbers with no way through to the list behind them. Each now takes
an optional href and, when set, wraps in a link to its detail page (vehicles,
drivers, fuel purchases, maintenance). A card without an href stays exactly as
before. The Card is wrapped rather than turned into a link so Mantine's Card
typing stays clean.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-21 09:22:47 +00:00
Hagernesh
64a4bcbd5c feat(warehouse): make the ops KPI cards link to their detail
The dashboard counters were static — "Trucks on-site" showed a number with no
way to open the list behind it, same for the others. KpiStrip now takes an
optional href per item: a cell with one becomes a link (pointer, hover tint,
aria-label) and a cell without one stays exactly as before, so every existing
strip is unaffected.

The warehouse ops strip wires each card to its detail: trucks on-site to the
Trucks on Site page, received-today and pending-inspection to the inventory
board filtered to RECEIVED, items-aging to the inventory board.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-21 09:22:46 +00:00
Marshal
603537a20b add yard distances management to rule engine
- Introduced new yard distances resource with CRUD operations.
- Created migration for yard distances table with necessary constraints.
- Implemented service and repository for yard distances handling.
- Added controller for API endpoints to manage yard distances.
- Updated rule engine configuration to include yard distances.
- Enhanced rule engine resource page to support yard distance selection.
- Updated contracts and train builder pages to handle new yard distance logic.
- Added error handling utility for better error message extraction.
2026-07-21 08:50:50 +00:00
Hagernesh Tadesse
828a52312e Merge pull request #866 from Tria-plc/dev
Trucks onsite
2026-07-21 11:45:47 +03:00
Sennay
803f721746 Merge pull request #865 from Tria-plc/fix/add-source-maps
Fix/add source maps
2026-07-21 11:32:50 +03:00
SennayT
4914288c03 Enable source maps in Node command for better stack trace debugging 2026-07-21 08:30:52 +00:00
Hagernesh
2397c6bca4 fix(warehouse): show assigned trucks on the Trucks on Site page, not only arrived ones
The page filtered on arrived_at IS NOT NULL, so a truck appeared only once the
warehouse receive flow stamped its arrival. Assigned trucks that had not yet
reached the yard were invisible, which left the page empty whenever nothing had
been received — every assigned truck was missing.

It now lists every truck assigned to a booking that has not departed, from both
haulage paths, tagged INBOUND (assigned, not yet arrived) or ON_SITE (arrived).
A scope toggle filters between them, dwell time shows only once a truck has
actually arrived, and the KPI count on the dashboard stays strict (arrived only).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-21 08:24:39 +00:00
Hagernesh
1fe8c2fd8e feat(export): gate receive on payment and loading on received + GRN
Three export rules that the flow left open.

An unpaid export booking could be received at the warehouse. Receiving is
what starts storage and mints a GRN, so it must not happen against cargo the
customer has not settled. receive() now rejects an unpaid EXPORT booking.
Import is untouched — it arrives OFF a train and its receive is the unload,
so gating that on payment would strand cargo already at the yard.

An allocated export booking could be marked loaded onto its train without
ever reaching the warehouse. An allocation is a plan; the GRN is the proof
the goods are in hand. Two loading paths skipped that check — the per-yard
loadBooking and the workspace confirmScheduleLoading — and both now require
every export booking to be received with a GRN first, however it arrived
(first-mile or the customer's own truck) and whatever it is allocated to.
The rule lives in one shared guard (assertExportReceivedWithGrn) so the two
paths cannot drift.

Export self-haul without a first-mile leg already worked and is unchanged:
assertSelfHaulPaid allows a customer truck when there is no EDR mile leg and
the booking is paid, and addTruck applies the same one-40ft-or-two-20ft rule
to containers and the tonnage drawdown to bulk, exactly as import does.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-21 08:01:32 +00:00
Nathnael
af171974f8 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-21 07:36:09 +00:00
Nathnael
fd5aedcec7 feat(companies): per-document change requests and resubmission review queue
Two review-workflow gaps for freight customer onboarding:

Request for change per document. Backoffice can now flag a single uploaded
document (company document, profile licence, or POA delegation letter) with a
note the customer sees, instead of rejecting the whole role over it. Adds
review_status/review_note/reviewed_by/reviewed_at to freight.files (migration
AddFileReviewStatus, partial index for the gate), a POST
documents/:fileId/request-change endpoint, the backoffice action + modal, and a
portal banner/badge so the customer knows what to re-upload. Re-uploading clears
the flag. Approving a role is blocked while any of its documents has an open
correction; the gate check and the status write share a pessimistic write lock
on the company row (as does the change-request write) so a correction can never
slip in between the check and the profile going Active.

Resubmission is visible to reviewers. When a customer resubmits a rejected role
or amends a change request, backoffice staff are notified (allBackoffice inbox
item, deep-linked to the customer) and the resubmission surfaces in a new
"Pending changes" list view + KPI, since such companies are status = active and
never matched the pending-approval filter.
2026-07-21 07:34:40 +00:00
Nathnael
1cfc0f0fa8 fix(onboarding): stop duplicate company-document upload on finalize
The documents step of CompanyProfileForm uploads company documents via
onUploadDocuments() and then triggers submit synchronously in the same
nextStep() call. The setDocumentFiles({}) that clears the staged files has
not re-rendered by the time finishMutation's closure runs, so reading
documentFiles there re-sent the exact same files and created a duplicate
row per document.

Drop the company-document upload from finishMutation — the documents step
already persisted them. Licenses stay, since they have no auto-upload path.
2026-07-21 07:34:20 +00:00
Hagernesh
36f0045b5d auto generate grn on import arrival unloading 2026-07-21 07:25:45 +00:00
marshal
db466a6b27 Merge pull request #861 from Tria-plc/freight_feature/usermanagement
Update IntercityCapacity to allow null values and handle formatting i…
2026-07-21 09:50:49 +03:00
Marshal
1647681840 Update IntercityCapacity to allow null values and handle formatting in CapacityBadges 2026-07-21 06:46:25 +00:00
Muluhabt
b6eb1d7324 Merge remote-tracking branch 'origin/dev' into tests
Merging to Dev
2026-07-21 09:08:40 +03:00
Stephanos A
7f65bf1409 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-21 00:50:57 +03:00
Stephanos A
bcce93b156 Show discrepancy 2026-07-21 00:50:43 +03:00
Roba Boru
119f841aba Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-21 00:24:52 +03:00
Roba Boru
be933c2c0d Revert departure and arrival datetime of stops 2026-07-21 00:24:32 +03:00
Muluhabt
bc0105f656 Merge remote-tracking branch 'origin/dev' into tests
Merging dev to my local test branch
2026-07-21 00:08:49 +03:00
Stephanos A
24872df0ba Payment discrepancy paid amount update 2026-07-20 23:20:26 +03:00
Stephanos A
ec35b7d65e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-20 23:09:49 +03:00
Stephanos A
2deb5a4a8e Payment discrepancy fixes 2026-07-20 23:09:06 +03:00
Roba Boru
5adb145aca Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 23:08:59 +03:00
Roba Boru
2f52471fad Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 23:08:47 +03:00
Roba Boru
296e3af7dd Fix package price 2026-07-20 23:08:32 +03:00
Stephanos A.
9b66e2e539 Merge pull request #854 from Tria-plc/alpha
Alpha
2026-07-20 22:52:59 +03:00
Stephanos A
226f839ad0 Hide previous payment discrepancy link 2026-07-20 22:52:17 +03:00
Stephanos A
eabc15eebf Payment discrepancy report updates 2026-07-20 22:48:50 +03:00
marshal
370aa09c65 Merge pull request #853 from Tria-plc/freight_feature/usermanagement
changes
2026-07-20 22:44:22 +03:00
marshalyordanos
15705d6b26 changes 2026-07-20 22:43:22 +03:00
marshal
92375caa59 Merge pull request #852 from Tria-plc/freight_feature/usermanagement
Fix CSS formatting for bookings table class to ensure proper styling …
2026-07-20 22:35:50 +03:00
marshalyordanos
8e74604a07 Fix CSS formatting for bookings table class to ensure proper styling and layout. 2026-07-20 22:35:01 +03:00
Stephanos A.
6543ba5266 Merge pull request #851 from Tria-plc/alpha
Payment discrepancy report updates
2026-07-20 22:16:46 +03:00
Stephanos A
19fe977f40 Payment discrepancy report updates 2026-07-20 22:15:32 +03:00
marshal
d3324bc580 Merge pull request #850 from Tria-plc/freight_feature/usermanagement
Enhance BookingRequestsPage layout and styling
2026-07-20 22:11:14 +03:00
marshalyordanos
8aaccf3f36 Enhance BookingRequestsPage layout and styling 2026-07-20 22:10:48 +03:00
marshal
73f067aeed Merge pull request #849 from Tria-plc/freight_feature/usermanagement
Add container and contract information cards to booking detail views
2026-07-20 21:55:57 +03:00
marshalyordanos
43df24142c Add container and contract information cards to booking detail views
- Integrated CompanyInfoCard, ContainersCard, and ContractInfoCard into ChangesRequestedView, DraftBookingView, and ReadonlyBookingView components.
- Updated utils to handle new booking detail types and improve container summary calculations.
- Enhanced ShipmentDetailsCard and ScheduleCard to utilize updated booking detail structure and display relevant information more effectively.
2026-07-20 21:55:17 +03:00
Stephanos A.
8206f2485c Merge pull request #848 from Tria-plc/alpha
Payment discrepancy report updates
2026-07-20 21:52:22 +03:00
Stephanos A
99eb35ff75 Payment discrepancy report updates 2026-07-20 21:50:34 +03:00
marshal
0a73b8edb5 Merge pull request #847 from Tria-plc/freight_feature/usermanagement
chnages
2026-07-20 20:52:57 +03:00
Roba Boru
49d62e3b96 Fix actual price minor 2026-07-20 17:03:31 +03:00
Marshal
26f73cbe5f chnages 2026-07-20 13:55:26 +00:00
Roba Boru
c71f4df6a1 Fix payment discrepancy column 2026-07-20 16:55:09 +03:00