yanto/kulakpos_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perbaikan data report

Browse Source
This commit is contained in:
eko54r
2026-04-23 21:21:33 +07:00
parent ecb2a369af
commit a898e4432f
13 changed files with 140 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Screens/Due Calculation/Model/due_collection_model.dart
View File

@@ -25,16 +25,16 @@ class DueCollection {
this.branch});
DueCollection.fromJson(dynamic json) {
id = json['id'];
businessId = json['business_id'];
partyId = json['party_id'];
userId = json['user_id'];
saleId = json['sale_id'];
purchaseId = json['purchase_id'];
totalDue = json['totalDue'];
dueAmountAfterPay = json['dueAmountAfterPay'];
payDueAmount = json['payDueAmount'];
paymentTypeId = int.tryParse(json["payment_type_id"].toString());
id = num.tryParse(json['id']?.toString() ?? '');
businessId = num.tryParse(json['business_id']?.toString() ?? '');
partyId = num.tryParse(json['party_id']?.toString() ?? '');
userId = num.tryParse(json['user_id']?.toString() ?? '');
saleId = num.tryParse(json['sale_id']?.toString() ?? '');
purchaseId = num.tryParse(json['purchase_id']?.toString() ?? '');
totalDue = num.tryParse(json['totalDue']?.toString() ?? '');
dueAmountAfterPay = num.tryParse(json['dueAmountAfterPay']?.toString() ?? '');
payDueAmount = num.tryParse(json['payDueAmount']?.toString() ?? '');
paymentTypeId = int.tryParse(json["payment_type_id"]?.toString() ?? '');
// paymentType = json['paymentType'];
paymentDate = json['paymentDate'];
invoiceNumber = json['invoiceNumber'];
@@ -131,7 +131,7 @@ class Branch {
});
Branch.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
phone = json['phone'];
address = json['address'];

98
lib/Screens/Purchase/Model/purchase_transaction_model.dart
View File

@@ -35,24 +35,24 @@ class PurchaseTransaction {
});
PurchaseTransaction.fromJson(dynamic json) {
id = json['id'];
partyId = json['party_id'];
businessId = json['business_id'];
userId = json['user_id'];
discountAmount = json['discountAmount'];
discountPercent = json['discount_percent'];
shippingCharge = json['shipping_charge'];
id = num.tryParse(json['id']?.toString() ?? '');
partyId = num.tryParse(json['party_id']?.toString() ?? '');
businessId = num.tryParse(json['business_id']?.toString() ?? '');
userId = num.tryParse(json['user_id']?.toString() ?? '');
discountAmount = num.tryParse(json['discountAmount']?.toString() ?? '');
discountPercent = num.tryParse(json['discount_percent']?.toString() ?? '');
shippingCharge = num.tryParse(json['shipping_charge']?.toString() ?? '');
discountType = json['discount_type'];
dueAmount = json['dueAmount'];
changeAmount = json['change_amount'];
vatAmount = json['vat_amount'];
vatPercent = json['vat_percent'];
vatId = json['vat_id'];
paidAmount = json['paidAmount'];
totalAmount = json['totalAmount'];
dueAmount = num.tryParse(json['dueAmount']?.toString() ?? '');
changeAmount = num.tryParse(json['change_amount']?.toString() ?? '');
vatAmount = num.tryParse(json['vat_amount']?.toString() ?? '');
vatPercent = num.tryParse(json['vat_percent']?.toString() ?? '');
vatId = num.tryParse(json['vat_id']?.toString() ?? '');
paidAmount = num.tryParse(json['paidAmount']?.toString() ?? '');
totalAmount = num.tryParse(json['totalAmount']?.toString() ?? '');
invoiceNumber = json['invoiceNumber'];
isPaid = json['isPaid'];
paymentTypeId = int.tryParse(json["payment_type_id"].toString());
paymentTypeId = int.tryParse(json["payment_type_id"]?.toString() ?? '');
vat = json['vat'] != null ? PurchaseVat.fromJson(json['vat']) : null;
purchaseDate = json['purchaseDate'];
@@ -137,19 +137,19 @@ class PurchaseDetails {
});
PurchaseDetails.fromJson(dynamic json) {
id = json['id'];
purchaseId = json['purchase_id'];
productId = json['product_id'];
productPurchasePrice = json['productPurchasePrice'];
quantities = json['quantities'];
productDealerPrice = json['productDealerPrice'];
productSalePrice = json['productSalePrice'];
productStock = json['productStock'];
profitPercent = json['profit_percent'];
id = num.tryParse(json['id']?.toString() ?? '');
purchaseId = num.tryParse(json['purchase_id']?.toString() ?? '');
productId = num.tryParse(json['product_id']?.toString() ?? '');
productPurchasePrice = num.tryParse(json['productPurchasePrice']?.toString() ?? '');
quantities = num.tryParse(json['quantities']?.toString() ?? '');
productDealerPrice = num.tryParse(json['productDealerPrice']?.toString() ?? '');
productSalePrice = num.tryParse(json['productSalePrice']?.toString() ?? '');
productStock = num.tryParse(json['productStock']?.toString() ?? '');
profitPercent = num.tryParse(json['profit_percent']?.toString() ?? '');
mfgDate = json['mfg_date'];
expireDate = json['expire_date'];
stockId = json['stock_id']; // Added
productWholeSalePrice = json['productWholeSalePrice'];
stockId = num.tryParse(json['stock_id']?.toString() ?? ''); // Added
productWholeSalePrice = num.tryParse(json['productWholeSalePrice']?.toString() ?? '');
product = json['product'] != null ? Product.fromJson(json['product']) : null;
stock = json['stock'] != null ? PurchaseStock.fromJson(json['stock']) : null;
}
@@ -198,11 +198,11 @@ class Product {
});
Product.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
productName = json['productName'];
productType = json['product_type'];
categoryId = json['category_id'];
vatAmount = json['vat_amount'];
categoryId = num.tryParse(json['category_id']?.toString() ?? '');
vatAmount = num.tryParse(json['vat_amount']?.toString() ?? '');
vatType = json['vat_type'];
category = json['category'] != null ? Category.fromJson(json['category']) : null;
@@ -238,7 +238,7 @@ class Category {
});
Category.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
categoryName = json['categoryName'];
}
@@ -262,10 +262,10 @@ class PurchaseStock {
});
PurchaseStock.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
batchNo = json['batch_no'] ?? 'N/A';
variantName = json['variant_name']; // Added
warehouseId = json['warehouse_id']; // Added
warehouseId = num.tryParse(json['warehouse_id']?.toString() ?? ''); // Added
}
num? id;
@@ -285,7 +285,7 @@ class Party {
});
Party.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
email = json['email'];
phone = json['phone'];
@@ -320,7 +320,7 @@ class User {
});
User.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
role = json['role'];
}
@@ -347,7 +347,7 @@ class Branch {
});
Branch.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
phone = json['phone'];
address = json['address'];
@@ -372,9 +372,9 @@ class PurchaseReturn {
});
PurchaseReturn.fromJson(dynamic json) {
id = json['id'];
businessId = json['business_id'];
purchaseId = json['purchase_id'];
id = num.tryParse(json['id']?.toString() ?? '');
businessId = num.tryParse(json['business_id']?.toString() ?? '');
purchaseId = num.tryParse(json['purchase_id']?.toString() ?? '');
invoiceNo = json['invoice_no'];
returnDate = json['return_date'];
createdAt = json['created_at'];
@@ -423,12 +423,12 @@ class PurchaseReturnDetails {
});
PurchaseReturnDetails.fromJson(dynamic json) {
id = json['id'];
businessId = json['business_id'];
purchaseReturnId = json['purchase_return_id'];
purchaseDetailId = json['purchase_detail_id'];
returnAmount = json['return_amount'];
returnQty = json['return_qty'];
id = num.tryParse(json['id']?.toString() ?? '');
businessId = num.tryParse(json['business_id']?.toString() ?? '');
purchaseReturnId = num.tryParse(json['purchase_return_id']?.toString() ?? '');
purchaseDetailId = num.tryParse(json['purchase_detail_id']?.toString() ?? '');
returnAmount = num.tryParse(json['return_amount']?.toString() ?? '');
returnQty = num.tryParse(json['return_qty']?.toString() ?? '');
}
num? id;
@@ -458,9 +458,9 @@ class PurchaseVat {
});
PurchaseVat.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
rate = json['rate'];
rate = num.tryParse(json['rate']?.toString() ?? '');
}
num? id;
@@ -475,7 +475,7 @@ class PaymentType {
});
PaymentType.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
}
@@ -491,9 +491,9 @@ class PurchaseProductVat {
});
PurchaseProductVat.fromJson(dynamic json) {
id = json['id'];
id = num.tryParse(json['id']?.toString() ?? '');
name = json['name'];
rate = json['rate'];
rate = num.tryParse(json['rate']?.toString() ?? '');
}
num? id;

