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

Creates daily sales summaries

Browse Source
This commit is contained in:
Bryce
2024-04-24 16:15:30 -07:00
parent 53b7da9512
commit 7154d0ff21
4 changed files with 80 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -215,8 +215,7 @@
(map (fn [transaction] (map (fn [transaction]
(cond-> transaction (cond-> transaction
(:transaction/payment transaction) (update-in [:transaction/payment :payment/date] coerce/from-date) (:transaction/payment transaction) (update-in [:transaction/payment :payment/date] coerce/from-date)
(:transaction/expected-deposit transaction) (update-in [:transaction/expected-deposit :expected-deposit/date] coerce/from-date)) (:transaction/expected-deposit transaction) (update-in [:transaction/expected-deposit :expected-deposit/date] coerce/from-date))))
))
(map #(dissoc % :transaction/id)) (map #(dissoc % :transaction/id))
(group-by :db/id))] (group-by :db/id))]
@@ -253,7 +252,7 @@
:transaction/accounts [:transaction-account/amount :transaction/accounts [:transaction-account/amount
:db/id :db/id
:transaction-account/location :transaction-account/location
{ :transaction-account/account [:account/name :db/id {:transaction-account/account [:account/name :db/id
:account/location :account/location
{:account/client-overrides [:account-client-override/name {:account/client-overrides [:account-client-override/name
{:account-client-override/client [:db/id]}]}]}] {:account-client-override/client [:db/id]}]}]}]

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

@@ -32,6 +32,15 @@
(apply mark-dirty c (last-n-days days)))) (apply mark-dirty c (last-n-days days))))
(defn delete-all []
@(dc/transact conn
(->>
(dc/q '[:find ?ss
:where [?ss :sales-summary/date]]
(dc/db conn))
(map (fn [[ ss]]
[:db/retractEntity ss])))))
(defn dirty-sales-summaries [c] (defn dirty-sales-summaries [c]
@@ -58,7 +67,7 @@
:in $ [?clients ?start-date ?end-date] :in $ [?clients ?start-date ?end-date]
:where [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]] :where [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
[?e :sales-order/line-items ?li] [?e :sales-order/line-items ?li]
[?li :order-line-item/item-name ?item-name] [(get-else $ ?li :order-line-item/item-name "Unknown") ?item-name]
[?li :order-line-item/category ?category] [?li :order-line-item/category ?category]
[?li :order-line-item/total ?total] [?li :order-line-item/total ?total]
[?li :order-line-item/tax ?tax] [?li :order-line-item/tax ?tax]
@@ -259,9 +268,12 @@
:db/valueType :db.type/double :db/valueType :db.type/double
:db/cardinality :db.cardinality/one}]) :db/cardinality :db.cardinality/one}])
(apply mark-dirty [:client/code "NGCL"] (last-n-days 12)) (apply mark-dirty [:client/code "NGCL"] (last-n-days 14))
(apply mark-dirty [:client/code "NGDG"] (last-n-days 14))
(apply mark-dirty [:client/code "NGPG"] (last-n-days 14))
(mark-all-dirty 50) (mark-all-dirty 50)
(delete-all)
(sales-summaries) (sales-summaries)
@@ -284,6 +296,15 @@
(dc/db conn) (dc/db conn)
[[(auto-ap.datomic/pull-attr (dc/db conn) :db/id [:client/code "NGHW"])] #inst "2024-04-11T00:00:00-07:00" #inst "2024-04-11T00:00:00-07:00"]) [[(auto-ap.datomic/pull-attr (dc/db conn) :db/id [:client/code "NGHW"])] #inst "2024-04-11T00:00:00-07:00" #inst "2024-04-11T00:00:00-07:00"])
(dc/q '[:find ?n
:in $ [?clients ?start-date ?end-date]
:where [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
[?e :sales-order/line-items ?li]
[?li :order-line-item/item-name ?n] ]
(dc/db conn)
[[(auto-ap.datomic/pull-attr (dc/db conn) :db/id [:client/code "NGCL"])] #inst "2024-04-11T00:00:00-07:00" #inst "2024-04-24T00:00:00-07:00"])
) )

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

@@ -41,7 +41,7 @@
(de/chain (de/chain
(de/loop [attempt 0] (de/loop [attempt 0]
(-> (de/chain (de/future-with (ex/execute-pool) (-> (de/chain (de/future-with (ex/execute-pool)
(log/info ::request-started #_(log/info ::request-started
:url (:url request) :url (:url request)
:attempt attempt :attempt attempt
:source "Square 3" :source "Square 3"
@@ -1008,6 +1008,7 @@
(require 'auto-ap.time-reader) (require 'auto-ap.time-reader)
@(upsert-all "NGPG")
(clojure.pprint/pprint (let [[c [l]] (get-square-client-and-location "NGHW")] (clojure.pprint/pprint (let [[c [l]] (get-square-client-and-location "NGHW")]

4
src/cljs/auto_ap/views/components/grid.cljs
View File

@@ -223,9 +223,7 @@
(defn cell [params] (defn cell [params]
(apply r/create-element "td" #js {:className (:class params) :style (some-> (:style params) clj->js)} (apply r/create-element "td" #js {:className (:class params) :style (some-> (:style params) clj->js)}
(map r/as-element (r/children (r/current-component)))) (map r/as-element (r/children (r/current-component)))))
)
(defn body [] (defn body []
(let [children (r/children (r/current-component)) (let [children (r/children (r/current-component))