cleans up grids
This commit is contained in:
@@ -1,24 +1,32 @@
|
||||
(ns auto-ap.ssr.pos.cash-drawer-shifts
|
||||
(:require
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields
|
||||
apply-pagination
|
||||
apply-sort-3
|
||||
conn
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query
|
||||
pull-many query2]]
|
||||
[auto-ap.query-params :refer [wrap-copy-qp-pqp]]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
[auto-ap.ssr.grid-page-helper :as helper :refer [wrap-apply-sort]]
|
||||
[auto-ap.ssr.pos.common :refer [date-range-field* total-field*]]
|
||||
[auto-ap.ssr.utils :refer [apply-middleware-to-all-handlers clj-date-schema
|
||||
default-grid-fields-schema wrap-merge-prior-hx
|
||||
wrap-schema-enforce]]
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[malli.core :as m]))
|
||||
[malli.core :as mc]))
|
||||
|
||||
;; always should be fast
|
||||
(def query-schema (mc/schema
|
||||
[:maybe
|
||||
(into [:map {:date-range [:date-range :start-date :end-date]}
|
||||
[:start-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:end-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:client {:optional true :default nil} [:maybe [:entity-map {:pull [:db/id :client/name]}]]] ]
|
||||
default-grid-fields-schema)]))
|
||||
|
||||
(defn filters [params]
|
||||
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
|
||||
@@ -38,7 +46,7 @@
|
||||
{:cash-drawer-shift/client [:client/name :db/id :client/code]}])
|
||||
|
||||
(defn fetch-ids [db request]
|
||||
(let [query-params (:parsed-query-params request)
|
||||
(let [query-params (:query-params request)
|
||||
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] ...]]]}
|
||||
@@ -101,6 +109,7 @@
|
||||
"Cash Drawer Shifts"]]
|
||||
:title "Cash drawer shifts"
|
||||
:entity-name "Cash drawer shift"
|
||||
:query-schema query-schema
|
||||
:route :pos-cash-drawer-shift-table
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
@@ -134,5 +143,13 @@
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
(def key->handler
|
||||
{:pos-cash-drawer-shifts (helper/page-route grid-page)
|
||||
:pos-cash-drawer-shift-table (helper/table-route grid-page)})
|
||||
(apply-middleware-to-all-handlers
|
||||
{:pos-cash-drawer-shifts (helper/page-route grid-page)
|
||||
:pos-cash-drawer-shift-table (helper/table-route grid-page)}
|
||||
(fn [h]
|
||||
(-> h
|
||||
(wrap-copy-qp-pqp)
|
||||
(wrap-apply-sort grid-page)
|
||||
(wrap-merge-prior-hx)
|
||||
(wrap-schema-enforce :query-schema query-schema)
|
||||
(wrap-schema-enforce :hx-schema query-schema)))))
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
[auto-ap.time :as atime]
|
||||
[auto-ap.ssr.svg :as svg]))
|
||||
(defn date-range-field* [request]
|
||||
(dr/date-range-field {:value {:start (:start-date (:parsed-query-params request))
|
||||
:end (:end-date (:parsed-query-params request))}
|
||||
(dr/date-range-field {:value {:start (:start-date (:query-params request))
|
||||
:end (:end-date (:query-params request))}
|
||||
:id "date-range"}))
|
||||
|
||||
(defn processor-field* [request]
|
||||
(com/field {:label "Processor"}
|
||||
(com/radio-card {:size :small
|
||||
:name "processor"
|
||||
:value (:processor (:parsed-query-params request))
|
||||
:value (:processor (:query-params request))
|
||||
:options [{:value ""
|
||||
:content "All"}
|
||||
{:value "square"
|
||||
@@ -37,7 +37,7 @@
|
||||
:id "total-gte"
|
||||
:hx-preserve "true"
|
||||
:class "hot-filter w-20"
|
||||
:value (:total-gte (:parsed-query-params request))
|
||||
:value (:total-gte (:query-params request))
|
||||
:placeholder "0.01"
|
||||
:size :small})
|
||||
[:div.align-baseline
|
||||
@@ -46,12 +46,12 @@
|
||||
:hx-preserve "true"
|
||||
:id "total-lte"
|
||||
:class "hot-filter w-20"
|
||||
:value (:total-lte (:parsed-query-params request))
|
||||
:value (:total-lte (:query-params request))
|
||||
:placeholder "9999.34"
|
||||
:size :small})]))
|
||||
|
||||
(defn exact-match-id-field* [request]
|
||||
(when-let [exact-match-id (:exact-match-id (:parsed-query-params request))]
|
||||
(when-let [exact-match-id (:exact-match-id (:query-params request))]
|
||||
[:div
|
||||
(com/field {:label "Exact match"}
|
||||
(com/pill {:color :primary}
|
||||
|
||||
@@ -1,30 +1,38 @@
|
||||
(ns auto-ap.ssr.pos.expected-deposits
|
||||
(:require
|
||||
[auto-ap.client-routes :as client-routes]
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields
|
||||
apply-pagination
|
||||
apply-sort-3
|
||||
conn
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn 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.query-params :as query-params :refer [wrap-copy-qp-pqp]]
|
||||
[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* total-field* exact-match-id-field*]]
|
||||
[auto-ap.ssr.grid-page-helper :as helper :refer [wrap-apply-sort]]
|
||||
[auto-ap.ssr.pos.common :refer [date-range-field* exact-match-id-field*]]
|
||||
[auto-ap.ssr.svg :as svg]
|
||||
[auto-ap.ssr.utils :refer [apply-middleware-to-all-handlers clj-date-schema
|
||||
default-grid-fields-schema ref->enum-schema
|
||||
wrap-merge-prior-hx wrap-schema-enforce]]
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[auto-ap.client-routes :as client-routes]
|
||||
[malli.core :as m]))
|
||||
[malli.core :as mc]))
|
||||
|
||||
(def query-schema (mc/schema
|
||||
[:maybe
|
||||
(into [:map {:date-range [:date-range :start-date :end-date]}
|
||||
[:total-gte {:optional true} [:maybe :double]]
|
||||
[:total-lte {:optional true} [:maybe :double]]
|
||||
[:start-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:end-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:client {:optional true :default nil} [:maybe [:entity-map {:pull [:db/id :client/name]}]]]
|
||||
[:processor {:optional true} [:maybe (ref->enum-schema "ccp-processor")]]]
|
||||
default-grid-fields-schema)]))
|
||||
|
||||
;; make params parsing composable
|
||||
|
||||
(defn filters [request]
|
||||
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
|
||||
@@ -49,7 +57,7 @@
|
||||
|
||||
(defn fetch-ids [db request]
|
||||
|
||||
(let [query-params (:parsed-query-params request)
|
||||
(let [query-params (:query-params request)
|
||||
valid-clients (extract-client-ids (:clients request)
|
||||
(:client request)
|
||||
(:client-id query-params)
|
||||
@@ -139,10 +147,6 @@
|
||||
: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)])
|
||||
@@ -155,6 +159,7 @@
|
||||
"Expected deposits"]]
|
||||
:title "Expected deposits"
|
||||
:entity-name "Expected deposit"
|
||||
:query-schema query-schema
|
||||
:route :pos-expected-deposit-table
|
||||
:row-buttons (fn [_ e]
|
||||
[
|
||||
@@ -192,6 +197,15 @@
|
||||
(def row* (partial helper/row* grid-page))
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
|
||||
(def key->handler
|
||||
{:pos-expected-deposits (helper/page-route grid-page)
|
||||
:pos-expected-deposit-table (helper/table-route grid-page)})
|
||||
(apply-middleware-to-all-handlers
|
||||
{:pos-expected-deposits (helper/page-route grid-page)
|
||||
:pos-expected-deposit-table (helper/table-route grid-page)}
|
||||
(fn [h]
|
||||
(-> h
|
||||
(wrap-copy-qp-pqp)
|
||||
(wrap-apply-sort grid-page)
|
||||
(wrap-merge-prior-hx)
|
||||
(wrap-schema-enforce :query-schema query-schema)
|
||||
(wrap-schema-enforce :hx-schema query-schema)))))
|
||||
|
||||
@@ -1,23 +1,33 @@
|
||||
(ns auto-ap.ssr.pos.refunds
|
||||
(:require
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields
|
||||
apply-pagination
|
||||
apply-sort-3
|
||||
conn
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
[auto-ap.query-params :as query-params]
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query
|
||||
pull-many query2]]
|
||||
[auto-ap.query-params :refer [wrap-copy-qp-pqp]]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
[auto-ap.ssr.grid-page-helper :as helper :refer [wrap-apply-sort]]
|
||||
[auto-ap.ssr.pos.common :refer [date-range-field* total-field*]]
|
||||
[auto-ap.ssr.utils :refer [apply-middleware-to-all-handlers clj-date-schema
|
||||
default-grid-fields-schema wrap-merge-prior-hx
|
||||
wrap-schema-enforce]]
|
||||
[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 mc]))
|
||||
|
||||
(def query-schema (mc/schema
|
||||
[:maybe
|
||||
(into [:map {:date-range [:date-range :start-date :end-date]}
|
||||
[:total-gte {:optional true} [:maybe :double]]
|
||||
[:total-lte {:optional true} [:maybe :double]]
|
||||
[:start-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:end-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:client {:optional true :default nil} [:maybe [:entity-map {:pull [:db/id :client/name]}]]]]
|
||||
default-grid-fields-schema)]))
|
||||
(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
|
||||
@@ -38,7 +48,7 @@
|
||||
{:sales-refund/client [:client/name :db/id :client/code]}])
|
||||
|
||||
(defn fetch-ids [db request]
|
||||
(let [query-params (:parsed-query-params request)
|
||||
(let [query-params (:query-params request)
|
||||
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] ...]]]}
|
||||
@@ -98,10 +108,6 @@
|
||||
: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)])
|
||||
@@ -114,6 +120,7 @@
|
||||
"Refunds"]]
|
||||
:title "Refunds"
|
||||
:entity-name "Refund"
|
||||
:query-schema query-schema
|
||||
:route :pos-refund-table
|
||||
:headers [{:key "client"
|
||||
:name "Client"
|
||||
@@ -142,5 +149,13 @@
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
(def key->handler
|
||||
{:pos-refunds (helper/page-route grid-page)
|
||||
:pos-refund-table (helper/table-route grid-page)})
|
||||
(apply-middleware-to-all-handlers
|
||||
{:pos-refunds (helper/page-route grid-page)
|
||||
:pos-refund-table (helper/table-route grid-page)}
|
||||
(fn [h]
|
||||
(-> h
|
||||
(wrap-copy-qp-pqp)
|
||||
(wrap-apply-sort grid-page)
|
||||
(wrap-merge-prior-hx)
|
||||
(wrap-schema-enforce :query-schema query-schema)
|
||||
(wrap-schema-enforce :hx-schema query-schema)))))
|
||||
|
||||
@@ -1,25 +1,37 @@
|
||||
(ns auto-ap.ssr.pos.sales-orders
|
||||
(:require
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields
|
||||
apply-pagination
|
||||
apply-sort-3
|
||||
conn
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query
|
||||
pull-many query2]]
|
||||
[auto-ap.datomic.sales-orders :as d-sales]
|
||||
[auto-ap.query-params :as query-params]
|
||||
[auto-ap.query-params :as query-params :refer [wrap-copy-qp-pqp]]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
[auto-ap.ssr.grid-page-helper :as helper :refer [wrap-apply-sort]]
|
||||
[auto-ap.ssr.pos.common
|
||||
:refer [date-range-field* processor-field* total-field*]]
|
||||
[auto-ap.ssr.svg :as svg]
|
||||
[auto-ap.ssr.utils :refer [apply-middleware-to-all-handlers clj-date-schema
|
||||
default-grid-fields-schema ref->enum-schema
|
||||
wrap-merge-prior-hx wrap-schema-enforce]]
|
||||
[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 mc]))
|
||||
|
||||
(def query-schema (mc/schema
|
||||
[:maybe
|
||||
(into [:map {:date-range [:date-range :start-date :end-date]}
|
||||
[:total-gte {:optional true :default nil} [:maybe :double]]
|
||||
[:total-lte {:optional true :default nil} [:maybe :double]]
|
||||
[:start-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:end-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:client {:optional true :default nil} [:maybe [:entity-map {:pull [:db/id :client/name]}]]]
|
||||
[:processor {:optional true} [:maybe (ref->enum-schema "ccp-processor")]]]
|
||||
default-grid-fields-schema)]))
|
||||
|
||||
(defn filters [request]
|
||||
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
|
||||
@@ -56,7 +68,7 @@
|
||||
:class "hot-filter"
|
||||
:id "category"
|
||||
:hx-preserve "true"
|
||||
:value (:category (:parsed-query-params request))
|
||||
:value (:category (:query-params request))
|
||||
:placeholder "Fries"
|
||||
:size :small}))]]])
|
||||
|
||||
@@ -89,7 +101,7 @@
|
||||
{:charge/processor [:db/ident]} {:expected-deposit/_charges [:db/id]}]}])
|
||||
|
||||
(defn fetch-ids [db request]
|
||||
(let [query-params (:parsed-query-params request)
|
||||
(let [query-params (:query-params request)
|
||||
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] ...]]]}
|
||||
@@ -146,6 +158,7 @@
|
||||
|
||||
true
|
||||
(merge-query {:query {:find ['?sort-default '?e]}}))]
|
||||
(clojure.pprint/pprint (update-in query [:args] #(drop 1 %)))
|
||||
(cond->> (query2 query)
|
||||
true (apply-sort-3 query-params)
|
||||
true (apply-pagination query-params))))
|
||||
@@ -167,92 +180,93 @@
|
||||
|
||||
|
||||
(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"]
|
||||
(helper/build
|
||||
{:id "sales-table"
|
||||
:nav com/main-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
|
||||
[: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)))])}]}
|
||||
))
|
||||
:query-schema query-schema
|
||||
: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)))])}]}))
|
||||
|
||||
|
||||
(def row* (partial helper/row* grid-page))
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
(def key->handler
|
||||
{:pos-sales (helper/page-route grid-page)
|
||||
:pos-sales-table (helper/table-route grid-page)})
|
||||
(apply-middleware-to-all-handlers
|
||||
{:pos-sales (helper/page-route grid-page)
|
||||
:pos-sales-table (helper/table-route grid-page)}
|
||||
(fn [h]
|
||||
(-> h
|
||||
(wrap-copy-qp-pqp)
|
||||
(wrap-apply-sort grid-page)
|
||||
(wrap-merge-prior-hx)
|
||||
(wrap-schema-enforce :query-schema query-schema)
|
||||
(wrap-schema-enforce :hx-schema query-schema)))))
|
||||
|
||||
@@ -1,26 +1,23 @@
|
||||
(ns auto-ap.ssr.pos.tenders
|
||||
(:require
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields
|
||||
apply-pagination
|
||||
apply-sort-3
|
||||
conn
|
||||
merge-query
|
||||
pull-many
|
||||
query2]]
|
||||
[auto-ap.query-params :as query-params]
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query
|
||||
pull-many query2]]
|
||||
[auto-ap.query-params :as query-params :refer [wrap-copy-qp-pqp]]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
[auto-ap.ssr.grid-page-helper :as helper :refer [wrap-apply-sort]]
|
||||
[auto-ap.ssr.pos.common
|
||||
:refer [date-range-field* processor-field* total-field*]]
|
||||
[auto-ap.ssr.svg :as svg]
|
||||
[auto-ap.ssr.utils :refer [apply-middleware-to-all-handlers clj-date-schema
|
||||
default-grid-fields-schema ref->enum-schema
|
||||
wrap-merge-prior-hx wrap-schema-enforce]]
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as dc]
|
||||
[malli.core :as m]
|
||||
[malli.transform :as mt2]))
|
||||
[malli.core :as mc]))
|
||||
|
||||
;; always should be fast
|
||||
|
||||
@@ -37,6 +34,19 @@
|
||||
(processor-field* request)
|
||||
(total-field* request)]])
|
||||
|
||||
(def query-schema (mc/schema
|
||||
[:maybe
|
||||
(into [:map {:date-range [:date-range :start-date :end-date]}
|
||||
[:total-gte {:optional true} [:maybe :double]]
|
||||
[:total-lte {:optional true} [:maybe :double]]
|
||||
[:start-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:end-date {:optional true}
|
||||
[:maybe clj-date-schema]]
|
||||
[:client {:optional true :default nil} [:maybe [:entity-map {:pull [:db/id :client/name]}]]]
|
||||
[:processor {:optional true} [:maybe (ref->enum-schema "ccp-processor")]]]
|
||||
default-grid-fields-schema)]))
|
||||
|
||||
(def default-read '[:db/id
|
||||
:charge/reference-link
|
||||
:charge/total
|
||||
@@ -47,7 +57,7 @@
|
||||
:expected-deposit/_charges [:expected-deposit/date :db/id]}])
|
||||
|
||||
(defn fetch-ids [db request]
|
||||
(let [query-params (:parsed-query-params request)
|
||||
(let [query-params (:query-params request)
|
||||
query (cond-> {:query {:find []
|
||||
:in ['$ '[?clients ?start-date ?end-date]]
|
||||
:where '[[(iol-ion.query/scan-charges $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
|
||||
@@ -115,11 +125,6 @@
|
||||
: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)])
|
||||
@@ -132,6 +137,7 @@
|
||||
"Tenders"]]
|
||||
:title "Tenders"
|
||||
:entity-name "Tender"
|
||||
:query-schema query-schema
|
||||
:route :pos-tender-table
|
||||
:row-buttons (fn [request e]
|
||||
(when (:charge/reference-link e)
|
||||
@@ -177,5 +183,13 @@
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
(def key->handler
|
||||
{:pos-tenders (helper/page-route grid-page)
|
||||
:pos-tender-table (helper/table-route grid-page)})
|
||||
(apply-middleware-to-all-handlers
|
||||
{:pos-tenders (helper/page-route grid-page)
|
||||
:pos-tender-table (helper/table-route grid-page)}
|
||||
(fn [h]
|
||||
(-> h
|
||||
(wrap-copy-qp-pqp)
|
||||
(wrap-apply-sort grid-page)
|
||||
(wrap-merge-prior-hx)
|
||||
(wrap-schema-enforce :query-schema query-schema)
|
||||
(wrap-schema-enforce :hx-schema query-schema)))))
|
||||
|
||||
Reference in New Issue
Block a user