progress on migrating all grids.
This commit is contained in:
@@ -21,7 +21,8 @@
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[clojure.set :as set]
|
||||
[auto-ap.query-params :as query-params]))
|
||||
[auto-ap.query-params :as query-params]
|
||||
[malli.core :as m]))
|
||||
|
||||
;; TODO refunds
|
||||
;; always should be fast
|
||||
@@ -48,17 +49,10 @@
|
||||
|
||||
(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)
|
||||
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
|
||||
:args [db [(:trimmed-clients request)
|
||||
(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]
|
||||
@@ -109,64 +103,54 @@
|
||||
[(->> (hydrate-results ids-to-retrieve db request))
|
||||
matching-count]))
|
||||
|
||||
(def grid-page {:id "refund-table"
|
||||
:nav (com/main-aside-nav)
|
||||
:page-specific-nav filters
|
||||
:id-fn :db/id
|
||||
:fetch-page fetch-page
|
||||
:oob-render
|
||||
(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"]
|
||||
(def grid-page
|
||||
(helper/build {:id "refund-table"
|
||||
:nav (com/main-aside-nav)
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
: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))
|
||||
:oob-render
|
||||
(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"]
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-refunds)}
|
||||
"Refunds"]]
|
||||
:title "Refunds"
|
||||
:entity-name "Refund"
|
||||
:route :pos-refund-table
|
||||
:action-buttons (fn [request])
|
||||
:row-buttons (fn [request _])
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :sales-refund/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:sales-refund/date %) atime/standard-time)}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :sales-refund/total (format "$%.2f"))}
|
||||
{:key "type"
|
||||
:name "Type"
|
||||
:sort-key "type"
|
||||
:render :sales-refund/type}
|
||||
{:key "fee"
|
||||
:name "Fee"
|
||||
:sort-key "fee"
|
||||
:render #(some->> % :sales-refund/fee (format "$%.2f"))}]})
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-refunds)}
|
||||
"Refunds"]]
|
||||
:title "Refunds"
|
||||
:entity-name "Refund"
|
||||
:route :pos-refund-table
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :sales-refund/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:sales-refund/date %) atime/standard-time)}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :sales-refund/total (format "$%.2f"))}
|
||||
{:key "type"
|
||||
:name "Type"
|
||||
:sort-key "type"
|
||||
:render :sales-refund/type}
|
||||
{:key "fee"
|
||||
:name "Fee"
|
||||
:sort-key "fee"
|
||||
:render #(some->> % :sales-refund/fee (format "$%.2f"))}]}))
|
||||
|
||||
(def row* (partial helper/row* grid-page))
|
||||
(def table* (partial helper/table* 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))
|
||||
:pos-refund-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
|
||||
{:pos-refunds (helper/page-route grid-page)
|
||||
:pos-refund-table (helper/table-route grid-page)})
|
||||
|
||||
Reference in New Issue
Block a user