Commit Graph

3640 Commits

Author SHA1 Message Date
Hagernesh
59f06a9bd1 feat(warehouses): enforce yard/zone capacity limits; broaden dispatcher perms
Yard create/update now rejects capacities that overflow the parent warehouse,
and zone create/update rejects capacities that overflow the parent yard, via
BadRequestException. Dispatcher permission preset expanded to full CRUD on
warehouse and fleet management; allocation and fee rules remain view-only.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-22 12:15:47 +00:00
Stephanos A.
09ac88f01d Merge pull request #909 from Tria-plc/alpha
Ticketing seats conflict issue resolution
2026-07-22 14:32:25 +03:00
Stephanos A
c6f6616218 Restore ticket generation guard 2026-07-22 14:31:27 +03:00
Stephanos A
7ff98bfb81 Ticketing seats conflict issue resolution 2026-07-22 14:28:47 +03:00
Stephanos A.
567baa12e9 Merge pull request #908 from Tria-plc/alpha
Ticketing updates
2026-07-22 14:07:50 +03:00
Stephanos A
2632e2d50c Ticketing updates 2026-07-22 14:06:00 +03:00
marshal
2f58986f0a Merge pull request #907 from Tria-plc/freight_feature/usermanagement
chnages
2026-07-22 14:04:45 +03:00
Marshal
2aa405d8e4 chnages 2026-07-22 11:04:17 +00:00
marshal
4f0071894d Merge pull request #906 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-22 13:58:28 +03:00
Hagernesh Tadesse
11437cfd35 Merge pull request #905 from Tria-plc/testfixes
Fixes
Download Excel template with instructions
Parse uploaded file, preview trucks
Validate container assignments (1x40ft OR 2x20ft per truck)
Commit bulk upload in one call
2026-07-22 13:54:59 +03:00
Marshal
996df4a7f8 chnages 2026-07-22 10:52:27 +00:00
Marshal
44cad7a52b changes 2026-07-22 10:50:36 +00:00
Stephanos A.
ad4e1c215b Merge pull request #904 from Tria-plc/alpha
Ticket generation updates
2026-07-22 13:46:33 +03:00
Stephanos A
698dbd47e6 Ticket generation updates 2026-07-22 13:43:38 +03:00
Hagernesh
5ebe698c73 Merge branch 'testfixes' of github.com:Tria-plc/edr-platform into testfixes
it is

XX

Y
2026-07-22 10:37:54 +00:00
Stephanos A.
14aa78351b Merge pull request #903 from Tria-plc/alpha
Ticketing updates
2026-07-22 12:55:47 +03:00
Stephanos A
44b4779ca6 Ticketing updates 2026-07-22 12:54:21 +03:00
Stephanos A.
170ea21808 Merge pull request #902 from Tria-plc/alpha
Ticket generate on confirmation update
2026-07-22 12:19:18 +03:00
Stephanos A
e0dc60361a Ticket generate on confirmation update 2026-07-22 12:17:51 +03:00
Marshal
b5546b9d6f feat(freight-me): add position type lookup and enrich user profile with position type 2026-07-22 08:57:47 +00:00
Stephanos A.
5002ccb0df Merge pull request #901 from Tria-plc/alpha
Alpha
2026-07-22 11:45:37 +03:00
Stephanos A
32e1c5e570 Schedule date and time picket updates 2026-07-22 11:44:24 +03:00
Stephanos A
e45c1bcfe2 Ticket generation issue resolution 2026-07-22 11:15:30 +03:00
Stephanos A
de17365802 Separate ticket generation for portal and back office 2026-07-22 11:06:16 +03:00
Nathnael Wondisha
0fb8eba4df Merge pull request #899 from Tria-plc/freight/feat/fixes-v1
Freight/feat/fixes v1
2026-07-22 11:02:11 +03:00
Nathnael
24c2ef5d65 fix: payement table 2026-07-22 08:01:54 +00:00
Hagernesh
7763d67ea8 feat: bulk upload for customer truck assignments
Add Excel template-based bulk upload for customer truck assignments
(self-haul + EDR). Supports up to 2x20ft or 1x40ft containers per truck.

