diff --git a/sales_queries.txt b/sales_queries.txt index 8041ae6b..888ec3ad 100644 --- a/sales_queries.txt +++ b/sales_queries.txt @@ -80,5 +80,4 @@ [?r :sales-refund/type ?t] [(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] -] +[(auto-ap.time/unparse-local ?d3 auto-ap.time/normal-date) ?d4]] diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj index bc8a187e..2fd14703 100644 --- a/src/clj/auto_ap/square/core.clj +++ b/src/clj/auto_ap/square/core.clj @@ -221,6 +221,8 @@ (seq (:returns order))) (not= #{"FAILED"} (set (map #(:status (:card_details %)) (:tenders order))))))) + (filter (fn [order] + (not= "Koala" (:name (:source order))))) (map #(order->sales-order client (get-in env [:square-config client :location]) %))))) #_(daily-results) diff --git a/src/clj/user.clj b/src/clj/user.clj index f1dd064b..d8a8a6c9 100644 --- a/src/clj/user.clj +++ b/src/clj/user.clj @@ -459,7 +459,6 @@ output-chan (comp (map #(do - (println "looking up " (:key %)) [(:key %) (str (slurp (:object-content (s3/get-object :bucket-name (:data-bucket env) @@ -594,6 +593,23 @@ )]))) +(defn print-sales-queries [client-code] + (let [sales-summary-id (first (find-queries [client-code "service-charge"])) + sales-category-id (first (find-queries [client-code "item-name"])) + expected-deposit-id (first (find-queries [client-code "expected-deposit"])) + tender-id (first (find-queries [client-code "charge"])) + refund-id (first (find-queries [client-code "sales-refund"]))] + + (println "For" client-code ":") + (println "Sales: " (str "https://app.integreatconsult.com/api/queries/" sales-summary-id "/results/json")) + (println "Sales Category: " (str "https://app.integreatconsult.com/api/queries/" sales-category-id "/results/json")) + (println "Expected Deposits: " (str "https://app.integreatconsult.com/api/queries/" expected-deposit-id "/results/json")) + (println "Tenders: " (str "https://app.integreatconsult.com/api/queries/" tender-id "/results/json")) + (println "Sales Category: " (str "https://app.integreatconsult.com/api/queries/" refund-id "/results/json")) + (println "") + )) + + (defn historical-load-sales [client-code days] (println "orders") (lc/with-context {:source "Historical loading data"} @@ -606,6 +622,8 @@ (println "refunds") (auto-ap.square.core/upsert-refunds client-code) + + (println "settlements") (with-redefs [auto-ap.square.core/lookup-dates (fn lookup-dates [] (->> (clj-time.periodic/periodic-seq (t/plus (t/now) (t/days (- days))) (t/now)