Adds sales date
This commit is contained in:
@@ -333,9 +333,10 @@
|
|||||||
:db/doc "What day of the month"
|
:db/doc "What day of the month"
|
||||||
:db/valueType :db.type/long
|
:db/valueType :db.type/long
|
||||||
:db/cardinality :db.cardinality/one}]]}
|
:db/cardinality :db.cardinality/one}]]}
|
||||||
:auto-ap/add-power-user-schema {:txes [[{:db/ident :user-role/power-user}]]}}
|
:auto-ap/add-power-user-schema {:txes [[{:db/ident :user-role/power-user}]]}
|
||||||
:auto-ap/add-transaction-date-index {:txes [[{:db/ident :transaction/date
|
:auto-ap/add-transaction-date-index {:txes [[{:db/ident :transaction/date
|
||||||
:db/index true}]]}
|
:db/index true}]]}}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
sales/norms-map
|
sales/norms-map
|
||||||
|
|||||||
@@ -191,7 +191,11 @@
|
|||||||
{:db/ident :sales-refund/fee
|
{:db/ident :sales-refund/fee
|
||||||
:db/doc "The total fee on the refund"
|
:db/doc "The total fee on the refund"
|
||||||
:db/valueType :db.type/double
|
:db/valueType :db.type/double
|
||||||
:db/cardinality :db.cardinality/one}]]}})
|
:db/cardinality :db.cardinality/one}]]}
|
||||||
|
:add-sales-date {:txes [[{:db/ident :expected-deposit/sales-date
|
||||||
|
:db/doc "The date of sales the deposit was for"
|
||||||
|
:db/valueType :db.type/instant
|
||||||
|
:db/cardinality :db.cardinality/one}]]}})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -252,6 +252,14 @@
|
|||||||
(retry f (inc i))))
|
(retry f (inc i))))
|
||||||
(log/error "Too many failures"))))
|
(log/error "Too many failures"))))
|
||||||
|
|
||||||
|
(defn get-payment [p]
|
||||||
|
(:payment (:body (retry #(client/get (str "https://connect.squareup.com/v2/payments/" p)
|
||||||
|
{:headers base-headers
|
||||||
|
:as :json
|
||||||
|
:retry-handler (fn [ex try-count http-context]
|
||||||
|
(log/warn "Retrying after failure " ex)
|
||||||
|
(if (> try-count 4) false true))})))))
|
||||||
|
|
||||||
(defn settlements
|
(defn settlements
|
||||||
([l] (settlements l (lookup-dates)))
|
([l] (settlements l (lookup-dates)))
|
||||||
([l lookup-dates]
|
([l lookup-dates]
|
||||||
@@ -298,7 +306,19 @@
|
|||||||
(amount->money (:fee_money entry))))
|
(amount->money (:fee_money entry))))
|
||||||
(:entries settlement))))
|
(:entries settlement))))
|
||||||
:date (-> (:initiated_at settlement)
|
:date (-> (:initiated_at settlement)
|
||||||
(coerce/to-date))})))
|
(coerce/to-date))
|
||||||
|
:sales-date (->> settlement
|
||||||
|
:entries
|
||||||
|
(map :payment_id)
|
||||||
|
(set)
|
||||||
|
(take 10)
|
||||||
|
(map (fn [p]
|
||||||
|
(get-payment p)))
|
||||||
|
(map :created_at)
|
||||||
|
(map coerce/to-date)
|
||||||
|
(sort)
|
||||||
|
(drop 5)
|
||||||
|
first)})))
|
||||||
(filter :expected-deposit/date)))
|
(filter :expected-deposit/date)))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user