Merge branch 'master' of bitbucket.org:brycecovertoperations/integreat
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
[auto-ap.jobs.core :refer [execute]]
|
[auto-ap.jobs.core :refer [execute]]
|
||||||
[amazonica.aws.s3 :as s3]
|
[amazonica.aws.s3 :as s3]
|
||||||
[auto-ap.square.core :as square]
|
[auto-ap.square.core :as square]
|
||||||
[auto-ap.square.core2 :as square2]
|
[auto-ap.square.core3 :as square3]
|
||||||
[clj-time.periodic :as per]
|
[clj-time.periodic :as per]
|
||||||
[clj-time.core :as time]
|
[clj-time.core :as time]
|
||||||
[datomic.api :as d]
|
[datomic.api :as d]
|
||||||
@@ -66,14 +66,14 @@
|
|||||||
(time/today)
|
(time/today)
|
||||||
(time/days 1))]
|
(time/days 1))]
|
||||||
(println d)
|
(println d)
|
||||||
(square2/upsert client square-location (coerce/to-date-time d) (coerce/to-date-time (time/plus d (time/days 1))))))
|
@(square3/upsert client square-location (coerce/to-date-time d) (coerce/to-date-time (time/plus d (time/days 1))))))
|
||||||
|
|
||||||
(println "refunds")
|
(println "refunds")
|
||||||
(square2/upsert-refunds client square-location)
|
@(square3/upsert-refunds client square-location)
|
||||||
|
|
||||||
|
|
||||||
(println "settlements")
|
(println "settlements")
|
||||||
(with-redefs [square2/lookup-dates (fn lookup-dates []
|
(with-redefs [square3/lookup-dates (fn lookup-dates []
|
||||||
(->> (per/periodic-seq (time/plus (time/today) (time/days (- days)))
|
(->> (per/periodic-seq (time/plus (time/today) (time/days (- days)))
|
||||||
(time/today)
|
(time/today)
|
||||||
(time/days 2))
|
(time/days 2))
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
|
|
||||||
(atime/unparse (time/plus d (time/days 2)) atime/iso-date)]))))]
|
(atime/unparse (time/plus d (time/days 2)) atime/iso-date)]))))]
|
||||||
|
|
||||||
(square2/upsert-settlements client square-location)))))
|
@(square3/upsert-settlements client square-location)))))
|
||||||
|
|
||||||
|
|
||||||
(defn load-historical-sales [args]
|
(defn load-historical-sales [args]
|
||||||
|
|||||||
Reference in New Issue
Block a user