marshal
ca5877d25a
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-19 15:58:36 +03:00
marshal
85110adc3f
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-19 15:57:26 +03:00
Nathnael
653f39ec65
feat: add the company profile support to the ui
2026-06-19 12:32:55 +00:00
Nathnael
7ce5f23005
style: profile page ui improvment
2026-06-19 12:32:55 +00:00
Nathnael
9284e72c14
fix: document uploaded
2026-06-19 12:32:55 +00:00
Nathnael
8e278a3bd6
feat: add company selection to settings onboarding
2026-06-19 12:32:55 +00:00
Marshal
3591abd27f
feat(bookings): enhance booking details with consolidation notices and streamline form handling
2026-06-19 10:45:11 +00:00
yaschalew
5e1d53b866
fix file upload
2026-06-19 08:48:58 +03:00
marshal
f1dfbbcc3f
Replace EDR logo image with Train icon in FreightSidebar
2026-06-19 01:13:52 +03:00
marshal
72b63c319e
- Fix shipping line mapping to use ID instead of name in EditBookingPage and NewBookingPage
2026-06-19 01:07:05 +03:00
marshal
1a3d85e46a
Remove unused ArrowLeft icon import from PaymentFailurePage
2026-06-19 00:53:29 +03:00
marshal
3f81f45c6d
Update login page logo from SVG to PNG format
2026-06-19 00:47:46 +03:00
marshal
8264df133f
Redesign payment verification UI with Mantine components and fix route direction logic
...
- Refactor CheckPaymentPage and PaymentFailurePage to use Mantine UI components with modern card-based layouts
- Add gradient headers, themed icons, and improved visual hierarchy for payment status states
- Implement PaymentCard wrapper component for consistent styling across payment pages
- Update route direction logic to trim country values and simplify Djibouti import/export detection
- Replace shadcn/ui components with M
2026-06-19 00:42:27 +03:00
Marshal
ed114b1999
feat(cargo-types): add route for cargo types detail view and enhance CargoTypesPage with breadcrumbs and improved navigation
2026-06-18 20:49:46 +00:00
Marshal
aa105a5e76
feat(cargo-types): add CargoTypesPage for managing freight cargo categories and types
2026-06-18 20:19:40 +00:00
Marshal
be7c569363
feat(train-scheduling): add day-level booking pool and available days query
2026-06-18 19:48:42 +00:00
Nathnael Wondisha
1ea2f065c6
Merge branch 'freight/develop' into freight/feat/company-profile
2026-06-18 17:48:07 +03:00
Nathnael
c6179c046c
feat(wip): up the settings onboaridng flow
2026-06-18 14:45:14 +00:00
Marshal
30bfc84f8f
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 14:13:50 +00:00
Marshal
421e0266bc
feat(train-scheduling): implement day-level booking pool
...
- Added `unplaced` method in `BookingNotifierService` to log warnings for bookings that cannot be placed on any train.
- Introduced `getAvailableDays` method in `TrainSchedulingService` to retrieve distinct days with open departures for a given route.
- Created `AvailableDaysQueryDto` for querying available days based on origin and destination yards.
- Updated `TrainSchedulingController` to expose an endpoint for available days.
- Modified frontend components to support day-level booking, allowing customers to select only a day without pinning to a specific train.
- Removed references to train schedules in booking forms and review steps, emphasizing day selection.
- Added a database migration to create an index for efficient querying of bookings by route and day.
2026-06-18 14:12:46 +00:00
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
ghost2023
e9149242b2
feat: setup the company profiles
2026-06-18 16:38:46 +03:00
Marshal
578012dffd
fix: improve route direction logic to align with backend derivation rules
2026-06-18 12:52:01 +00: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
