marshal
3ad18277ea
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 17:04:35 +03:00
Hagernesh
be12a9d496
fee invoice frontend
2026-06-18 00:12:59 +00:00
Hagernesh
01aec12ee9
feat(warehouse): Batch 5 — config-driven allocation + storage/demurrage fee rules
...
- Allocation rules engine: cargo/container/trade criteria -> deterministic yard/warehouse/zone by code; wired into auto-unload (fallback to default)
- Storage/demurrage fee rules: configurable freeDays + ratePerDay; most-specific match; fee preview per inventory item
- Inventory demurrage timestamps: inspectionStartedAt, inspectionCompletedAt, readyForPickupAt, releaseDate, gateClearedAt
- Migration 1790000000000 (allocation_rules + fee_rules tables + inventory date columns)
- Frontend: Allocation & Fees config page, automatic Fee Preview modal, plumbing/hooks
- No invoice/payment (Batch 6)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-06-17 23:53:04 +00:00
Hagernesh
89d651693b
automation of loading and unloading
2026-06-17 22:33:06 +00:00
Hagernesh
ff79657018
automation
2026-06-17 22:16:01 +00:00
Hagernesh
5a6e1ef363
automation
2026-06-17 22:01:47 +00:00
Hagernesh
5b8cb16c1a
automation
2026-06-17 22:00:53 +00:00
marshal
1d9e0f2108
add payment currency field to booking forms with ETB/USD selection support
2026-06-17 23:01:08 +03:00
marshal
8396b83f46
add price change confirmation modal and support document replacement for change-requested bookings
2026-06-17 22:23:48 +03:00
marshal
507758ea39
fix: update booking data structure to use meta.total and add null coalescing for checkbox states
2026-06-17 21:14:00 +03:00
marshal
ca7d5cb92b
switch API base URL from localhost to production endpoint
2026-06-17 20:57:42 +03:00
marshal
1141370767
update signup phone validation to enforce Ethiopian mobile format and fix invoice default balance
2026-06-17 20:56:40 +03:00
Marshal
51e0d4897a
update authentication pages with new layout and functionality
2026-06-17 17:49:16 +00:00
marshal
58e6e05458
add login image
2026-06-17 20:30:20 +03:00
Marshal
5b9fed57fe
add payment success and failure pages with environment variable support
2026-06-17 17:13:19 +00:00
Marshal
9dc3bc0765
enhance booking form UI with new components and improved layouts
2026-06-17 14:12:14 +00:00
Marshal
c89f7dcc11
implement PayNowButton component and integrate payment functionality in booking rows
2026-06-17 13:50:57 +00:00
Marshal
7eb6228d31
feat: add shipment tracking feature with live updates
...
- Implemented tracking functionality for bookings, allowing users to track their shipments in real-time.
- Added new API endpoints for fetching tracking data.
- Created a ShipmentTrackingModal component to display tracking information, including current status, checkpoints, and estimated arrival times.
- Enhanced the booking detail view to include tracking options for eligible bookings.
- Updated the train scheduling service to include scheduled departure and arrival times in the response.
- Introduced utility functions for managing tracking stages and statuses.
2026-06-17 13:23:40 +00:00
Hagernesh
f528b75737
Warehouse
2026-06-17 12:44:57 +00:00
Marshal
cd31f3612c
Implement user-based booking access control and enhance booking filtering options
2026-06-17 12:35:29 +00:00
marshal
31710494d4
add telebirr and waafi icon
2026-06-17 14:53:30 +03:00
ghost2023
a4a58d264a
fix
2026-06-17 13:43:35 +03:00
ghost2023
dcb2de7631
fix: settings page
2026-06-17 13:34:23 +03:00
ghost2023
2a0f16241b
fix: improve the setting onboarding flow
2026-06-17 13:17:09 +03:00
ghost2023
e007b28285
fix: type errors
2026-06-17 13:16:06 +03:00
Nathnael Wondisha
cae2848db7
Merge pull request #195 from Tria-plc/freight/feat/portal-fixes
...
Freight/feat/portal fixes
2026-06-17 11:02:33 +03:00
Nathnael
8b7dcdb897
fixes
2026-06-17 08:00:58 +00:00
Nathnael
24f314150c
fix
2026-06-17 08:00:58 +00:00
Nathnael
c59e100e5e
style: ui fix in scheduling
2026-06-17 08:00:58 +00:00
Nathnael Wondisha
815c3f4548
Merge branch 'dev' into freight/develop
2026-06-17 10:19:43 +03:00
ghost2023
c96c863070
fix
2026-06-17 10:15:14 +03:00
Nathnael
3919464acb
fix: the route direction
2026-06-17 07:14:21 +00:00
Nathnael
4f20b07d81
refactor: the portal dashboard
2026-06-17 07:02:15 +00:00
Nathnael
1ca98f32ea
style: improved the review ui
2026-06-17 06:24:03 +00:00
marshal
0b7492c502
Switch API configuration from localhost to production URL in portal and add localhost comment in backoffice
2026-06-17 07:47:09 +03:00
Marshal
2de3f78fb0
Add payments management features including summary and listing, and integrate with the dashboard
2026-06-17 04:35:43 +00:00
Marshal
648f4f2ee4
Add fleet management and admin permissions, and update controllers to enforce new permissions
2026-06-17 01:56:56 +00:00
Marshal
fe679d23d4
Refactor payment method handling and simplify provider options in PaymentMethodModal
2026-06-17 01:19:04 +00:00
Marshal
c76f8648a9
Updated signature handling, added booking detail components, introduced a signature management page, updated routing, enabled document downloads, and simplified the profile page.
2026-06-17 01:02:09 +00:00
Marshal
e65addc619
Add signature menu item and wrap MySignatureCard in a div on ProfilePage
2026-06-17 00:09:28 +00:00
Marshal
7106a549ab
Add signature management features for booking contracts
...
- Implement MySignatureCard component for viewing and updating saved signatures.
- Enhance BookingContractPage to utilize saved signatures for contract signing.
- Introduce hooks for fetching and saving user signatures.
- Update ContractView interface to include saved signature details.
- Create signatures service for API interactions related to user signatures.
2026-06-16 23:06:41 +00:00
Marshal
853c2b2765
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 22:50:01 +00:00
marshal
dbe4983b75
Pin Mantine dependencies to portal's node_modules and optimize dependency pre-bundling to prevent React version conflicts
2026-06-17 01:29:48 +03:00
marshal
b191fe2335
Update Vite configuration to use Vitest for testing, add TypeScript source resolution for types, and deduplicate Mantine dependencies to ensure shared context.
2026-06-17 00:44:39 +03:00
marshal
6d8eb65a36
Add TypeScript type annotations to Vite config and dedupe Mantine dependencies
2026-06-16 23:26:03 +03:00
marshal
e815b4d976
Refactor API base URL configuration to use centralized constant across applications
2026-06-16 23:06:46 +03:00
ghost2023
1861d45f1e
feat: add the payment to booking page
2026-06-16 20:38:48 +03:00
ghost2023
f3284a13d0
refactor(workflow): Revamp booking progress stages and status mapping
2026-06-16 20:37:40 +03:00
Marshal
e8c6a2bbd2
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 15:28:38 +00:00
Marshal
052829c7e6
Add freight demo data seeder and permissions management
...
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
2026-06-16 15:28:10 +00:00
