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

further cleans up POS

Browse Source
This commit is contained in:
Bryce
2023-09-28 20:41:00 -07:00
parent c73c7619d8
commit d1798f6b5c
13 changed files with 684 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/clj/auto_ap/ssr/pos/refunds.clj
View File

@@ -20,13 +20,14 @@
[bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]
[clojure.set :as set]))
[clojure.set :as set]
[auto-ap.query-params :as query-params]))
;; TODO refunds
;; always should be fast
;; make params parsing composable
(defn filters [params]
(defn filters [request]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
"hx-get" (bidi/path-for ssr-routes/only-routes
:pos-refund-table)
@@ -35,47 +36,37 @@
#_#_:hx-disabled-elt "find fieldset"}
[:fieldset.space-y-6
(date-range-field* params)
(total-field* params)]])
(date-range-field* request)
(total-field* request)]])
(defn <-datomic [result]
(cond-> result
true (update :sales-refund/date c/from-date)))
(def default-read '[*
(def default-read '[:db/id
:sales-refund/total
:sales-refund/fee
:sales-refund/type
[:sales-refund/date :xform clj-time.coerce/from-date]
{:sales-refund/client [:client/name :db/id :client/code]}])
(defn fetch-ids [db args]
(let [query-params (:parsed-query-params args)
valid-clients (extract-client-ids (:clients args)
(defn fetch-ids [db request]
(let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
start-date (some-> args
:parsed-query-params
:start-date
(atime/parse atime/normal-date))
end-date (some-> args
:parsed-query-params
:end-date
(atime/parse atime/normal-date))
total-gte (some-> args :parsed-query-params :total-gte not-empty (#(if (string? %) (Double/parseDouble %) (double %))))
total-lte (some-> args :parsed-query-params :total-lte not-empty (#(if (string? %) (Double/parseDouble %) (double %))))
query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-sales-refunds $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients
(some-> start-date c/to-date)
(some-> end-date c/to-date )]]}
(some-> query-params :start-date c/to-date)
(some-> query-params :end-date c/to-date )]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :sales-refund/client ?c]
'[?c :client/name ?sort-client]]
"date" ['[?e :sales-refund/date ?sort-date]]
"total" ['[?e :sales-refund/total ?sort-total]]
"fee" ['[?e :sales-refund/fee ?sort-tip]]
"type" ['[?e :sales-refund/type ?type]]}
"type" ['[?e :sales-refund/type ?sort-type]]}
query-params)
(:exact-match-id query-params)
@@ -83,29 +74,17 @@
:where []}
:args [(:exact-match-id query-params)]})
total-gte
(:total-gte query-params)
(merge-query {:query {:in ['?total-gte]
:where ['[?e :sales-refund/total ?a]
'[(>= ?a ?total-gte)]]}
:args [total-gte]})
:args [(:total-gte query-params)]})
total-lte
(:total-lte query-params)
(merge-query {:query {:in ['?total-lte]
:where ['[?e :sales-refund/total ?a]
'[(<= ?a ?total-lte)]]}
:args [total-lte]})
start-date
(merge-query {:query {:in '[?start-date]
:where ['[?e :sales-refund/date ?date]
'[(>= ?date ?start-date)]]}
:args [(c/to-date start-date)]})
end-date
(merge-query {:query {:in '[?end-date]
:where ['[?e :sales-refund/date ?date]
'[(<= ?date ?end-date)]]}
:args [(c/to-date end-date)]})
:args [(:total-lte query-params)]})
true
(merge-query {:query {:find ['?sort-default '?e]
@@ -120,16 +99,14 @@
(group-by :db/id))
refunds (->> ids
(map results)
(map first)
(mapv <-datomic)
)]
(map first))]
refunds))
(defn fetch-page [_ args]
(defn fetch-page [request]
(let [db (dc/db conn)
{ids-to-retrieve :ids matching-count :count} (fetch-ids db args)]
{ids-to-retrieve :ids matching-count :count} (fetch-ids db request)]
[(->> (hydrate-results ids-to-retrieve db args))
[(->> (hydrate-results ids-to-retrieve db request))
matching-count]))
(def grid-page {:id "refund-table"
@@ -138,8 +115,8 @@
:id-fn :db/id
:fetch-page fetch-page
:oob-render
(fn [_ params]
[(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)])
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"POS"]
@@ -150,8 +127,8 @@
:title "Refunds"
:entity-name "Refund"
:route :pos-refund-table
:action-buttons (fn [_ args])
:row-buttons (fn [_ e])
:action-buttons (fn [request])
:row-buttons (fn [request _])
:headers [{:key "client"
:name "Client"
:sort-key "client"
@@ -177,8 +154,18 @@
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table (partial helper/table grid-page))
(def page (partial helper/page grid-page))
(def table (-> (partial helper/table grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def page (-> (partial helper/page grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def key->handler
{:pos-refunds (wrap-client-redirect-unauthenticated (wrap-secure page))