diff --git a/src/clj/auto_ap/ssr/admin/sales_summaries.clj b/src/clj/auto_ap/ssr/admin/sales_summaries.clj index 05c8e506..fb4c7043 100644 --- a/src/clj/auto_ap/ssr/admin/sales_summaries.clj +++ b/src/clj/auto_ap/ssr/admin/sales_summaries.clj @@ -45,6 +45,7 @@ (def default-read '[:db/id [:sales-summary/date :xform clj-time.coerce/from-date] + {:sales-summary/client [:client/code :client/name]} *]) ;; TODO (defn fetch-ids [db request] @@ -140,10 +141,19 @@ :title "Sales Summaries" :entity-name "Daily Summary" :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" :sort-key "date" :render #(some-> % :sales-summary/date (atime/unparse-local atime/normal-date))} + {:key "credits" :name "credits" :sort-key "credits" @@ -151,11 +161,11 @@ (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))) - (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/discount (: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-tip ss 0.0))] + (:sales-summary/total-tax ss 0.0) + (:sales-summary/total-tip ss 0.0))] [:ul (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)) @@ -181,7 +191,7 @@ cash-payments discounts fees gift-card-payments returns refunds] :as debits} (get-debits ss) - + total-debits (reduce + 0.0 (vals debits)) total-credits (+ (- (+ (reduce + 0.0 (map :sales-summary-item/total (:sales-summary/sales-items ss))) @@ -196,7 +206,7 @@ [:li "Food App Payments: " (format "$%,.2f" food-app-payments)] -[:li "Gift Card Payments" + [:li "Gift Card Payments" (format "$%,.2f" gift-card-payments)] [:li "Cash Payments: " diff --git a/src/clj/user.fiddle b/src/clj/user.fiddle index 75b90a2f..643f5413 100644 --- a/src/clj/user.fiddle +++ b/src/clj/user.fiddle @@ -1,4 +1,5 @@ (init-repl) + (comment (defn setup-randy-queries [] (import '[java.util UUID]) @@ -324,4 +325,25 @@ @(dc/transact conn [{:bank-account/code "NGKG-AMEX81007" :bank-account/visible true}]) - ) \ No newline at end of file + ) + + +(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"])