From d93c3d3bf574e6a710b5e841e26c62db5b26c97c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 14 Apr 2022 15:30:23 +0300
Subject: [PATCH] Add columns to invoice datatable

---
 lib/data/models/invoice_model.dart    | 6 ++++++
 lib/ui/credit/credit_presenter.dart   | 9 +++++++--
 lib/ui/invoice/invoice_presenter.dart | 9 +++++++--
 lib/ui/quote/quote_presenter.dart     | 9 +++++++--
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 409740831..489ed426f 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -776,6 +776,12 @@ abstract class InvoiceEntity extends Object
       case InvoiceFields.clientCountry:
         response = clientA.countryId.compareTo(clientB.countryId);
         break;
+      case InvoiceFields.partial:
+        response = invoiceA.partial.compareTo(invoiceB.partial);
+        break;
+      case InvoiceFields.partialDueDate:
+        response = invoiceA.partialDueDate.compareTo(invoiceB.partialDueDate);
+        break;
       default:
         print('## ERROR: sort by invoice.$sortField is not implemented');
         break;
diff --git a/lib/ui/credit/credit_presenter.dart b/lib/ui/credit/credit_presenter.dart
index 7f4bdcca1..82cec25e9 100644
--- a/lib/ui/credit/credit_presenter.dart
+++ b/lib/ui/credit/credit_presenter.dart
@@ -51,6 +51,8 @@ class CreditPresenter extends EntityPresenter {
       CreditFields.clientCity,
       CreditFields.clientPostalCode,
       CreditFields.clientCountry,
+      CreditFields.partial,
+      CreditFields.partialDueDate,
     ];
   }
 
@@ -139,9 +141,12 @@ class CreditPresenter extends EntityPresenter {
             credit, state.clientState.get(credit.clientId));
         if (field == CreditFields.contactName) {
           return Text(contact?.fullName ?? '');
-        } else {
-          return Text(contact?.email ?? '');
         }
+        return Text(contact?.email ?? '');
+      case CreditFields.partial:
+        return Text(formatNumber(credit.partial, context));
+      case CreditFields.partialDueDate:
+        return Text(formatDate(credit.partialDueDate, context));
     }
 
     return super.getField(field: field, context: context);
diff --git a/lib/ui/invoice/invoice_presenter.dart b/lib/ui/invoice/invoice_presenter.dart
index 2f2f12269..0bc759e6f 100644
--- a/lib/ui/invoice/invoice_presenter.dart
+++ b/lib/ui/invoice/invoice_presenter.dart
@@ -57,6 +57,8 @@ class InvoicePresenter extends EntityPresenter {
       InvoiceFields.clientCity,
       InvoiceFields.clientPostalCode,
       InvoiceFields.clientCountry,
+      InvoiceFields.partial,
+      InvoiceFields.partialDueDate,
     ];
   }
 
@@ -158,9 +160,12 @@ class InvoicePresenter extends EntityPresenter {
             invoice, state.clientState.get(invoice.clientId));
         if (field == InvoiceFields.contactName) {
           return Text(contact?.fullName ?? '');
-        } else {
-          return Text(contact?.email ?? '');
         }
+        return Text(contact?.email ?? '');
+      case InvoiceFields.partial:
+        return Text(formatNumber(invoice.partial, context));
+      case InvoiceFields.partialDueDate:
+        return Text(formatDate(invoice.partialDueDate, context));
     }
 
     return super.getField(field: field, context: context);
diff --git a/lib/ui/quote/quote_presenter.dart b/lib/ui/quote/quote_presenter.dart
index a133cb4bc..9e9673f87 100644
--- a/lib/ui/quote/quote_presenter.dart
+++ b/lib/ui/quote/quote_presenter.dart
@@ -51,6 +51,8 @@ class QuotePresenter extends EntityPresenter {
       QuoteFields.clientCity,
       QuoteFields.clientPostalCode,
       QuoteFields.clientCountry,
+      QuoteFields.partial,
+      QuoteFields.partialDueDate,
     ];
   }
 
@@ -132,9 +134,12 @@ class QuotePresenter extends EntityPresenter {
             quoteContactSelector(quote, state.clientState.get(quote.clientId));
         if (field == QuoteFields.contactName) {
           return Text(contact?.fullName ?? '');
-        } else {
-          return Text(contact?.email ?? '');
         }
+        return Text(contact?.email ?? '');
+      case QuoteFields.partial:
+        return Text(formatNumber(quote.partial, context));
+      case QuoteFields.partialDueDate:
+        return Text(formatDate(quote.partialDueDate, context));
     }
 
     return super.getField(field: field, context: context);