calls out client on summaries.

This commit is contained in:
2024-04-18 10:54:54 -07:00
parent 76c0ccb4a7
commit 7b15b35eff
2 changed files with 40 additions and 8 deletions

View File

@@ -45,6 +45,7 @@
(def default-read '[:db/id (def default-read '[:db/id
[:sales-summary/date :xform clj-time.coerce/from-date] [:sales-summary/date :xform clj-time.coerce/from-date]
{:sales-summary/client [:client/code :client/name]}
*]) ;; TODO *]) ;; TODO
(defn fetch-ids [db request] (defn fetch-ids [db request]
@@ -140,10 +141,19 @@
:title "Sales Summaries" :title "Sales Summaries"
:entity-name "Daily Summary" :entity-name "Daily Summary"
:route ::route/table :route ::route/table
:headers [{:key "date" :headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
(= (count (:clients args)) 1))
:render #(-> % :sales-summary/client :client/code)}
{:key "date"
:name "Date" :name "Date"
:sort-key "date" :sort-key "date"
:render #(some-> % :sales-summary/date (atime/unparse-local atime/normal-date))} :render #(some-> % :sales-summary/date (atime/unparse-local atime/normal-date))}
{:key "credits" {:key "credits"
:name "credits" :name "credits"
:sort-key "credits" :sort-key "credits"
@@ -151,11 +161,11 @@
(let [total-debits (reduce + 0.0 (vals (get-debits ss))) (let [total-debits (reduce + 0.0 (vals (get-debits ss)))
total-credits (+ (- (+ (reduce + 0.0 (map :sales-summary-item/total (:sales-summary/sales-items ss))) total-credits (+ (- (+ (reduce + 0.0 (map :sales-summary-item/total (:sales-summary/sales-items ss)))
(reduce + 0.0 (map :sales-summary-item/discount (:sales-summary/sales-items ss)))) (reduce + 0.0 (map :sales-summary-item/discount (:sales-summary/sales-items ss))))
(reduce + 0.0 (map :sales-summary-item/tax (:sales-summary/sales-items ss)))) (reduce + 0.0 (map :sales-summary-item/tax (:sales-summary/sales-items ss))))
(:sales-summary/total-tax ss 0.0) (:sales-summary/total-tax ss 0.0)
(:sales-summary/total-tip ss 0.0))] (:sales-summary/total-tip ss 0.0))]
[:ul [:ul
(for [[n x] (group-by :sales-summary-item/category (:sales-summary/sales-items ss))] (for [[n x] (group-by :sales-summary-item/category (:sales-summary/sales-items ss))]
[:li n ": " (format "$%,.2f" (- (+ (reduce + 0.0 (map :sales-summary-item/total x)) [:li n ": " (format "$%,.2f" (- (+ (reduce + 0.0 (map :sales-summary-item/total x))
@@ -196,7 +206,7 @@
[:li "Food App Payments: " [:li "Food App Payments: "
(format "$%,.2f" food-app-payments)] (format "$%,.2f" food-app-payments)]
[:li "Gift Card Payments" [:li "Gift Card Payments"
(format "$%,.2f" gift-card-payments)] (format "$%,.2f" gift-card-payments)]
[:li "Cash Payments: " [:li "Cash Payments: "

View File

@@ -1,4 +1,5 @@
(init-repl) (init-repl)
(comment (comment
(defn setup-randy-queries [] (defn setup-randy-queries []
(import '[java.util UUID]) (import '[java.util UUID])
@@ -325,3 +326,24 @@
) )
(clojure.data.csv/write-csv *out*
(let [db (dc/db conn)]
(dc/q '[:find ?d4 ?s (sum ?total)
:in $ [?clients ?start-date ?end-date]
:where
[(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
[?e :sales-order/source ?s]
[?e :sales-order/total ?total]
[?e :sales-order/date ?d]
[(iol-ion.query/excel-date ?d) ?d4]]
db
[
[ (pull-attr db :db/id [:client/code "NGRV"])]
#inst "2024-03-01" #inst "2024-03-30"]))
:separator \tab)
(pull-attr (dc/db conn) :db/id [:client/code "NGRV"])