yaschalew
54b2114e7f
fix issue
2026-07-02 11:28:56 +03:00
yaschalew
8b8a993953
fix conflict
2026-07-02 09:28:02 +03:00
Eyob T.
118ba46930
Merge pull request #394 from Tria-plc/alpha
...
Added tour package booking
2026-07-01 20:48:38 +03:00
Roba Boru
305e850073
Added tour package booking option
2026-07-01 20:45:40 +03:00
Roba Boru
5bfcde0c40
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-01 19:26:49 +03:00
Nathnael Wondisha
0d41d4bd20
Merge pull request #393 from Tria-plc/freight/feat/invoice
...
Freight/feat/invoice integration enhancement expiry,payment and booking
2026-07-01 16:18:09 +03:00
ghost2023
2f79178496
fix: booking invoice issue
2026-07-01 16:11:47 +03:00
ghost2023
43d1634823
feat: add payment modal to the invoice detail page
2026-07-01 16:11:32 +03:00
ghost2023
174df0b7aa
chore: fix script and add seed company
2026-07-01 15:46:25 +03:00
ghost2023
aef868bc40
fix: the invoice status syncing with booking payment window
2026-07-01 15:46:13 +03:00
Stephanos A
b511da2821
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-01 15:40:33 +03:00
Abubeker Yasin
a1d6d09056
Merge pull request #392 from Tria-plc/alpha
...
Alpha
2026-07-01 15:30:56 +03:00
Abubeker Yasin
33d90df5a9
feat: ( dmoney ) create redirect page to dmoney
2026-07-01 15:29:49 +03:00
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
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
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
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
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
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
