From a891046084e289446dfff25a4c832ee9fd3c652b Mon Sep 17 00:00:00 2001 From: Bryce Date: Sat, 2 Sep 2023 09:00:22 -0700 Subject: [PATCH] should make glimpse work correctly (again) --- src/clj/auto_ap/ssr/invoice/glimpse.clj | 28 +++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/clj/auto_ap/ssr/invoice/glimpse.clj b/src/clj/auto_ap/ssr/invoice/glimpse.clj index 6ec564d1..3677443f 100644 --- a/src/clj/auto_ap/ssr/invoice/glimpse.clj +++ b/src/clj/auto_ap/ssr/invoice/glimpse.clj @@ -341,19 +341,21 @@ invoice_dropzone = new Dropzone(\"#invoice\", { scheduled-payment (and (d-vendors/automatically-paid-for-client-id? vendor client-id) due)] (when (and client-id date invoice-number vendor-id total) - {:db/id (random-tempid) - :invoice/client client-id - :invoice/client-identifier (first (:textract-invoice/customer-identifier textract-invoice)) - :invoice/vendor vendor-id - :invoice/invoice-number invoice-number - :invoice/total total - :invoice/date date - :invoice/due (coerce/to-date due) - :invoice/scheduled-payment (some-> scheduled-payment coerce/to-date) - :invoice/location location - :invoice/import-status :import-status/imported - :invoice/outstanding-balance total - :invoice/status :invoice-status/unpaid})))) + (cond-> {:db/id (random-tempid) + :invoice/client client-id + :invoice/client-identifier (first (:textract-invoice/customer-identifier textract-invoice)) + :invoice/vendor vendor-id + :invoice/invoice-number invoice-number + :invoice/total total + :invoice/date date + + :invoice/scheduled-payment (some-> scheduled-payment coerce/to-date) + :invoice/location location + :invoice/import-status :import-status/imported + :invoice/outstanding-balance total + :invoice/status :invoice-status/unpaid} + (instance? org.joda.time.DateTime due) (assoc :invoice/due (some-> due coerce/to-date)) + (instance? org.joda.time.DateTime scheduled-payment) (assoc :invoice/scheduled-payment (some-> scheduled-payment coerce/to-date))))))) (defn update-textract-invoice- [id {:strs [date total invoice-number client vendor]}] @(dc/transact-async conn [[:upsert-entity (cond-> {:db/id id}