perbaikan data report

This commit is contained in:
2026-04-23 21:21:33 +07:00
parent ecb2a369af
commit a898e4432f
13 changed files with 140 additions and 134 deletions

View File

@@ -18,16 +18,16 @@ class TaxReportModel {
overviews: [
// Sales
OverviewModel(
totalAmount: json['sales_total_amount'] ?? 0,
totalDiscount: json['sales_total_discount'] ?? 0,
totalVat: json['sales_total_vat'] ?? 0,
totalAmount: num.tryParse(json['sales_total_amount'].toString()) ?? 0,
totalDiscount: num.tryParse(json['sales_total_discount'].toString()) ?? 0,
totalVat: num.tryParse(json['sales_total_vat'].toString()) ?? 0,
),
// Purchase
OverviewModel(
totalAmount: json['purchases_total_amount'] ?? 0,
totalDiscount: json['purchases_total_discount'] ?? 0,
totalVat: json['purchases_total_vat'] ?? 0,
totalAmount: num.tryParse(json['purchases_total_amount'].toString()) ?? 0,
totalDiscount: num.tryParse(json['purchases_total_discount'].toString()) ?? 0,
totalVat: num.tryParse(json['purchases_total_vat'].toString()) ?? 0,
),
],
);
@@ -63,10 +63,10 @@ class InvoiceModel {
partyName: json['party']?['name'],
invoiceNumber: json['invoiceNumber'],
transactionDate: _dateKey == null ? null : DateTime.parse(_dateKey),
amount: json['totalAmount'],
discountAmount: json['discountAmount'],
amount: num.tryParse(json['totalAmount'].toString()),
discountAmount: num.tryParse(json['discountAmount'].toString()),
vatName: json['vat']?['name'],
vatAmount: json['vat_amount'],
vatAmount: num.tryParse(json['vat_amount'].toString()),
);
}
}