progress on migrating all grids.

This commit is contained in:
2023-09-28 22:22:25 -07:00
parent d1798f6b5c
commit 99accc067c
15 changed files with 743 additions and 742 deletions

View File

@@ -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)})