API: POST /bookings/:id/customer-trucks/bulk accepts array of trucks.
Portal: DownloadTemplate → ParseExcel → PreviewUpload → Commit flow.
Validates truck load rules per booking container configuration.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-22 08:01:16 +00:00
Hagernesh
5395d4f346 Customer Name + Customer ID columns removed from the Export Marshalling Document 2026-07-22 08:01:15 +00:00
Nathnael
16dc143e66 fix: the invoice and receipt documents in the booking 2026-07-22 08:00:38 +00:00
Nathnael
905bf75bce fix: test 2026-07-22 07:47:25 +00:00
Hagernesh
ba6fd0f41b feat: bulk upload for customer truck assignments
Add Excel template-based bulk upload for customer truck assignments
(self-haul + EDR). Supports up to 2x20ft or 1x40ft containers per truck.

API: POST /bookings/:id/customer-trucks/bulk accepts array of trucks.
Portal: DownloadTemplate → ParseExcel → PreviewUpload → Commit flow.
Validates truck load rules per booking container configuration.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-22 07:46:54 +00:00
Stephanos A.
ae179d85d2 Merge pull request #900 from Tria-plc/alpha
Ticket number on voucher updates
2026-07-22 10:46:12 +03:00
Stephanos A
e6e2c88054 Ticket number on voucher updates 2026-07-22 10:44:48 +03:00
Hagernesh
ecd85d9d7c Customer Name + Customer ID columns removed from the Export Marshalling Document 2026-07-22 07:41:48 +00:00
Nathnael
1be6744f09 fix: test 2026-07-22 07:34:41 +00:00
Stephanos A.
bc3a55e9a6 Merge pull request #898 from Tria-plc/alpha
Ticket generation updates
2026-07-22 10:33:14 +03:00
Stephanos A
838cedae0d Ticket generation updates 2026-07-22 10:29:48 +03:00
Nathnael
82c5fb88dc fix: type errors 2026-07-22 07:29:16 +00:00
Hagernesh Tadesse
c836b5b94d Merge pull request #897 from Tria-plc/testfixes
Roles: Operations Chief (full CRUD) and Dispatcher (warehouse operations) positions
2026-07-22 10:28:02 +03:00
Nathnael
1da08131ea fix: merge 2026-07-22 07:26:25 +00:00
Hagernesh
64b205a71e feat(seed): operations_chief and dispatcher freight positions
Operations Chief gets the full freight permission catalog (all CRUD).
Dispatcher gets warehouse floor operations — receive/GRN, load/unload,
inspect, dispatch, gate, release/deliver, interchange docs, fee
invoices, mile truck assignment — with allocation & fee rules view-only.
2026-07-22 07:25:52 +00:00
Hagernesh
19906b273e fix(operations): prefill booking context on single assign; enforce per-truck container loads
- single-row Assign vehicle uses the full single-record flow (details + containers)
- release() rejects exit containers not assigned to the departing truck
- weighing modal offers only the selected truck's assigned containers
2026-07-22 07:24:14 +00:00
Nathnael
8d4b133277 fix: port 2026-07-22 07:20:51 +00:00
Nathnael
179d6eea9e Merge branch 'dev' into freight/feat/fixes-v1 2026-07-22 07:20:08 +00:00
Nathnael
a5ab6fe5c1 chore: filter out safari phone as foreign 2026-07-22 07:18:07 +00:00
Hagernesh
fd3212f326 fix(warehouses): exit-paper truck weight from summed container VGM
Per-truck weight now sums the departing truck's container vgm_tons
(recorded net for bulk); weighed gross only as fallback.
2026-07-22 07:05:26 +00:00
Nathnael
82cb5508cc chore: rm the active company profile 2026-07-22 06:43:05 +00:00
Stephanos A.
7372ecbbd8 Merge pull request #896 from Tria-plc/alpha
Ticket generation updates
2026-07-22 08:53:03 +03:00
Stephanos A
0d8e122de7 Ticket generation updates 2026-07-22 08:51:33 +03:00
Stephanos A.
b927b9abe4 Merge pull request #895 from Tria-plc/alpha
Tables gagination updates
2026-07-22 08:04:22 +03:00