From 2a94bcc50948f01b50a93a37e0611955f5d2779a Mon Sep 17 00:00:00 2001 From: Bryce Date: Thu, 2 May 2024 19:47:36 -0700 Subject: [PATCH] Adds links for manual payments --- src/clj/auto_ap/ssr/invoice/common.clj | 9 ++++----- src/clj/auto_ap/ssr/invoices.clj | 1 + src/clj/auto_ap/ssr/payments.clj | 5 ++++- src/clj/user.clj | 7 ++++--- src/clj/user.fiddle | 2 ++ 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/clj/auto_ap/ssr/invoice/common.clj b/src/clj/auto_ap/ssr/invoice/common.clj index 382b3808..dc6f774c 100644 --- a/src/clj/auto_ap/ssr/invoice/common.clj +++ b/src/clj/auto_ap/ssr/invoice/common.clj @@ -5,8 +5,6 @@ :invoice/total :invoice/outstanding-balance :invoice/source-url - - [:invoice/date :xform clj-time.coerce/from-date] [:invoice/due :xform clj-time.coerce/from-date] [:invoice/scheduled-payment :xform clj-time.coerce/from-date] @@ -17,9 +15,10 @@ {:account-client-override/client [:db/id]}]}]}] [:transaction/_invoices :as :invoice/transaction] [:db/id] [:journal-entry/_original-entity :as :invoice/journal-entry] [:db/id] - [:payment/_invoices :as :invoice/payments] [:db/id :payment/date :payment/amount + [:invoice-payment/_invoice :as :invoice/payments] [{:invoice-payment/payment [:db/id :payment/date :payment/amount - {[:transaction/_payment :as :payment/transaction] [:db/id] - [:payment/status :xform iol-ion.query/ident] [:db/ident]}] + {[:transaction/_payment :as :payment/transaction] [:db/id] + [:payment/status :xform iol-ion.query/ident] [:db/ident]}]}] + #_[:payment/_invoices :as :invoice/payments] [:invoice/status :xform iol-ion.query/ident] [:db/ident] :invoice/vendor [:vendor/name :db/id]}]) \ No newline at end of file diff --git a/src/clj/auto_ap/ssr/invoices.clj b/src/clj/auto_ap/ssr/invoices.clj index 582c3a20..3be1fbd8 100644 --- a/src/clj/auto_ap/ssr/invoices.clj +++ b/src/clj/auto_ap/ssr/invoices.clj @@ -538,6 +538,7 @@ (link-dropdown (concat (->> i :invoice/payments + (map :invoice-payment/payment) (filter (fn [p] (not= :payment-status/voided (:payment/status p)))) diff --git a/src/clj/auto_ap/ssr/payments.clj b/src/clj/auto_ap/ssr/payments.clj index aa6ba9d4..beee6c74 100644 --- a/src/clj/auto_ap/ssr/payments.clj +++ b/src/clj/auto_ap/ssr/payments.clj @@ -364,7 +364,10 @@ :name "Links" :class "w-8" :render (fn [p] - (link-dropdown (concat (->> p :payment/invoices (map (fn [invoice] + (link-dropdown (concat (->> p :invoice-payment/_payment + (map :invoice-payment/invoice) + + (map (fn [invoice] {:link (hu/url (bidi/path-for ssr-routes/only-routes ::invoice-route/all-page) {:exact-match-id (:db/id invoice)}) diff --git a/src/clj/user.clj b/src/clj/user.clj index 0ce1ba08..33a75526 100644 --- a/src/clj/user.clj +++ b/src/clj/user.clj @@ -329,9 +329,10 @@ (defn tx-detail [i] (map (juxt :e #(pull-attr (dc/db conn) :db/ident (:a %)) :v) (:data (first - (dc/tx-range conn - {:start i - :end (inc i)}))))) + (dc/tx-range (dc/log conn) + i + (inc i)))))) + #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} (defn tx-range-detail [i] (map (juxt :e #(pull-attr (dc/db conn) :db/ident (:a %)) :v) diff --git a/src/clj/user.fiddle b/src/clj/user.fiddle index 027f9fe2..b5dbe95a 100644 --- a/src/clj/user.fiddle +++ b/src/clj/user.fiddle @@ -389,3 +389,5 @@ taptelis-clients) :separator \tab) +(dc/pull (dc/db conn) + 17592316415740)