jakob/rusty-petroleum
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Ensure grand_total is consistent with product calculations

Browse Source 
Calculate grand_total from products (volume * avg_price), matching the product row calculations.
This commit is contained in:
Jakob
2026-03-23 16:24:59 +01:00
parent 3bb65ca7f6
commit b95cae2ea7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@@ -149,11 +149,6 @@ impl PreparedCustomer {
}) })
.collect(); .collect();
let grand_total: f64 = cards
.iter()
.map(|c| c.total_amount.parse::<f64>().unwrap())
.sum();
let mut product_totals: HashMap<String, (f64, f64)> = HashMap::new(); let mut product_totals: HashMap<String, (f64, f64)> = HashMap::new();
for card in &cards { for card in &cards {
for tx in &card.transactions { for tx in &card.transactions {
@@ -187,6 +182,11 @@ impl PreparedCustomer {
.map(|p| p.volume.parse::<f64>().unwrap()) .map(|p| p.volume.parse::<f64>().unwrap())
.sum(); .sum();
let grand_total: f64 = products
.iter()
.map(|p| p.amount.parse::<f64>().unwrap())
.sum();
let summary = Summary { let summary = Summary {
total_volume: fmt(total_volume), total_volume: fmt(total_volume),
grand_total: fmt(grand_total), grand_total: fmt(grand_total),