Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,984 Commits 96 Branches 0 Tags
f4f98575f118216219c4dfbcda4eaf0dbab052f9
Commit Graph

1513 Commits

Author SHA1 Message Date
natib21
f4f98575f1 fix error 2026-07-02 10:48:31 +00:00
natib21
4519a1d75d fix 2026-07-02 10:33:32 +00:00
natib21
4e4d81479b Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 10:27:33 +00:00
natib21
1c88bd8d68 fix 2026-07-02 10:27:01 +00:00
yaschalew
10e442deb1 fix 2026-07-02 13:18:49 +03:00
natib21
e0010695be fix 2026-07-02 09:41:52 +00:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
yaschalew
db8ead322c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-07-02 11:29:27 +03:00
yaschalew
54b2114e7f fix issue 2026-07-02 11:28:56 +03:00
Abubeker Yasin
d6938df66c feat: ( iam ) add forgot and change password to passenger backoffice 2026-07-02 10:27:08 +03:00
Abubeker Yasin
448e64da02 feat: ( iam ) add Station Master and Ticket Officer roles with positions 2026-07-02 09:38:30 +03:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +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
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
8705b98407 Update dmoney-webhook.service.ts 2026-07-01 12:08:05 +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
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