From b0fe873fefe1116fb2325066206308f9b311f779 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 6 Dec 2021 17:32:20 -0800 Subject: [PATCH] Adds square koala-production --- src/clj/auto_ap/intuit/core.clj | 8 ++++---- src/clj/auto_ap/intuit/import.clj | 2 +- src/clj/auto_ap/square/core.clj | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/clj/auto_ap/intuit/core.clj b/src/clj/auto_ap/intuit/core.clj index 5626d548..12b12b9a 100644 --- a/src/clj/auto_ap/intuit/core.clj +++ b/src/clj/auto_ap/intuit/core.clj @@ -106,10 +106,10 @@ {:headers (with-auth prod-base-headers token) :as :json - :query-params {"query" "SELECT * From Account"}})) + :query-params {"query" "SELECT * From Account maxresults 1000"}})) :QueryResponse :Account - (filter + #_(filter #(#{"Bank" "Credit Card"} (:AccountType %))) (map (juxt :Id :Name)) (map (fn [[id name]] @@ -118,6 +118,7 @@ + (defn get-transactions [] (client/get (str prod-base-url "/company/" prod-company-id "/reports/TransactionList" "?minorversion=63&start_date=2021-11-30&end_date=2021-11-30") {:headers prod-base-headers @@ -139,7 +140,6 @@ [(keyword h) (:value r)]) headers row)))) - (filter #(= external-id - (:Account %))))))) + (filter #(str/includes? (:Account %) external-id)))))) diff --git a/src/clj/auto_ap/intuit/import.clj b/src/clj/auto_ap/intuit/import.clj index 5683cf25..6bcbab6c 100644 --- a/src/clj/auto_ap/intuit/import.clj +++ b/src/clj/auto_ap/intuit/import.clj @@ -25,7 +25,7 @@ db)) :let [bank-account (d/entity db bank-account) end (auto-ap.time/local-now) - start (time/plus end (time/days -10))] + start (time/plus end (time/days -90))] ] (log/infof "importing from %s to %s for %s" start end external-id) (let [transactions (->> (i/get-transactions (auto-ap.time/unparse start auto-ap.time/iso-date) diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj index 4391f6bd..38bc70ff 100644 --- a/src/clj/auto_ap/square/core.clj +++ b/src/clj/auto_ap/square/core.clj @@ -222,7 +222,9 @@ (not= #{"FAILED"} (set (map #(:status (:card_details %)) (:tenders order))))))) (filter (fn [order] - (not= "Koala" (:name (:source order))))) + (and + (not= "Koala" (:name (:source order))) + (not= "Koala-production" (:name (:source order)))))) (map #(order->sales-order client (get-in env [:square-config client :location]) %))))) #_(daily-results)