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

1569 Commits

Author SHA1 Message Date
yaschalew
dc3f6797c9 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 13:12:02 +03:00
natib21
3f81bb77ad feat: add fuel management frontend pages 
- FuelPurchasePage: Record fuel purchases, calculate total costs
- FuelStatsPage: View fuel consumption stats, efficiency metrics
- Routes: /dashboard/fuel-purchases and /dashboard/fuel-stats
- Sidebar menu items in Fleet Management section

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 10:11:13 +00:00
natib21
7b9cd88712 fix: correct fuel module TypeScript errors 
- Use @InjectRepository decorators for proper dependency injection
- Fix BaseRepository initialization with Repository instance
- Remove unnecessary DataSource references
- Add proper type annotations to reduce handlers

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 10:08:56 +00:00
natib21
df6e417a56 feat: add fuel management system backend 
- FuelPurchase entity: record fuel purchases with cost tracking
- FuelConsumption entity: monthly aggregation of fuel metrics
- FuelService: record purchases, calculate stats, efficiency
- FuelController: REST API for fuel operations
- FuelModule: integrated into app
- Migration: create fuel_purchases and fuel_consumption tables

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 10:07:13 +00:00
SennayT
3c5f5b5861 fix: add docker cache for pnpm installations 2026-06-30 09:54:59 +00:00
Abubeker Yasin
7b98f74445 Merge pull request #376 from Tria-plc/alpha 
fix: ( migration ) clean up migrations
 2026-06-30 11:53:12 +03:00
SennayT
e7e523b3b2 geerate prisma client after deploying 2026-06-30 08:39:38 +00:00
Abubeker Yasin
35a2a200d6 fix: ( migration ) clean up migrations 2026-06-30 11:11:50 +03:00
SennayT
5e43820efa revert changes to dockerfile 2026-06-30 10:38:53 +03:00
Nathnael Wondisha
1407c345b1 Merge pull request #375 from Tria-plc/fix/apiconfig 
fix: api url backoffice
 2026-06-30 09:22:09 +03:00
ghost2023
0f762172bf fix: api url backoffice 2026-06-30 09:19:32 +03:00
Nathnael Wondisha
d31b6f2d53 Merge pull request #374 from Tria-plc/fix/apiconfig 
fix: api url
 2026-06-30 09:15:36 +03:00
ghost2023
004c40059f fix: api url 2026-06-30 09:13:48 +03:00
Abubeker Yasin
813381af2d Merge pull request #373 from Tria-plc/alpha 
Update webhooks.controller.ts
 2026-06-30 09:13:46 +03:00
Abubeker Yasin
8d7ded1726 Update webhooks.controller.ts 2026-06-30 09:12:45 +03:00
Eyob T.
98da6033b5 Merge pull request #371 from Tria-plc/alpha 
Routes management issue fix
 2026-06-30 08:53:58 +03:00
Nathnael Wondisha
fec235c433 Merge pull request #372 from Tria-plc/freight/fix/migrate-undo 
fix
 2026-06-30 08:39:57 +03:00
ghost2023
c299973bb0 fix 2026-06-30 08:38:27 +03:00
Nathnael Wondisha
b5a2bd537f Merge pull request #370 from Tria-plc/freight/fix/migrate-undo 
fix
 2026-06-30 08:32:29 +03:00
ghost2023
468ac8b28a fix 2026-06-30 08:31:26 +03:00
Stephanos A
cdb0c23043 Routes management issue fix 2026-06-30 08:28:44 +03:00
Stephanos A.
16e8d48d9f Merge pull request #369 from Tria-plc/alpha 
fix(passenger-api): recreate script with LF line endings
 2026-06-30 07:37:12 +03:00
Stephanos A
756aa04646 fix(passenger-api): recreate script with LF line endings 2026-06-30 07:35:55 +03:00
Hagernesh Tadesse
f59a4649d7 Merge pull request #368 from Tria-plc/importhandover 
Importhandover
 2026-06-30 07:29:16 +03:00
Stephanos A.
3509afbcf8 Merge pull request #367 from Tria-plc/alpha 
fix(passenger-api): allow gender column migration to run
 2026-06-30 07:20:52 +03:00
hagiye
831ac59a8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 07:20:10 +03:00
Stephanos A
936bf5843e fix(passenger-api): allow gender column migration to run 2026-06-30 07:19:18 +03:00
hagiye
9f5c22c1ee Goods recieved notes and Booking delivery 2026-06-30 07:19:12 +03:00
yaschalew
fc82c5c636 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 07:05:53 +03:00
natib21
360e61ac15 fix: use byId() instead of detail() in QUERY_KEYS 
QUERY_KEYS.FIRST_MILE and QUERY_KEYS.LAST_MILE have byId() not detail().

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 04:04:56 +00:00
natib21
0bc9534172 fix: replace apiClient with api in FirstMilePage 
Use correct import 'api' from '@/auth/http' instead of undefined 'apiClient'.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 04:03:29 +00:00
yaschalew
a3741c45bf fix 2026-06-30 07:01:32 +03:00
natib21
14dde418f7 fix(migrations): check if tables exist before CREATE TABLE 
Make invoices migration idempotent - skip table/index creation if they
already exist. Prevents 'relation already exists' errors on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 03:55:57 +00:00
natib21
b142552f17 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 03:46:26 +00:00
natib21
25e91c6d93 fix: comment out isPostPaymentCompleted column decorator 
Column doesn't exist in DB yet. Commenting out @Column decorator
prevents TypeORM from trying to select non-existent column.
Fixes 500 QueryFailedError on first-mile/last-mile list endpoints.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 03:33:54 +00:00
natib21
b1d9045d0b fix: remove isPostPaymentCompleted filter check 
Property removed from entities until migration creates column.
Temporarily skip this filter until feature is fully implemented.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 03:15:58 +00:00
marshal
dd9a7e639a console 2026-06-30 06:15:57 +03:00
Marshal
f51c015814 Enhance payment module 2026-06-30 03:13:18 +00:00
marshal
c501effc32 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 05:52:59 +03:00
Marshal
9674c9394d Update logging configuration to use TYPEORM_LOGGING environment variable 2026-06-30 02:52:19 +00:00
natib21
f9ef473cff fix(migrations): check pg_type before CREATE TYPE enum 
PostgreSQL doesn't support IF NOT EXISTS on CREATE TYPE AS ENUM.
Query pg_type table to check if enum exists before creating.
Compatible with all PostgreSQL versions.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 02:45:37 +00:00
natib21
76b25bd214 fix 2026-06-30 02:33:29 +00:00
natib21
1c1e98960e fix 2026-06-30 02:24:52 +00:00
marshal
d05f634948 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 05:22:10 +03:00
natib21
ec82f8eb9f fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum 
Allows migration to run when enum already exists in prod DB. Prevents
'type already exists' error on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 02:22:09 +00:00
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00:00
marshal
abce3da6ce merge conflict 2026-06-30 05:17:56 +03:00
natib21
3ceacbe9a9 fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum 
Allows migration to run when enum already exists in prod DB. Prevents
'type already exists' error on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 02:03:20 +00:00
Stephanos A.
9bd7edbd03 Update Dockerfile 2026-06-30 00:42:39 +03:00
Stephanos A.
592efd0bf9 Merge pull request #361 from Tria-plc/alpha 
fix(passenger-api): remove trailing backslash in Dockerfile
 2026-06-30 00:31:52 +03:00