2026-04-15

lib/model/detail_model.dart

@@ -50,12 +50,13 @@ class DetailData {
   final String? proforma;
   final int? proformaId;
   final String? proformaNumber;
-  final String? proformastatus;
+  final String? proformaStatus;
   final String? createdDate;
   final String? createdTime;
   final String? createdBy;
 
   final String? message;
+  final String? subject;
   final String? completedDate;
   final String? paidBy;
 
@@ -70,7 +71,7 @@ class DetailData {
     this.firmId,
     this.dueDate,
     this.service,
-    this.proformastatus,
+    this.proformaStatus,
     this.serviceStatus,
     this.paymentStatus,
     this.paidStatus,
@@ -85,6 +86,7 @@ class DetailData {
     this.createdTime,
     this.createdBy,
     this.message,
+    this.subject,
     this.completedDate,
     this.paidBy,
     required this.userUploadedDocuments,
@@ -102,7 +104,7 @@ class DetailData {
     serviceStatus: json["service_status"],
 
     paymentStatus: json["payment_status"],
-    proformastatus: json["proforma_status"],
+    proformaStatus: json["proforma_status"],
     paidStatus: json["paid_status"],
     paymentDate: json["payment_date"],
     paymentAmount: json["payment_amount"]?.toString(),
@@ -119,6 +121,7 @@ class DetailData {
     createdBy: json["created_by"],
 
     message: json["message"],
+    subject: json["subject"],
     completedDate: json["completed_date"],
     paidBy: json["paid_by"],
 
@@ -153,7 +156,7 @@ class DetailData {
     "payment_date": paymentDate,
     "payment_amount": paymentAmount,
     "invoice": invoice,
-    "proforma_status": proformastatus,
+    "proforma_status": proformaStatus,
     "invoice_number": invoiceNumber,
     "proforma": proforma,
     "proforma_id": proformaId,
@@ -162,6 +165,7 @@ class DetailData {
     "created_time": createdTime,
     "created_by": createdBy,
     "message": message,
+    "subject": subject,
     "completed_date": completedDate,
     "paid_by": paidBy,
     "user_uploaded_documents": userUploadedDocuments

lib/model/service_list_history_model.dart

@@ -42,23 +42,41 @@ class ServiceListHistoryModel {
 
 class ServiceHistoryData {
   final int? id;
+  final String? name;
+  final String? firmName;
   final String? paymentStatus;
   final String? paymentAmount;
   final String? status;
   final String? service;
   final String? message;
+  final String? subject;
+  final String? assignee;
   final String? createdDate;
   final String? createdTime;
+  final String? createdAt;
+  final int? actions;
+  final int? chatId;
+  final int? isProformaGenerated;
+  final String? paymentId;
 
   ServiceHistoryData({
     this.id,
+    this.name,
+    this.firmName,
     this.paymentStatus,
     this.paymentAmount,
     this.status,
     this.service,
     this.message,
+    this.subject,
+    this.assignee,
     this.createdDate,
     this.createdTime,
+    this.createdAt,
+    this.actions,
+    this.chatId,
+    this.isProformaGenerated,
+    this.paymentId,
   });
 
   factory ServiceHistoryData.fromJson(Map<String, dynamic> json) {
@@ -66,26 +84,50 @@ class ServiceHistoryData {
       id: json['id'] is int
           ? json['id']
           : int.tryParse(json['id']?.toString() ?? ''),
+      name: json['name']?.toString(),
+      firmName: json['firm_name']?.toString(),
       paymentStatus: json['payment_status']?.toString(),
       paymentAmount: json['payment_amount']?.toString(),
       status: json['status']?.toString(),
       service: json['service']?.toString(),
       message: json['message']?.toString(),
+      subject: json['subject']?.toString(),
+      assignee: json['assignee']?.toString(),
       createdDate: json['created_date']?.toString(),
       createdTime: json['created_time']?.toString(),
+      createdAt: json['created_at']?.toString(),
+      actions: json['actions'] is int
+          ? json['actions']
+          : int.tryParse(json['actions']?.toString() ?? ''),
+      chatId: json['chat_id'] is int
+          ? json['chat_id']
+          : int.tryParse(json['chat_id']?.toString() ?? ''),
+      isProformaGenerated: json['is_proforma_generated'] is int
+          ? json['is_proforma_generated']
+          : int.tryParse(json['is_proforma_generated']?.toString() ?? ''),
+      paymentId: json['payment_id']?.toString(),
     );
   }
 
   Map<String, dynamic> toJson() {
     return {
       'id': id,
+      'name': name,
+      'firm_name': firmName,
       'payment_status': paymentStatus,
       'payment_amount': paymentAmount,
       'status': status,
       'service': service,
       'message': message,
+      'subject': subject,
+      'assignee': assignee,
       'created_date': createdDate,
       'created_time': createdTime,
+      'created_at': createdAt,
+      'actions': actions,
+      'chat_id': chatId,
+      'is_proforma_generated': isProformaGenerated,
+      'payment_id': paymentId,
     };
   }
 }