Commit Graph

2026 Commits

Author SHA1 Message Date
Stephanos A
924cce5716 More production clearances 2026-07-01 15:20:39 +03:00
ghost2023
7e96fa65b9 feat: rm the hardcoded invoice types 2026-07-01 15:10:04 +03:00
Stephanos A
103117d88b Production checklists, issue fixes 2026-07-01 15:04:38 +03:00
ghost2023
1754c18ede fix: apiconfig 2026-07-01 14:46:24 +03:00
ghost2023
fbda15bac8 Merge branch 'dev' into freight/feat/invoice 2026-07-01 14:40:58 +03:00
Nathnael Wondisha
a4b9cf68b5 Merge pull request #391 from Tria-plc/freight/feat/script
Freight/feat/script
2026-07-01 14:39:03 +03:00
ghost2023
b7be6d6229 feat: add the seed schedules 2026-07-01 14:37:47 +03:00
ghost2023
abdf459289 feat: add the seed contracts 2026-07-01 14:26:32 +03:00
Stephanos A
0015f645cf Coach edit related fixes 2026-07-01 13:38:08 +03:00
Eyob T.
a6eb8966e9 Merge pull request #390 from Tria-plc/alpha
Route stops distance and other fixes
2026-07-01 13:37:32 +03:00
Stephanos A
74bdbecefd Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 13:32:09 +03:00
Stephanos A
4f1fc6c439 Route stops distance and other fixes 2026-07-01 13:31:31 +03:00
ghost2023
c88c5ee450 chore: setup script 2026-07-01 12:26:37 +03:00
Abubeker Yasin
6a4604ddcd Merge pull request #389 from Tria-plc/alpha
Update dmoney.provider.ts
2026-07-01 12:20:10 +03:00
Abubeker Yasin
f831c164e7 Update dmoney.provider.ts 2026-07-01 12:18:43 +03:00
Abubeker Yasin
61c08eb0dc Merge pull request #388 from Tria-plc/alpha
Update dmoney-webhook.service.ts
2026-07-01 12:09:27 +03:00
Abubeker Yasin
8705b98407 Update dmoney-webhook.service.ts 2026-07-01 12:08:05 +03:00
Abubeker Yasin
46f5207054 Merge branch 'alpha' into passenger/feat/iam 2026-07-01 11:09:43 +03:00
Abubeker Yasin
50b6b7c3ee Merge pull request #387 from Tria-plc/alpha
feat: ( fayda ) use platform-specific Fayda redirect_uri
2026-07-01 10:29:56 +03:00
Abubeker Yasin
3308c775e6 feat: ( fayda ) use platform-specific Fayda redirect_uri 2026-07-01 10:24:42 +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
Nathnael
94982d3c5a feat: setup pdf on the central billing 2026-07-01 06:25:24 +00:00
Nathnael
8ab27a6721 feat: add expiration to invoice 2026-07-01 06:19:07 +00:00
Abubeker Yasin
7ff31a87f5 Merge branch 'alpha' into passenger/feat/iam 2026-07-01 09:18:49 +03:00
Abubeker Yasin
a13323f6b1 Merge pull request #386 from Tria-plc/alpha
Added callback url for fayda
2026-07-01 09:08:42 +03:00
Stephanos A
0db0d3af78 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 09:03:37 +03:00
Stephanos A
b50a386b25 UAT findings resolutions and enhancements 2026-07-01 09:03:09 +03:00
Roba Boru
6312e93686 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 08:01:19 +03:00
Roba Boru
ff27a82bc1 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 08:01:03 +03:00
Roba Boru
8a7799be0e Added callback url for fayda 2026-07-01 08:00:47 +03: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
marshal
7654b18385 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-07-01 05:45:46 +03:00
Marshal
28c1089ce6 Remove estimated shipment date from contract forms and related components 2026-07-01 02:42:05 +00:00
Abubeker Yasin
aa07e22cb9 Merge pull request #385 from Tria-plc/alpha
Alpha
2026-06-30 20:09:01 +03:00
Abubeker Yasin
1c9efed103 fix: ( payment ) add ispublic to payment event consumer 2026-06-30 20:06:43 +03:00
yaschalew
21407cc1ba Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 18:25:13 +03:00
natib21
22eedf05f3 fix 2026-06-30 15:24:36 +00:00
marshal
dc55ebda29 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 18:23:56 +03:00
marshal
1a6f461a06 changes 2026-06-30 18:23:47 +03: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
yaschalew
55adf610a8 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 17:34:49 +03:00
natib21
558f7f38cd feat: add fleet-wide fuel and maintenance stats endpoints
Backend:
FuelService + FuelController:
- Added getFleetFuelStats() aggregating all vehicles
- Route: GET /api/fuel/stats (before :vehicleId route)
- Returns: totalCost, totalLiters, totalPurchases, averagePricePerLiter

MaintenanceService + MaintenanceController:
- Added getFleetMaintenanceStats() aggregating all vehicles
- Route: GET /api/maintenance/stats (before :vehicleId route)
- Returns: totalCost, numberOfMaintenanceItems, averageCostPerMaintenance, costByType

Both endpoints aggregate over past 12 months (customizable via query param).

Enables dashboard to show fleet-wide operating costs.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 14:32:12 +00:00
yaschalew
5bc0d901ff Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 17:29:17 +03: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
yaschalew
8fc94a1eae Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 17:27:07 +03: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
yaschalew
e10e7ee7bd Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 17:24:20 +03:00
natib21
fea869a19c feat: display vehicle name instead of ID in fuel purchases table
Backend:
- FuelService.getAllFuelPurchases() now loads vehicle relationship
- Uses leftJoinAndSelect to eagerly load Vehicle data
- Returns complete FuelPurchase with nested vehicle object

Frontend:
- Table displays vehicle.registrationNumber (primary)
- Falls back to vehicle.plateNumber if registration unavailable
- Falls back to vehicleId as last resort

Better UX: shows human-readable vehicle info instead of UUID.

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