From ffb39bbee7c8174e0f4aeb00822b04ec1efaf023 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 8 Feb 2022 11:07:31 -0800
Subject: [PATCH] IO-1687 Add payable due date.

---
 .../src/components/vendors-form/vendors-form.component.jsx | 2 +-
 client/src/translations/en_us/common.json                  | 2 +-
 server/accounting/qbo/qbo-payables.js                      | 7 ++++++-
 server/accounting/qbxml/qbxml-payables.js                  | 7 ++++---
 server/graphql-client/queries.js                           | 1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx
index 81101e22d..b52739788 100644
--- a/client/src/components/vendors-form/vendors-form.component.jsx
+++ b/client/src/components/vendors-form/vendors-form.component.jsx
@@ -158,7 +158,7 @@ export default function VendorsFormComponent({
           <InputNumber min={0} max={1} precision={2} step={0.01} />
         </Form.Item>
         <Form.Item label={t("vendors.fields.due_date")} name="due_date">
-          <InputNumber />
+          <InputNumber min={0} />
         </Form.Item>
         {
           // <Form.Item
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d80f8950a..b25f97355 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2591,7 +2591,7 @@
 				"country": "Country",
 				"discount": "Discount % (as decimal)",
 				"display_name": "Display Name",
-				"due_date": "Payment Due Date",
+				"due_date": "Payment Due Date (# of days)",
 				"email": "Contact Email",
 				"favorite": "Favorite?",
 				"lkq": "LKQ",
diff --git a/server/accounting/qbo/qbo-payables.js b/server/accounting/qbo/qbo-payables.js
index abf470511..9af53cb24 100644
--- a/server/accounting/qbo/qbo-payables.js
+++ b/server/accounting/qbo/qbo-payables.js
@@ -181,7 +181,12 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor) {
     TxnDate: moment(bill.date)
       .tz(bill.job.bodyshop.timezone)
       .format("YYYY-MM-DD"),
-    //DueDate: bill.due_date && moment(bill.due_date).format("YYYY-MM-DD"),
+    ...(bill.vendor.due_date && {
+      DueDate: moment(bill.date)
+        .tz(bill.job.bodyshop.timezone)
+        .add(bill.vendor.due_date, "days")
+        .format("YYYY-MM-DD"),
+    }),
     DocNumber: bill.invoice_number,
     //...(bill.job.class ? { ClassRef: { Id: classes[bill.job.class] } } : {}),
 
diff --git a/server/accounting/qbxml/qbxml-payables.js b/server/accounting/qbxml/qbxml-payables.js
index 90b8e0b55..80b293981 100644
--- a/server/accounting/qbxml/qbxml-payables.js
+++ b/server/accounting/qbxml/qbxml-payables.js
@@ -75,11 +75,12 @@ const generateBill = (bill) => {
             TxnDate: moment(bill.date)
               .tz(bill.job.bodyshop.timezone)
               .format("YYYY-MM-DD"),
-            DueDate:
-              bill.due_date &&
-              moment(bill.due_date)
+            ...(bill.vendor.due_date && {
+              DueDate: moment(bill.date)
                 .tz(bill.job.bodyshop.timezone)
+                .add(bill.vendor.due_date, "days")
                 .format("YYYY-MM-DD"),
+            }),
             RefNumber: bill.invoice_number,
             Memo: `RO ${bill.job.ro_number || ""}`,
             ExpenseLineAdd: bill.billlines.map((il) =>
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index d5bb2a3f8..aa8823623 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -404,6 +404,7 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
     vendor{
       id
       name
+      due_date
     }
   }
 }