From 58217158e31f62a16e41b8fca6f8b38b764e11cf Mon Sep 17 00:00:00 2001 From: Bryce Date: Thu, 18 Apr 2024 12:37:11 -0700 Subject: [PATCH] Adds unknown processor to payments --- resources/schema.edn | 5 +++ src/clj/auto_ap/jobs/sales_summaries.clj | 32 +++++++++++++++++-- src/clj/auto_ap/ssr/admin/sales_summaries.clj | 10 ++++-- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/resources/schema.edn b/resources/schema.edn index 3092422f..1c5e1156 100644 --- a/resources/schema.edn +++ b/resources/schema.edn @@ -1932,6 +1932,11 @@ :db/noHistory true, :db/valueType :db.type/double :db/cardinality :db.cardinality/one} + {:db/ident :sales-summary/total-unknown-processor-payments + :db/noHistory true, + :db/valueType :db.type/double + :db/cardinality :db.cardinality/one} + {:db/ident :sales-summary/total-cash-refunds :db/noHistory true, :db/valueType :db.type/double diff --git a/src/clj/auto_ap/jobs/sales_summaries.clj b/src/clj/auto_ap/jobs/sales_summaries.clj index 583ddc11..5de94d79 100644 --- a/src/clj/auto_ap/jobs/sales_summaries.clj +++ b/src/clj/auto_ap/jobs/sales_summaries.clj @@ -135,6 +135,18 @@ (dc/db conn) [[c] date date])) 0.0) + :sales-summary/total-unknown-processor-payments + (or (ffirst (dc/q '[:find (sum ?total) + :with ?c + :in $ [?clients ?start-date ?end-date] + :where [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]] + [?e :sales-order/charges ?c] + [?c :charge/type-name "OTHER"] + [?c :charge/processor :ccp-processor/na] + [?c :charge/total ?total]] + (dc/db conn) + [[c] date date])) + 0.0) :sales-summary/total-card-fees (or (ffirst (dc/q '[:find ?f :in $ ?client ?d @@ -250,10 +262,24 @@ (dc/q '[:find (pull ?sos [* {:sales-summary/sales-items [*]}]) :in $ - :where [?sos :sales-summary/client [:client/code "NGCL"]] + :where [?sos :sales-summary/client [:client/code "NGHW"]] [?sos :sales-summary/date ?d] - [(= ?d #inst "2024-03-25T00:00:00-07:00")]] - (dc/db conn))) + [(= ?d #inst "2024-04-10T00:00:00-07:00")]] + (dc/db conn)) + + (dc/q '[:find ?n ?p2 (sum ?total) + :with ?c + :in $ [?clients ?start-date ?end-date] + :where [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]] + [?e :sales-order/charges ?c] + [?c :charge/type-name ?n] + [?c :charge/processor ?p] + [?p :db/ident ?p2] + [?c :charge/total ?total]] + (dc/db conn) + [[(auto-ap.datomic/pull-attr (dc/db conn) :db/id [:client/code "NGHW"])] #inst "2024-04-11T00:00:00-07:00" #inst "2024-04-11T00:00:00-07:00"]) + + ) diff --git a/src/clj/auto_ap/ssr/admin/sales_summaries.clj b/src/clj/auto_ap/ssr/admin/sales_summaries.clj index fb4c7043..ffa03afa 100644 --- a/src/clj/auto_ap/ssr/admin/sales_summaries.clj +++ b/src/clj/auto_ap/ssr/admin/sales_summaries.clj @@ -104,8 +104,8 @@ (:sales-summary/total-food-app-fees ss 0.0) (- (:sales-summary/total-food-app-refunds ss 0.0))) :gift-card-payments (+ (:sales-summary/total-gift-card-payments ss 0.0) - (:sales-summary/total-gift-card-fees ss 0.0) - (- (:sales-summary/total-gift-card-refunds ss 0.0))) + (:sales-summary/total-gift-card-fees ss 0.0) + (- (:sales-summary/total-gift-card-refunds ss 0.0))) #_#_:refunds (+ (:sales-summary/total-food-app-refunds ss 0.0) (:sales-summary/total-card-refunds ss 0.0) (:sales-summary/total-cash-refunds ss 0.0)) @@ -113,6 +113,7 @@ :fees (- (:sales-summary/total-card-fees ss 0.0)) :cash-payments (+ (:sales-summary/total-cash-payments ss 0.0) (- (:sales-summary/total-cash-refunds ss 0.0))) + :total-unknown-processor-payments (:sales-summary/total-unknown-processor-payments ss 0.0) :discounts (+ (:sales-summary/discount ss 0.0)) :returns (+ (:sales-summary/total-returns ss 0.0))}) @@ -190,7 +191,7 @@ (let [{:keys [card-payments food-app-payments cash-payments discounts fees gift-card-payments - returns refunds] :as debits} (get-debits ss) + returns refunds total-unknown-processor-payments] :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))) @@ -208,6 +209,9 @@ (format "$%,.2f" food-app-payments)] [:li "Gift Card Payments" (format "$%,.2f" gift-card-payments)] + [:li "Unknown Processor Payments: " + + (format "$%,.2f" total-unknown-processor-payments)] [:li "Cash Payments: " (format "$%,.2f" cash-payments)]