notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Makes it so that voiding cash payments is possible

Browse Source
This commit is contained in:
Bryce Covert
2022-12-21 10:59:47 -08:00
parent d36667d0a8
commit 7d0f723ef6
3 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/clj/auto_ap/graphql/checks.clj
View File

@@ -508,21 +508,7 @@
(-> (d-checks/get-by-id id)
(->graphql))))
(defn void-payments [context args _]
(assert-admin (:id context))
(let [args (assoc args :id (:id context))
ids (some-> args
:filters
(assoc :id (:id context))
(<-graphql)
(update :payment-type enum->keyword "payment-type")
(update :status enum->keyword "payment-status")
(assoc :per-page Integer/MAX_VALUE)
d-checks/raw-graphql-ids
:ids)
specific-ids (d-checks/filter-ids (:ids args))
all-ids (into (set ids) specific-ids)]
(log/info "Voiding " (count all-ids) args)
(defn void-payments-internal [all-ids id]
(transact-with-ledger (->> all-ids
(d/q '[:find [(pull ?p [:db/id
{:invoice-payment/_payment [:invoice-payment/amount
@@ -554,7 +540,27 @@
:invoice/status (if (dollars-0? new-balance)
(:invoice/status invoice)
:invoice-status/unpaid)}]))))))))
(:id context))
id))
(defn void-payments [context args _]
(assert-admin (:id context))
(let [args (assoc args :id (:id context))
ids (some-> args
:filters
(assoc :id (:id context))
(<-graphql)
(update :payment-type enum->keyword "payment-type")
(update :status enum->keyword "payment-status")
(assoc :per-page Integer/MAX_VALUE)
d-checks/raw-graphql-ids
:ids)
specific-ids (d-checks/filter-ids (:ids args))
all-ids (into (set ids) specific-ids)]
(log/info "Voiding " (count all-ids) args)
(void-payments-internal all-ids (:id context))
{:message (str "Succesfully voided " (count all-ids))}))
(defn get-all-payments [context args _]

19
src/clj/auto_ap/graphql/invoices.clj
View File

@@ -267,12 +267,27 @@
(defn void-invoices [context args _]
(let [_ (assert-admin (:id context))
args (assoc args :id (:id context))
all-ids (all-ids-not-locked (get-ids-matching-filters args))]
all-ids (all-ids-not-locked (get-ids-matching-filters args))
voidable-cash-payments (d/q '[:find [?p ...]
:in $ [?i ...]
:where [?ip :invoice-payment/invoice ?i]
[?ip :invoice-payment/payment ?p]
[?p :payment/type :payment-type/cash]
[?i :invoice/client ?c]
[(get-else $ ?c :client/locked-until #inst "2000-01-01") ?lu]
[?i :invoice/date ?d]
[(>= ?d ?lu)]]
(d/db conn)
all-ids)
]
(log/info "Voiding " (count voidable-cash-payments) "cash payments first")
(gq-checks/void-payments-internal voidable-cash-payments (:id context))
(log/info "Voiding " (count all-ids) args)
(transact-with-ledger
(->> all-ids
(d/q '[:find [(pull ?i [:db/id :invoice/date {:invoice/expense-accounts [:db/id]}]) ...]
(d/q '[:find [(pull ?i [:db/id :invoice/date {:invoice/expense-accounts [:db/id]}
]) ...]
:in $ [?i ...]
:where (not [_ :invoice-payment/invoice ?i])
[?i :invoice/client ?c]

3
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -218,8 +218,7 @@
{:keys [total]} @(re-frame/subscribe [::data-page/data :invoices])
]
[:div.buttons
(when (and (= :unpaid status)
is-admin?)
(when is-admin?
[void-selected-button])
[buttons/new-button {:event [::new-invoice-clicked]