natib21
7fed72ea7a
fix
2026-06-24 08:16:24 +00:00
yaschalew
5897dc342d
fix conflict
2026-06-24 10:08:19 +03:00
natib21
f6ffea2b87
fix return value
2026-06-24 06:38:03 +00:00
natib21
2737866366
fix first mile
2026-06-23 15:40:21 +00:00
natib21
dbb9870cb6
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-23 15:19:23 +00:00
natib21
448b7fe969
fix last first mile
2026-06-23 15:18:32 +00:00
Nathnael
10d74a65b0
fix: type error and fixes
2026-06-23 14:20:16 +00:00
Nathnael
cbbad02b29
fix: type error and other fixes
2026-06-23 13:14:06 +00:00
ghost2023
cdfe7c1f5b
fix: type errors
2026-06-23 15:02:25 +03:00
ghost2023
3174f97e24
fix: unused imports
2026-06-23 14:04:07 +03:00
SennayT
94585a36d9
fix tria package on edr freight frontends
2026-06-23 11:34:52 +03:00
SennayT
b2767a1cbf
fix package issue for freight api
2026-06-23 11:22:41 +03:00
ghost2023
fab05569d4
fix
2026-06-23 10:03:54 +03:00
Nathnael Wondisha
56968e0709
Merge branch 'freight/develop' into freight/style/ui-sync
2026-06-23 09:51:24 +03:00
Nathnael
a6f3fd5643
feat: finish company profile in the backoffice
2026-06-23 06:45:29 +00:00
Nathnael
f7cbb6af6f
fix: query key
2026-06-22 13:52:34 +00:00
Roba Boru
aadf1644fb
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-22 16:46:44 +03:00
Nathnael
2700a3edec
refactor: migrate from most of the custom hooks into the api.ts
2026-06-22 13:46:38 +00:00
Roba Boru
1456ca7e9c
Added download voucher option and manage booking
2026-06-22 16:46:24 +03:00
marshal
02427f72f1
Merge pull request #243 from Tria-plc/freight_feature/profile
...
Freight feature/profile
2026-06-22 15:49:25 +03:00
Marshal
39f2c99395
feat: add phone number normalization to Ethiopian E.164 format in CompanyProfileForm
2026-06-22 12:35:01 +00:00
Nathnael
c6bc636495
feat(customers): implement customer management page with mock data
...
- Created CustomersPage component to display a list of companies with search and pagination features.
- Added mock data for companies, including various statuses and profiles.
- Implemented a service layer to simulate API calls for fetching company data, bookings, documents, and payments.
- Defined TypeScript types for company and related entities to ensure type safety.
- Integrated Mantine components for UI consistency and improved user experience.
2026-06-22 12:32:52 +00:00
Marshal
30b022356c
feat: update onboarding and company role handling to support multiple service types
2026-06-22 12:30:44 +00:00
Nathnael
d66ccc5363
refactor: migrated of the customer hooks for warehouse data fetching
2026-06-22 12:25:20 +00:00
Marshal
ad0043b580
feat: enhance service profile handling for customer companies
2026-06-22 12:11:10 +00:00
Eyob T.
8d0080f074
Security patch
2026-06-22 15:06:08 +03:00
Marshal
3e45d694da
changes
2026-06-22 11:54:10 +00:00
Nathnael
74e03f2067
refactor: migrate to use the central api obj
2026-06-22 11:52:59 +00:00
Marshal
b031ddb204
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-22 11:43:38 +00:00
Marshal
ff039bd440
feat(bookings): update payment eligibility logic for general contracts and one-time bookings
2026-06-22 11:40:35 +00:00
yaschalew
78692c6b59
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-22 14:23:59 +03:00
yaschalew
7f51f24a77
fix conflict
2026-06-22 14:23:43 +03:00
ghost2023
992ba8f55f
fix: migration issue
2026-06-22 14:20:17 +03:00
ghost2023
b1318a6ef5
fix: pruge the js blob
2026-06-22 14:13:15 +03:00
Dagimassefa
b3bfa899f5
update
2026-06-22 12:29:48 +03:00
Nathnael Wondisha
fff679369d
Merge branch 'freight/develop' into freight/style/ui-sync
2026-06-22 11:58:18 +03:00
Muluhabt
41c51b7986
Adding local packages
2026-06-22 11:53:17 +03:00
Nathnael
8fb432e30f
style: finalize the style of the dashboard
2026-06-22 08:52:45 +00:00
Nathnael
feddce8a0c
style: use the proper primary color
2026-06-22 08:11:11 +00:00
Nathnael
ec708d85b3
style: update the overview style
2026-06-22 08:05:04 +00:00
natib21
6b1bbd8e59
last mile
2026-06-22 07:58:56 +00:00
natib21
bee47b231a
add column
2026-06-22 07:54:07 +00:00
natib21
00d722fa4f
last mile
2026-06-22 07:49:47 +00:00
Nathnael
9a224e9baf
style: WIP ui updates
2026-06-22 07:44:03 +00:00
marshal
b777da4bd7
remove defect
2026-06-22 10:01:07 +03:00
natib21
f2d0a90065
:Merge branch 'freight/feature/vehicle' of github.com:Tria-plc/edr-platform into freight/feature/vehicle
2026-06-22 06:55:03 +00:00
Nathnael
e6101c5514
style: WIP BatchBoard and train schedule
2026-06-22 06:38:05 +00:00
Hagernesh
0939202c8f
Merge freight/develop into Warehouse_updates
2026-06-21 15:41:32 +00:00
Hagernesh
14b6219c9d
chore(warehouse): comprehensive demo seeder — populate every queue coherently
...
WarehouseDemoSeeder creates one coherent WH-DEMO-* dataset so every tab shows data:
- Export Receive (3 PAID export bookings, no inventory)
- Export Ready To Load (3 READY_FOR_LOADING + PASSED)
- Export Loaded/Dispatch (2 LOADED)
- Import Arrive (1 ARRIVED Djibouti→Ethiopia train, 3 IN_TRANSIT bookings)
- Import Unloaded (3 UNLOADED)
- Import Dispatch (3 READY_FOR_PICKUP + PASSED)
Idempotent (sentinel WH-DEMO-RCV-1); dedicated refs so it never collides with SEED-* data.
Verified: all queues populated, dashboard shows 19 items across all 7 statuses.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-06-21 15:06:50 +00:00
Hagernesh
41d21edae5
feat(warehouse): Batch 10 — import post-inspection actions (pickup / last-mile / store / dispatch)
...
- READY_FOR_PICKUP transitions now → DELIVERED (customer pickup) OR DISPATCHED (dispatch out) OR
STORED (operator-chosen storage) — pickup and dispatch kept separate. No auto-storage.
- GET /warehouse-inventory/import/pickup-ready-queue: READY_FOR_PICKUP import items (shared query
with the unloaded queue, route-derived import filter)
- WarehouseInventoryTable: PICKUP_READY rows now show explicit Store + Dispatch buttons alongside
the customer-pickup (release/deliver) next action; reuses the existing advance() dispatcher
- Import → Dispatch Queue tab renders pickup-ready items via InventoryWorkbench (all existing
actions + modals intact) with Last Mile shown only when door delivery was requested
- Verified: pickup-ready item → Store → STORED; → Dispatch → DISPATCHED
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-06-21 14:38:23 +00:00
