progress on migrating all grids.
This commit is contained in:
@@ -8,10 +8,6 @@
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
[auto-ap.graphql.utils :refer [extract-client-ids]]
|
||||
[auto-ap.query-params :as query-params]
|
||||
[auto-ap.routes.utils
|
||||
:refer [wrap-client-redirect-unauthenticated wrap-secure]]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
@@ -19,7 +15,8 @@
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]))
|
||||
[datomic.api :as dc]
|
||||
[malli.core :as m]))
|
||||
|
||||
;; always should be fast
|
||||
|
||||
@@ -42,17 +39,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-cash-drawer-shifts $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
|
||||
:args [db [valid-clients
|
||||
:args [db [(:trimmed-clients request)
|
||||
(some-> (:start-date query-params) c/to-date)
|
||||
(some-> (:end-date query-params) c/to-date )]]}
|
||||
(:sort query-params) (add-sorter-fields {"client" ['[?e :cash-drawer-shift/client ?c]
|
||||
@@ -93,64 +83,57 @@
|
||||
[(->> (hydrate-results ids-to-retrieve db request))
|
||||
matching-count]))
|
||||
|
||||
(def grid-page {:id "cash-drawer-shift-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 "cash-drawer-shift-table"
|
||||
:nav (com/main-aside-nav)
|
||||
:page-specific-nav filters
|
||||
: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"]
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-cash-drawer-shifts)}
|
||||
"Cash Drawer Shifts"]]
|
||||
:title "Cash drawer shifts"
|
||||
:entity-name "Cash drawer shift"
|
||||
:route :pos-cash-drawer-shift-table
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :cash-drawer-shift/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:cash-drawer-shift/date %) atime/standard-time)}
|
||||
{:key "paid-in"
|
||||
:name "Paid in"
|
||||
:sort-key "paid-in"
|
||||
:render #(some->> % :cash-drawer-shift/paid-in (format "$%.2f"))}
|
||||
{:key "paid-out"
|
||||
:name "Paid out"
|
||||
:sort-key "paid-out"
|
||||
:render #(some->> % :cash-drawer-shift/paid-out (format "$%.2f"))}
|
||||
{:key "expected-cash"
|
||||
:name "Expected cash"
|
||||
:sort-key "expected-cash"
|
||||
:render #(some->> % :cash-drawer-shift/expected-cash (format "$%.2f"))}
|
||||
{:key "opened-cash"
|
||||
:name "Opened cash"
|
||||
:sort-key "opened-cash"
|
||||
:render #(some->> % :cash-drawer-shift/opened-cash (format "$%.2f"))}
|
||||
]}))
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-cash-drawer-shifts)}
|
||||
"Cash Drawer Shifts"]]
|
||||
:title "Cash drawer shifts"
|
||||
:entity-name "Cash drawer shift"
|
||||
:route :pos-cash-drawer-shift-table
|
||||
:action-buttons (fn [request])
|
||||
:row-buttons (fn [_ e])
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :cash-drawer-shift/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:cash-drawer-shift/date %) atime/standard-time)}
|
||||
{:key "paid-in"
|
||||
:name "Paid in"
|
||||
:sort-key "paid-in"
|
||||
:render #(some->> % :cash-drawer-shift/paid-in (format "$%.2f"))}
|
||||
{:key "paid-out"
|
||||
:name "Paid out"
|
||||
:sort-key "paid-out"
|
||||
:render #(some->> % :cash-drawer-shift/paid-out (format "$%.2f"))}
|
||||
{:key "expected-cash"
|
||||
:name "Expected cash"
|
||||
:sort-key "expected-cash"
|
||||
:render #(some->> % :cash-drawer-shift/expected-cash (format "$%.2f"))}
|
||||
{:key "opened-cash"
|
||||
:name "Opened cash"
|
||||
:sort-key "opened-cash"
|
||||
:render #(some->> % :cash-drawer-shift/opened-cash (format "$%.2f"))}
|
||||
]})
|
||||
|
||||
(def row* (partial helper/row* grid-page))
|
||||
(def table* (partial helper/table* grid-page))
|
||||
(def table
|
||||
(query-params/wrap-parse-query-params (partial helper/table grid-page)
|
||||
(helper/default-parse-query-params grid-page))
|
||||
|
||||
)
|
||||
(def page (query-params/wrap-parse-query-params (partial helper/page grid-page)
|
||||
(helper/default-parse-query-params grid-page)))
|
||||
|
||||
(def key->handler
|
||||
{:pos-cash-drawer-shifts (wrap-client-redirect-unauthenticated (wrap-secure page))
|
||||
:pos-cash-drawer-shift-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
|
||||
{:pos-cash-drawer-shifts (helper/page-route grid-page)
|
||||
:pos-cash-drawer-shift-table (helper/table-route grid-page)})
|
||||
|
||||
@@ -7,9 +7,6 @@
|
||||
;; TODO make total fields take decimals
|
||||
|
||||
(defn date-range-field* [request]
|
||||
(println "DR" (some-> request
|
||||
:parsed-query-params
|
||||
))
|
||||
[:div#date-range {}
|
||||
(com/field {:label "Date Range"}
|
||||
[:div.space-y-4
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[auto-ap.client-routes :as client-routes]))
|
||||
[auto-ap.client-routes :as client-routes]
|
||||
[malli.core :as m]))
|
||||
|
||||
;; make params parsing composable
|
||||
|
||||
@@ -132,75 +133,65 @@
|
||||
[(->> (hydrate-results ids-to-retrieve db args))
|
||||
matching-count]))
|
||||
|
||||
(def grid-page {:id "expected-deposit-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 "expected-deposit-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-expected-deposits)}
|
||||
"Expected deposits"]]
|
||||
:title "Expected deposits"
|
||||
:entity-name "Expected deposit"
|
||||
:route :pos-expected-deposit-table
|
||||
:action-buttons (fn [request]
|
||||
)
|
||||
:row-buttons (fn [_ e]
|
||||
[
|
||||
(when (:expected-deposit/reference-link e)
|
||||
(com/a-icon-button {:href (:expected-deposit/reference-link e)}
|
||||
svg/external-link))
|
||||
(when-let [transaction-id (-> e (:transaction/_expected-deposit) first :db/id)]
|
||||
(com/a-button {:href (str (bidi/path-for client-routes/routes
|
||||
:transactions)
|
||||
"?exact-match-id="
|
||||
transaction-id)} "Transaction"))])
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :expected-deposit/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:expected-deposit/date %) atime/standard-time)}
|
||||
{:key "sales-date"
|
||||
:name "Sales Date"
|
||||
:sort-key "sales-date"
|
||||
:render #(atime/unparse-local (:expected-deposit/sales-date %) atime/standard-time)}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :expected-deposit/total (format "$%.2f"))}
|
||||
{:key "fee"
|
||||
:name "Fee"
|
||||
:sort-key "fee"
|
||||
:render #(some->> % :expected-deposit/fee (format "$%.2f"))}]})
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-expected-deposits)}
|
||||
"Expected deposits"]]
|
||||
:title "Expected deposits"
|
||||
:entity-name "Expected deposit"
|
||||
:route :pos-expected-deposit-table
|
||||
:row-buttons (fn [_ e]
|
||||
[
|
||||
(when (:expected-deposit/reference-link e)
|
||||
(com/a-icon-button {:href (:expected-deposit/reference-link e)}
|
||||
svg/external-link))
|
||||
(when-let [transaction-id (-> e (:transaction/_expected-deposit) first :db/id)]
|
||||
(com/a-button {:href (str (bidi/path-for client-routes/routes
|
||||
:transactions)
|
||||
"?exact-match-id="
|
||||
transaction-id)} "Transaction"))])
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :expected-deposit/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:expected-deposit/date %) atime/standard-time)}
|
||||
{:key "sales-date"
|
||||
:name "Sales Date"
|
||||
:sort-key "sales-date"
|
||||
:render #(atime/unparse-local (:expected-deposit/sales-date %) atime/standard-time)}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :expected-deposit/total (format "$%.2f"))}
|
||||
{:key "fee"
|
||||
:name "Fee"
|
||||
:sort-key "fee"
|
||||
:render #(some->> % :expected-deposit/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-expected-deposits (wrap-client-redirect-unauthenticated (wrap-secure page))
|
||||
:pos-expected-deposit-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
|
||||
{:pos-expected-deposits (helper/page-route grid-page)
|
||||
:pos-expected-deposit-table (helper/table-route grid-page)})
|
||||
|
||||
@@ -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)})
|
||||
|
||||
@@ -22,12 +22,8 @@
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]))
|
||||
|
||||
;; TODO incorporate parsing into spec
|
||||
;; TODO incorporate permissions into spec
|
||||
;; TODO incorporate limiting clients into spec
|
||||
|
||||
[datomic.api :as dc]
|
||||
[malli.core :as m]))
|
||||
|
||||
(defn filters [request]
|
||||
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
|
||||
@@ -98,18 +94,10 @@
|
||||
|
||||
(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)
|
||||
query (cond-> {:query {:find []
|
||||
:in ['$ '[?clients ?start-date ?end-date]]
|
||||
:where '[[(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
|
||||
:args [db [valid-clients
|
||||
:args [db [(:trimmed-clients request)
|
||||
(some-> (:start-date query-params) c/to-date)
|
||||
(some-> (:end-date query-params) c/to-date)]]}
|
||||
(:sort query-params) (add-sorter-fields {"client" ['[?e :sales-order/client ?c]
|
||||
@@ -182,103 +170,93 @@
|
||||
matching-count]))
|
||||
|
||||
|
||||
(def grid-page {:id "sales-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 "sales-table"
|
||||
:nav (com/main-aside-nav)
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
: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))
|
||||
: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-sales)}
|
||||
"Sales"]]
|
||||
:title "Sales orders"
|
||||
:entity-name "Sales orders"
|
||||
:route :pos-sales-table
|
||||
:action-buttons (fn [request]
|
||||
(let [{:keys [total tax]} (d-sales/summarize-orders (:ids (fetch-ids (dc/db conn) request)))]
|
||||
(when (and total tax)
|
||||
[
|
||||
(com/pill {:color :primary}
|
||||
(format "Total $%.2f" total)
|
||||
)
|
||||
(com/pill {:color :secondary}
|
||||
(format "Tax $%.2f" tax )
|
||||
)])))
|
||||
:row-buttons (fn [_ e]
|
||||
(when (:sales-order/reference-link e)
|
||||
[(com/a-icon-button {:href (:sales-order/reference-link e)}
|
||||
svg/external-link)]))
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :sales-order/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:sales-order/date %) atime/standard-time)}
|
||||
{:key "source"
|
||||
:name "Source"
|
||||
:sort-key "source"
|
||||
:render (fn [sales-order]
|
||||
(when (:sales-order/source sales-order)
|
||||
(com/pill {:color :primary }
|
||||
(:sales-order/source sales-order))))}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :sales-order/total (format "$%.2f"))}
|
||||
{:key "tax"
|
||||
:name "Tax"
|
||||
:sort-key "tax"
|
||||
:render #(some->> % :sales-order/tax (format "$%.2f"))}
|
||||
{:key "tip"
|
||||
:name "Tip"
|
||||
:sort-key "tip"
|
||||
:render #(some->> % :sales-order/tip (format "$%.2f"))}
|
||||
{:key "Payment methods"
|
||||
:name "Payment Methods"
|
||||
:render (fn [sales-order]
|
||||
[:div.flex.space-x-2
|
||||
(for [payment-method (->> sales-order :sales-order/charges (map :charge/type-name) set)]
|
||||
(com/pill {:color :primary }
|
||||
(condp = payment-method
|
||||
"CASH" "cash"
|
||||
"" nil
|
||||
"ALL" nil
|
||||
"CARD" "card"
|
||||
"SQUARE_GIFT_CARD" "gift card"
|
||||
"OTHER" "other"
|
||||
nil)))])}]}
|
||||
))
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-sales)}
|
||||
"Sales"]]
|
||||
:title "Sales orders"
|
||||
:entity-name "Sales orders"
|
||||
:route :pos-sales-table
|
||||
:action-buttons (fn [request]
|
||||
(let [{:keys [total tax]} (d-sales/summarize-orders (:ids (fetch-ids (dc/db conn) request)))]
|
||||
(when (and total tax)
|
||||
[
|
||||
(com/pill {:color :primary}
|
||||
(format "Total $%.2f" total)
|
||||
)
|
||||
(com/pill {:color :secondary}
|
||||
(format "Tax $%.2f" tax )
|
||||
)])))
|
||||
:row-buttons (fn [_ e]
|
||||
(when (:sales-order/reference-link e)
|
||||
[(com/a-icon-button {:href (:sales-order/reference-link e)}
|
||||
svg/external-link)]))
|
||||
:headers [
|
||||
{:key "client"
|
||||
:name "Client"
|
||||
:sort-key "client"
|
||||
:hide? (fn [args]
|
||||
(= (count (:clients args)) 1))
|
||||
:render #(-> % :sales-order/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:sales-order/date %) atime/standard-time)}
|
||||
{:key "source"
|
||||
:name "Source"
|
||||
:sort-key "source"
|
||||
:render (fn [sales-order]
|
||||
(when (:sales-order/source sales-order)
|
||||
(com/pill {:color :primary }
|
||||
(:sales-order/source sales-order))))}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :sales-order/total (format "$%.2f"))}
|
||||
{:key "tax"
|
||||
:name "Tax"
|
||||
:sort-key "tax"
|
||||
:render #(some->> % :sales-order/tax (format "$%.2f"))}
|
||||
{:key "tip"
|
||||
:name "Tip"
|
||||
:sort-key "tip"
|
||||
:render #(some->> % :sales-order/tip (format "$%.2f"))}
|
||||
{:key "Payment methods"
|
||||
:name "Payment Methods"
|
||||
:render (fn [sales-order]
|
||||
[:div.flex.space-x-2
|
||||
(for [payment-method (->> sales-order :sales-order/charges (map :charge/type-name) set)]
|
||||
(com/pill {:color :primary }
|
||||
(condp = payment-method
|
||||
"CASH" "cash"
|
||||
"" nil
|
||||
"ALL" nil
|
||||
"CARD" "card"
|
||||
"SQUARE_GIFT_CARD" "gift card"
|
||||
"OTHER" "other"
|
||||
nil)))])}]})
|
||||
|
||||
(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 :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-sales (wrap-client-redirect-unauthenticated (wrap-secure page))
|
||||
:pos-sales-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
|
||||
{:pos-sales (helper/page-route grid-page)
|
||||
:pos-sales-table (helper/table-route grid-page)})
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
[auto-ap.graphql.utils :refer [extract-client-ids]]
|
||||
[auto-ap.routes.utils
|
||||
:refer [wrap-client-redirect-unauthenticated wrap-secure]]
|
||||
[auto-ap.ssr.pos.common :refer [date-range-field* processor-field* total-field*]]
|
||||
[auto-ap.query-params :as query-params]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
[auto-ap.ssr.pos.common
|
||||
:refer [date-range-field* processor-field* total-field*]]
|
||||
[auto-ap.ssr.svg :as svg]
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[auto-ap.query-params :as query-params]))
|
||||
[malli.core :as m]
|
||||
[malli.transform :as mt2]))
|
||||
|
||||
;; always should be fast
|
||||
|
||||
@@ -48,19 +48,10 @@
|
||||
|
||||
(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)
|
||||
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
|
||||
:args [db [(:trimmed-clients request)
|
||||
(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]
|
||||
@@ -90,10 +81,10 @@
|
||||
'[(<= ?a ?total-lte)]]}
|
||||
:args [(:total-lte query-params)]})
|
||||
|
||||
processor
|
||||
(:processor query-params)
|
||||
(merge-query {:query {:in '[?processor]
|
||||
:where ['[?e :charge/processor ?processor]]}
|
||||
:args [processor]})
|
||||
:args [(:processor query-params)]})
|
||||
|
||||
|
||||
true
|
||||
@@ -118,81 +109,73 @@
|
||||
[(->> (hydrate-results ids-to-retrieve db request))
|
||||
matching-count]))
|
||||
|
||||
(def grid-page {:id "tender-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 "tender-table"
|
||||
:nav (com/main-aside-nav)
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
: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))
|
||||
: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-tenders)}
|
||||
"Tenders"]]
|
||||
:title "Tenders"
|
||||
:entity-name "Tender"
|
||||
:route :pos-tender-table
|
||||
: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 [request]
|
||||
(= (count (:clients request)) 1))
|
||||
:render #(-> % :charge/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:charge/date %) atime/standard-time)}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :charge/total (format "$%.2f"))}
|
||||
{:key "processor"
|
||||
:name "Processor"
|
||||
:sort-key "processor"
|
||||
:render (fn [sales-order]
|
||||
(when (:charge/processor sales-order)
|
||||
(com/pill {:color :primary }
|
||||
(name (:charge/processor sales-order)))))}
|
||||
{:key "tip"
|
||||
:name "Tip"
|
||||
:sort-key "tip"
|
||||
:render #(some->> % :charge/tip (format "$%.2f"))}
|
||||
{:key "links"
|
||||
:name "Links"
|
||||
:render (fn [entity]
|
||||
(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)
|
||||
:hx-boost "true"}
|
||||
(com/pill {:color :secondary} "expected deposit")]))}]}))
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-tenders)}
|
||||
"Tenders"]]
|
||||
:title "Tenders"
|
||||
:entity-name "Tender"
|
||||
:route :pos-tender-table
|
||||
: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 [request]
|
||||
(= (count (:clients request)) 1))
|
||||
:render #(-> % :charge/client :client/code)}
|
||||
{:key "date"
|
||||
:name "Date"
|
||||
:sort-key "date"
|
||||
:render #(atime/unparse-local (:charge/date %) atime/standard-time)}
|
||||
{:key "total"
|
||||
:name "Total"
|
||||
:sort-key "total"
|
||||
:render #(some->> % :charge/total (format "$%.2f"))}
|
||||
{:key "processor"
|
||||
:name "Processor"
|
||||
:sort-key "processor"
|
||||
:render (fn [sales-order]
|
||||
(when (:charge/processor sales-order)
|
||||
(com/pill {:color :primary }
|
||||
(name (:charge/processor sales-order)))))}
|
||||
{:key "tip"
|
||||
:name "Tip"
|
||||
:sort-key "tip"
|
||||
:render #(some->> % :charge/tip (format "$%.2f"))}
|
||||
{:key "links"
|
||||
:name "Links"
|
||||
:render (fn [entity]
|
||||
(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)
|
||||
: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)
|
||||
(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-tender-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
|
||||
{:pos-tenders (helper/page-route grid-page)
|
||||
:pos-tender-table (helper/table-route grid-page)})
|
||||
|
||||
Reference in New Issue
Block a user