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

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:21:50 +03:00
parent c778fb587b 67ba168a22
commit 14f1db631a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ export default function FuelPurchasePage() {
</Text>
<Text fw={700} size="lg">
{purchasesData
.reduce((sum: number, p: FuelPurchase) => sum + p.liters, 0)
.reduce((sum: number, p: FuelPurchase) => sum + Number(p.liters), 0)
.toFixed(2)}{" "}
L
</Text>
@@ -161,7 +161,7 @@ export default function FuelPurchasePage() {
</Text>
<Text fw={700} size="lg">
ETB {purchasesData
.reduce((sum: number, p: FuelPurchase) => sum + p.totalCost, 0)
.reduce((sum: number, p: FuelPurchase) => sum + Number(p.totalCost), 0)
.toLocaleString("en-US", { maximumFractionDigits: 2 })}
</Text>
</Card>
@@ -174,8 +174,8 @@ export default function FuelPurchasePage() {
<Text fw={700} size="lg">
ETB{" "}
{(
purchasesData.reduce((sum: number, p: FuelPurchase) => sum + p.totalCost, 0) /
purchasesData.reduce((sum: number, p: FuelPurchase) => sum + p.liters, 0) || 0
purchasesData.reduce((sum: number, p: FuelPurchase) => sum + Number(p.totalCost), 0) /
purchasesData.reduce((sum: number, p: FuelPurchase) => sum + Number(p.liters), 0) || 0
).toFixed(2)}
</Text>
</Card>
@@ -201,9 +201,9 @@ export default function FuelPurchasePage() {
<Table.Tr key={purchase.id}>
<Table.Td>{purchase.vehicleName || purchase.vehicleId}</Table.Td>
<Table.Td>{new Date(purchase.purchaseDate).toLocaleDateString()}</Table.Td>
<Table.Td align="right">{purchase.liters.toFixed(2)}</Table.Td>
<Table.Td align="right">ETB {purchase.costPerLiter.toFixed(2)}</Table.Td>
<Table.Td align="right">ETB {purchase.totalCost.toLocaleString("en-US", { maximumFractionDigits: 2 })}</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>
<Table.Td align="right">ETB {Number(purchase.totalCost).toLocaleString("en-US", { maximumFractionDigits: 2 })}</Table.Td>
<Table.Td>{purchase.fuelStation || "—"}</Table.Td>
<Table.Td>
<Badge size="sm">{purchase.paymentMethod}</Badge>