24
lib/Screens/all_transaction/model/transaction_model.dart
View File

@@ -21,9 +21,9 @@ class TransactionModel {
factory TransactionModel.fromJson(Map<String, dynamic> json) {
return TransactionModel(
message: json['message'],
totalAmount: json['total_amount'],
moneyIn: json['money_in'],
moneyOut: json['money_out'],
totalAmount: num.tryParse(json['total_amount']?.toString() ?? ''),
moneyIn: num.tryParse(json['money_in']?.toString() ?? ''),
moneyOut: num.tryParse(json['money_out']?.toString() ?? ''),
data: json['data'] != null
? List<TransactionModelData>.from(
json['data'].map((v) => TransactionModelData.fromJson(v)),
@@ -105,20 +105,20 @@ class TransactionModelData {
final _partyKey = json['sale']?['party'] ?? json['purchase']?['party'] ?? json['due_collect']?['party'];
return TransactionModelData(
id: json['id'],
id: num.tryParse(json['id']?.toString() ?? ''),
platform: json['platform'],
transactionType: json['transaction_type'],
type: json['type'],
amount: json['amount'],
totalAmount: json['total_amount'],
amount: num.tryParse(json['amount']?.toString() ?? ''),
totalAmount: num.tryParse(json['total_amount']?.toString() ?? ''),
date: json['date'],
businessId: json['business_id'],
branchId: json['branch_id'],
paymentTypeId: json['payment_type_id'],
userId: json['user_id'],
businessId: num.tryParse(json['business_id']?.toString() ?? ''),
branchId: num.tryParse(json['branch_id']?.toString() ?? ''),
paymentTypeId: num.tryParse(json['payment_type_id']?.toString() ?? ''),
userId: num.tryParse(json['user_id']?.toString() ?? ''),
fromBank: json['from_bank'],
toBank: json['to_bank'],
referenceId: json['reference_id'],
toBank: int.tryParse(json['to_bank']?.toString() ?? ''),
referenceId: num.tryParse(json['reference_id']?.toString() ?? ''),
invoiceNo: json['invoice_no'],
image: json['image'],
note: json['note'],