|
|
@@ -98,15 +98,15 @@ class ExpenseModel {
|
|
|
json['applicantName'] as String? ?? json['usrNo'] as String? ?? '',
|
|
|
deptId: json['dept'] as String? ?? '',
|
|
|
deptName: json['deptName'] as String? ?? json['dept'] as String? ?? '',
|
|
|
- currencyCode: json['curId'] as String? ?? '',
|
|
|
+ currencyCode: (json['curId'] as String?) ?? (json['currencyCode'] as String?) ?? '',
|
|
|
isGenerateVoucher: (json['vohId'] as String?) == 'T' || json['isGenerateVoucher'] == true,
|
|
|
voucherNo: json['vohNo'] as String? ?? '',
|
|
|
approvedAmount: (json['approvedAmount'] as num?)?.toDouble() ?? 0.0,
|
|
|
totalAmount: (json['totalAmount'] as num?)?.toDouble() ?? 0.0,
|
|
|
totalAmtnSh: (json['totalAmtnSh'] as num?)?.toDouble() ?? 0.0,
|
|
|
purpose: json['reason'] as String? ?? json['purpose'] as String? ?? '',
|
|
|
- remark: json['rem'] as String? ?? '',
|
|
|
- paymentMethod: json['payId'] as String? ?? '',
|
|
|
+ remark: (json['rem'] as String?) ?? (json['remark'] as String?) ?? '',
|
|
|
+ paymentMethod: (json['payId'] as String?) ?? (json['paymentMethod'] as String?) ?? '',
|
|
|
isInvoiceVerified: json['isInvoiceVerified'] as bool? ?? false,
|
|
|
isTaxIdMatched: json['isTaxIdMatched'] as bool? ?? false,
|
|
|
isCategoryCompliant: json['isCategoryCompliant'] as bool? ?? false,
|