further cleans up POS
This commit is contained in:
@@ -20,13 +20,11 @@
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[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-tender-table)
|
||||
@@ -35,52 +33,36 @@
|
||||
#_#_:hx-disabled-elt "find fieldset"}
|
||||
|
||||
[:fieldset.space-y-6
|
||||
(date-range-field* params)
|
||||
(processor-field* params)
|
||||
(total-field* params)]])
|
||||
(date-range-field* request)
|
||||
(processor-field* request)
|
||||
(total-field* request)]])
|
||||
|
||||
(defn <-datomic [result]
|
||||
(let [expected-deposit (some-> (:expected-deposit/_charges result)
|
||||
first
|
||||
(update :expected-deposit/date c/from-date))]
|
||||
(cond-> result
|
||||
true (update :charge/date c/from-date)
|
||||
true (update :charge/processor :db/ident)
|
||||
expected-deposit (assoc :expected-deposit expected-deposit))))
|
||||
(def default-read '[:db/id
|
||||
:charge/reference-link
|
||||
:charge/total
|
||||
:charge/tip
|
||||
[:charge/date :xform clj-time.coerce/from-date]
|
||||
{:charge/client [:client/name :db/id :client/code]
|
||||
[:charge/processor :xform iol-ion.query/ident] [:db/ident]
|
||||
:expected-deposit/_charges [:expected-deposit/date :db/id]}])
|
||||
|
||||
(def default-read '[*
|
||||
{:charge/client [:client/name :db/id :client/code]
|
||||
:charge/processor [:db/ident]
|
||||
:expected-deposit/_charges [:expected-deposit/date :db/id]}])
|
||||
|
||||
(defn fetch-ids [db args]
|
||||
(let [query-params (:parsed-query-params args)
|
||||
valid-clients (extract-client-ids (:clients args)
|
||||
(:client args)
|
||||
(defn fetch-ids [db request]
|
||||
(let [query-params (:parsed-query-params request)
|
||||
valid-clients (extract-client-ids (:clients request)
|
||||
(:client request)
|
||||
(:client-id query-params)
|
||||
(when (:client-code query-params)
|
||||
[:client/code (:client-code query-params)]))
|
||||
valid-clients (->> valid-clients
|
||||
(take 10)
|
||||
set)
|
||||
_ (println "valid clients" valid-clients)
|
||||
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 %))))
|
||||
processor (some-> query-params :processor (#(keyword "ccp-processor" (name %))))
|
||||
processor (some-> query-params :processor (#(keyword "ccp-processor" (name %)))) ; TODO parse
|
||||
query (cond-> {:query {:find []
|
||||
:in ['$ '[?clients ?start-date ?end-date]]
|
||||
:where '[[(iol-ion.query/scan-charges $ ?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-> (:start-date query-params) c/to-date)
|
||||
(some-> (:end-date query-params) c/to-date)]]}
|
||||
(:sort query-params) (add-sorter-fields {"client" ['[?e :charge/client ?c]
|
||||
'[?c :client/name ?sort-client]]
|
||||
"date" ['[?e :charge/date ?sort-date]]
|
||||
@@ -96,17 +78,17 @@
|
||||
:where []}
|
||||
:args [(:exact-match-id query-params)]})
|
||||
|
||||
total-gte
|
||||
(:total-gte query-params)
|
||||
(merge-query {:query {:in ['?total-gte]
|
||||
:where ['[?e :charge/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 :charge/total ?a]
|
||||
'[(<= ?a ?total-lte)]]}
|
||||
:args [total-lte]})
|
||||
:args [(:total-lte query-params)]})
|
||||
|
||||
processor
|
||||
(merge-query {:query {:in '[?processor]
|
||||
@@ -116,6 +98,7 @@
|
||||
|
||||
true
|
||||
(merge-query {:query {:find ['?sort-default '?e]}}))]
|
||||
|
||||
(cond->> (query2 query)
|
||||
true (apply-sort-3 query-params)
|
||||
true (apply-pagination query-params))))
|
||||
@@ -125,16 +108,14 @@
|
||||
(group-by :db/id))
|
||||
charges (->> ids
|
||||
(map results)
|
||||
(map first)
|
||||
(mapv <-datomic)
|
||||
)]
|
||||
(map first))]
|
||||
charges))
|
||||
|
||||
(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 "tender-table"
|
||||
@@ -143,8 +124,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"]
|
||||
@@ -155,16 +136,16 @@
|
||||
:title "Tenders"
|
||||
:entity-name "Tender"
|
||||
:route :pos-tender-table
|
||||
:action-buttons (fn [_ args])
|
||||
:row-buttons (fn [_ e]
|
||||
:action-buttons (fn [request])
|
||||
:row-buttons (fn [request e]
|
||||
(when (:charge/reference-link e)
|
||||
[(com/a-icon-button {:href (:charge/reference-link e)}
|
||||
svg/external-link)]))
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:hide? (fn [request]
|
||||
(= (count (:clients request)) 1))
|
||||
:render #(-> % :charge/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
@@ -188,17 +169,30 @@
|
||||
{:key "links"
|
||||
:name "Links"
|
||||
:render (fn [entity]
|
||||
(when-let [expected-deposit-id (some->> entity :expected-deposit :db/id)]
|
||||
(when-let [expected-deposit-id (some->> entity :expected-deposit/_charges first :db/id)]
|
||||
[:a {:href (str (bidi/path-for ssr-routes/only-routes
|
||||
:pos-expected-deposits)
|
||||
"?exact-match-id=" expected-deposit-id)}
|
||||
"?exact-match-id=" expected-deposit-id)
|
||||
:hx-boost "true"}
|
||||
(com/pill {:color :secondary} "expected deposit")]))}]})
|
||||
|
||||
(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 :processor #(query-params/parse-keyword "ccp-processor" %))
|
||||
(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 :processor #(query-params/parse-keyword "ccp-processor" %))
|
||||
(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-tenders (wrap-client-redirect-unauthenticated (wrap-secure page))
|
||||
{:pos-tenders (wrap-client-redirect-unauthenticated (wrap-secure page))
|
||||
:pos-tender-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
|
||||
|
||||
Reference in New Issue
Block a user