notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes bug with client page

Browse Source
This commit is contained in:
Bryce
2024-04-01 19:46:37 -07:00
parent 3957286624
commit 72a17486cd
4 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/public/output.css
View File

File diff suppressed because one or more lines are too long

26
src/clj/auto_ap/jobs/sales_summaries.clj
View File

@@ -43,10 +43,11 @@
(filter (fn [sales-summary]
(= client-id (:db/id (:sales-summary/client sales-summary))))))))
(defn sales-summaries []
(doseq [[c client-code] (dc/q '[:find ?c ?client-code
:in $
:where [?c :client/code ?client-code] ]
:where [?c :client/code ?client-code]]
(dc/db conn))
{:sales-summary/keys [date] :db/keys [id]} (dirty-sales-summaries c)]
(mu/with-context {:client-code client-code
@@ -220,10 +221,12 @@
(dc/db conn)
[[c] date date]))
0.0)}]
(when (seq (:sales-summary/sales-items result))
(alog/info ::upserting-summaries
:category-count (count (:sales-summary/sales-items result)))
@(dc/transact conn [ [:upsert-entity result]]))))))
(if (seq (:sales-summary/sales-items result))
(do
(alog/info ::upserting-summaries
:category-count (count (:sales-summary/sales-items result)))
@(dc/transact conn [[:upsert-entity result]]))
@(dc/transact conn [{:db/id id :sales-summary/dirty false}]))))))
(defn reset-summaries []
@(dc/transact conn (->> (dc/q '[:find ?sos
@@ -240,7 +243,7 @@
(auto-ap.datomic/transact-schema conn)
(apply mark-dirty [:client/code "NGCL"] (last-n-days 12))
(mark-all-dirty 30)
(sales-summaries)
@@ -250,16 +253,7 @@
:where [?sos :sales-summary/client [:client/code "NGCL"]]
[?sos :sales-summary/date ?d]
[(= ?d #inst "2024-03-25T00:00:00-07:00")]]
(dc/db conn))
)
(dc/db conn)))

44
src/clj/auto_ap/square/core3.clj
View File

@@ -863,3 +863,47 @@
@(apply upsert-all clients)))
(comment
(defn refunds-raw-cont
([client l cursor so-far]
(de/chain (manifold-api-call {:url (str "https://connect.squareup.com/v2/refunds?location_id=" (:square-location/square-id l)
(when cursor
(str "&cursor=" cursor))
"&begin_time=2024-03-12T19:59:05.342Z")
:method :get
:headers (client-base-headers client)
:as :json})
:body
(fn [rr]
(if (:cursor rr)
(refunds-raw-cont client l (:cursor rr)
(concat so-far (:refunds rr)))
(concat so-far (:refunds rr)))))))
#_(defn refunds-raw
([client l]
(de/chain (manifold-api-call {:url (str "https://connect.squareup.com/v2/refunds?location_id=" (:square-location/square-id l) "&begin_time=2024-03-14&end_time=2024-03-15")
:method :get
:headers (client-base-headers client)
:as :json})
:body)))
(def refs
(->>
@(let [[c [l]] (get-square-client-and-location "NGCL")]
(refunds-raw-cont c l nil []))
(filter (fn [r]
(str/starts-with? (:created_at r) "2024-03-14")))))
(let [[c [l]] (get-square-client-and-location "NGCL")]
#_(get-payment c l )
(map (fn [r] @(get-payment c (:payment_id r))) refs))
)

4
src/clj/auto_ap/ssr/admin/clients.clj
View File

@@ -223,7 +223,9 @@
:render (fn [{:client/keys [locked-until bank-accounts]}]
[:div.flex.gap-2.flex-wrap
(if locked-until
(let [days-since-locked (time/in-days (time/interval locked-until (time/now)))]
(let [days-since-locked (try (time/in-days (time/interval locked-until (time/now)))
(catch Exception _
0))]
(cond
(< days-since-locked 90)
(com/pill {:color :primary} (format "Locked %s" (atime/unparse-local locked-until atime/normal-date)))