Commit Graph

376 Commits

Author SHA1 Message Date
Marshal
e14df58a47 fix issues 2026-07-03 13:26:40 +00:00
marshal
02ee4cc743 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 13:54:29 +03:00
Nathnael
515d59fb53 fix: file preview 2026-07-03 08:35:57 +00:00
marshal
4d17787dbd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 11:28:55 +03:00
Nathnael
3925a11dd4 feat: add invoice to customer detail on backoffice 2026-07-03 07:21:19 +00:00
Nathnael
1611c6be22 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-03 06:28:38 +00:00
Nathnael
1e408536aa feat: add invoice pages and api to the backoffice 2026-07-03 06:21:25 +00:00
Marshal
75cda22a48 Implement consolidated booking handling and UI updates for shared wagons 2026-07-03 05:07:23 +00:00
marshal
01acd071cf Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-03 06:39:02 +03:00
Marshal
56de90892d Add booking window management and locomotive scheduling features
- Implemented migration to release stuck assigned locomotives.
- Added schedule window phases to train schedules.
- Created booking batch offers table for partial capacity bookings.
- Developed BookingSplitService to handle partial booking offers and splits.
- Introduced BookingWindowService to manage booking window lifecycle and transitions.
- Added BookingBatchOffer entity to represent offers made during booking splits.
- Enhanced locomotive options with warnings for scheduling.
- Created UpcomingWindowsSection component to display upcoming booking windows.
2026-07-03 03:36:06 +00:00
marshal
d4561b948a Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:02:22 +03:00
Marshal
dd47068a4b finilize gl flow for export 2026-07-02 17:55:59 +00:00
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
eb5d8a7411 fix 2026-07-02 14:42:04 +00:00
natib21
2424e96e74 fix 2026-07-02 14:34:22 +00:00
natib21
e5fed081fc fix 2026-07-02 14:27:09 +00:00
natib21
7d85f5dc2e fix 2026-07-02 14:18:53 +00:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
natib21
34b87bbcee fix 2026-07-02 14:06:45 +00:00
natib21
d8f1ed8899 fix issue 2026-07-02 13:44:19 +00:00
Marshal
860af20e0d Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 13:29:10 +00:00
Marshal
fec2a5d320 update import gl flow 2026-07-02 13:27:59 +00:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
natib21
c8b7d76073 fix 2026-07-02 12:50:49 +00:00
natib21
43a32f192f fix 2026-07-02 12:47:10 +00:00
natib21
58b3805d0b fix 2026-07-02 12:43:03 +00:00
natib21
657f3bd2ab fix 2026-07-02 12:39:47 +00:00
natib21
adde596289 fix 2026-07-02 11:32:16 +00:00
natib21
ff7e20d2ee fix 2026-07-02 11:22:35 +00:00
natib21
e59a8f9802 fix delete api 2026-07-02 10:54:43 +00:00
natib21
f4f98575f1 fix error 2026-07-02 10:48:31 +00:00
natib21
4519a1d75d fix 2026-07-02 10:33:32 +00:00
natib21
1c88bd8d68 fix 2026-07-02 10:27:01 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
natib21
e0010695be fix 2026-07-02 09:41:52 +00:00
hagiye
ad9f9de7a8 Truck Assign by customer plus Handover signature on portal 2026-07-02 12:32:18 +03:00
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +03:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +03:00
hagiye
129448e437 frist mile receive to warehouse and last mile truck arrival integration 2026-07-02 01:08:37 +03:00
marshal
9c18d086d7 changes 2026-07-01 20:55:17 +03:00
hagiye
14a00af341 train gate pass, Telebirr and Wafi 2026-07-01 16:23:52 +03:00
marshal
612df8daff Enhance clearance milestone management and introduce new contract actions
- Added new milestones for 'Transit Permit Uploaded' and 'Export Transport Document Issued' in the clearance milestone catalog.
- Implemented methods in ClearanceMilestoneService to skip milestones and complete them with metadata.
- Updated ContractBookingService to check boundary conditions before booking creation.
- Introduced new endpoints in ContractsController for uploading customs declarations, advising duty, and handling various document uploads.
- Enhanced the UI to support new clearance actions and display relevant components based on milestone statuses.
2026-07-01 10:20:16 +03:00
Nathnael
e5aab84f51 feat: ui changes and pdf setup on the clients 2026-07-01 06:56:58 +00:00
marshal
ccd5d6de31 Implement contract document download functionality and enhance clearance review status checks
- Added methods to assert clearance reviewable, finalizable, and uploadable statuses in the ContractClearanceService.
- Introduced a new endpoint in ContractsController for downloading contract PDFs.
- Implemented download functionality in the contracts service for both backoffice and portal applications.
- Updated UI components to include download buttons for contract PDFs in relevant pages.
- Enhanced contract request and view pages to support contract document downloads.
2026-07-01 07:27:53 +03:00
natib21
22eedf05f3 fix 2026-06-30 15:24:36 +00:00
Marshal
33d3aa9294 Enhance rule engine form to support currency formatting and suffix display 2026-06-30 15:18:30 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00
natib21
17a6d846a4 fix: show multiple vehicles on tracking map for demo
Changed from filtering by ACTIVE status to showing first 10 vehicles.
Ensures at least 2+ car icons visible on map for testing.

Changes:
- trackableVehicles: first 10 vehicles instead of ACTIVE filter
- Map markers: shows all trackable vehicles
- Badge: "Tracked" count instead of "Active"
- Vehicle list: "Tracked Vehicles (count)" instead of "Active Vehicles"

Enables demo of map functionality with actual fleet data.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 14:28:44 +00:00
natib21
8be47f98a9 feat: show only active vehicles on tracking map
Filter vehicles to status === 'ACTIVE':
- Map markers: only active vehicles displayed
- Vehicle dropdown: only active vehicles selectable
- All vehicles list: renamed to "Active Vehicles (count)"
- All use activeVehicles useMemo computed from vehiclesWithGPS

Inactive vehicles (maintenance, idle, etc.) hidden from tracking view.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 14:26:35 +00:00