minor tweaks

This commit is contained in:
2024-03-31 22:06:18 -07:00
parent ded5371e77
commit 4c52dbc4d6
3 changed files with 22 additions and 19 deletions

View File

@@ -46,8 +46,7 @@
(defn sales-summaries []
(doseq [[c client-code] (dc/q '[:find ?c ?client-code
:in $
:where [?c :client/code ?client-code]
[(= ?client-code "NGCL")]]
:where [?c :client/code ?client-code] ]
(dc/db conn))
{:sales-summary/keys [date] :db/keys [id]} (dirty-sales-summaries c)]
(mu/with-context {:client-code client-code
@@ -78,18 +77,18 @@
(dc/db conn)
[[c] date date]))
0.0)
:sales-summary/total-returns (or (let [[t f] (first (dc/q '[:find (sum ?t) (sum ?f)
:with ?e
:in $ [?clients ?start-date ?end-date]
:where [(iol-ion.query/scan-sales-refunds $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
[?e :sales-refund/total ?t]
[?e :sales-refund/fee ?f]]
(dc/db conn)
[[c] date date]))]
(when (and t f)
(- t f)))
:sales-summary/total-returns (or (ffirst (dc/q '[:find (sum ?r)
:with ?e
:in $ [?clients ?start-date ?end-date]
:where [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
[?e :sales-order/returns ?r]
#_[?e :sales-order/charges ?c]
#_[?c :charge/tax ?tax]]
(dc/db conn)
[[c] date date]))
0.0)
0.0)
:sales-summary/sales-items
@@ -230,7 +229,7 @@
(apply mark-dirty [:client/code "NGCL"] (last-n-days 12))
#_(mark-all-dirty 700)
(mark-all-dirty 30)
(sales-summaries)