Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix

Browse Source
This commit is contained in:
yaschalew
2026-06-30 17:24:20 +03:00
parent 14f1db631a fea869a19c
commit e10e7ee7bd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/edr-freight-api/src/modules/fuel/fuel.service.ts
View File

@@ -31,7 +31,11 @@ export class FuelService {
}
async getAllFuelPurchases(): Promise<FuelPurchase[]> {
return this.purchaseRepository.find({ order: { purchaseDate: 'DESC' } });
return this.purchaseRepository
.createQueryBuilder('purchase')
.leftJoinAndSelect('purchase.vehicle', 'vehicle')
.orderBy('purchase.purchaseDate', 'DESC')
.getMany();
}
async getFuelPurchases(

2
apps/edr-freight-web/backoffice/src/pages/fleet/FuelPurchasePage.tsx
View File

@@ -199,7 +199,7 @@ export default function FuelPurchasePage() {
<Table.Tbody>
{(purchasesData as FuelPurchase[])?.map((purchase) => (
<Table.Tr key={purchase.id}>
<Table.Td>{purchase.vehicleName || purchase.vehicleId}</Table.Td>
<Table.Td>{(purchase as any).vehicle?.registrationNumber || (purchase as any).vehicle?.plateNumber || purchase.vehicleId}</Table.Td>
<Table.Td>{new Date(purchase.purchaseDate).toLocaleDateString()}</Table.Td>
<Table.Td align="right">{Number(purchase.liters).toFixed(2)}</Table.Td>
<Table.Td align="right">ETB {Number(purchase.costPerLiter).toFixed(2)}</Table.Td>