From 0bb95b3b9bca9997227347d67063d21954e1befb Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 16 Jun 2021 07:03:28 -0700 Subject: [PATCH] Adds new query for NGRV --- sales_queries.txt | 86 +++++++++++++++++++++++++++++++++ src/clj/auto_ap/square/core.clj | 3 +- 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 sales_queries.txt diff --git a/sales_queries.txt b/sales_queries.txt new file mode 100644 index 00000000..f695df7a --- /dev/null +++ b/sales_queries.txt @@ -0,0 +1,86 @@ +# Sales summary +[:find ?d4 (sum ?total) (sum ?tax) (sum ?tip) (sum ?service-charge) (sum ?discount) (sum ?returns) +:with ?s +:in $ +:where +[?s :sales-order/client [:client/code "NGRV"]] +[?s :sales-order/date ?d] +[?s :sales-order/total ?total] +[?s :sales-order/tax ?tax] +[?s :sales-order/tip ?tip] +[?s :sales-order/service-charge ?service-charge] +[?s :sales-order/returns ?returns] +[?s :sales-order/discount ?discount] +[(clj-time.coerce/to-date-time ?d) ?d2] +[(auto-ap.time/localize ?d2) ?d3] +[(auto-ap.time/unparse-local ?d3 auto-ap.time/normal-date) ?d4] +] +a15e4880-e288-48e1-8249-6f67de9979c6 + +# Sales Categories +[:find ?d4 ?n ?n2 (sum ?total) (sum ?tax) (sum ?discount) +:with ?s ?li +:in $ +:where +[?s :sales-order/client [:client/code "NGRV"]] +[?s :sales-order/date ?d] +[?s :sales-order/line-items ?li] +[?li :order-line-item/category ?n] +[(get-else $ ?li :order-line-item/item-name "") ?n2] +[?li :order-line-item/total ?total] +[?li :order-line-item/tax ?tax] +[?li :order-line-item/discount ?discount] +[(clj-time.coerce/to-date-time ?d) ?d2] +[(auto-ap.time/localize ?d2) ?d3] +[(auto-ap.time/unparse-local ?d3 auto-ap.time/normal-date) ?d4] +] +a4179936-9a3e-4116-aa56-f7616e16f39f + +# Expected Deposits +[:find ?d4 ?t ?f +:in $ +:where +[?c :client/code "NGRV"] +[?s :expected-deposit/client ?c] +[?s :expected-deposit/total ?t] +[?s :expected-deposit/fee ?f] +[?s :expected-deposit/date ?date] +[(clj-time.coerce/to-date-time ?date) ?d2] +[(auto-ap.time/localize ?d2) ?d3] +[(auto-ap.time/unparse-local ?d3 auto-ap.time/normal-date) ?d4] +] +721af203-47af-487a-b4e0-476d4725a852 + +# Tenders +[:find ?d4 ?type (sum ?total) (sum ?tip) +:with ?charge +:in $ +:where +[?c :client/code "NGRV"] +[?s :sales-order/client ?c] +[?s :sales-order/charges ?charge] +[?charge :charge/type-name ?type] +[?charge :charge/total ?total] +[?charge :charge/tip ?tip] +[?s :sales-order/date ?date] +[(clj-time.coerce/to-date-time ?date) ?d2] +[(auto-ap.time/localize ?d2) ?d3] +[(auto-ap.time/unparse-local ?d3 auto-ap.time/normal-date) ?d4] +] +650da228-a427-4f58-8426-6d4e9c3a3658 + +# Refunds + +[:find ?d4 (sum ?total) (sum ?fee) +:with ?r +:in $ +:where +[?r :sales-refund/client [:client/code "NGRV"]] +[?r :sales-refund/total ?total] +[?r :sales-refund/fee ?fee] +[?r :sales-refund/date ?date] +[(clj-time.coerce/to-date-time ?date) ?d2] +[(auto-ap.time/localize ?d2) ?d3] +[(auto-ap.time/unparse-local ?d3 auto-ap.time/normal-date) ?d4] +] +e6330966-697a-47e3-8223-f685b4f8792b diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj index ea245a60..15957f99 100644 --- a/src/clj/auto_ap/square/core.clj +++ b/src/clj/auto_ap/square/core.clj @@ -127,7 +127,8 @@ "FNH5VRT890WK8" ["NGMJ" "SC"] "AMQ0NPA8FGDEF" ["NGPG" "SZ"] "ACNTYY8WVZ6DV" ["NGVZ" "NP"] - "KMVFQ9CRCXJ10" ["NGZO" "VT"]} location)) + "KMVFQ9CRCXJ10" ["NGZO" "VT"] + "L0J45VZKHWXVR" ["NGRV" "RV"]} location)) ;; to get totals: (comment