notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further cleans up POS

Browse Source
This commit is contained in:
Bryce
2023-09-28 20:41:00 -07:00
parent c73c7619d8
commit d1798f6b5c
13 changed files with 684 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
iol_ion/src/iol_ion/query.clj
View File

@@ -101,6 +101,15 @@
[c (or (next-day end) #inst "2030-03-05T08:00:00.000-00:00") ]))] [c (or (next-day end) #inst "2030-03-05T08:00:00.000-00:00") ]))]
[(:e r) (first (:v r)) (second (:v r))])) [(:e r) (first (:v r)) (second (:v r))]))
(defn scan-expected-deposits [db clients start end]
(for [c clients
:let [c (entid db c)]
r (seq (dc/index-range db
:expected-deposit/client+date
[c (or start #inst "2001-01-01T08:00:00.000-00:00") ]
[c (or (next-day end) #inst "2030-03-05T08:00:00.000-00:00") ]))]
[(:e r) (first (:v r)) (second (:v r))]))
(defn scan-cash-drawer-shifts [db clients start end] (defn scan-cash-drawer-shifts [db clients start end]
(for [c clients (for [c clients
:let [c (entid db c)] :let [c (entid db c)]
@@ -145,3 +154,6 @@
[c (or start #inst "2001-01-01T08:00:00.000-00:00") ] [c (or start #inst "2001-01-01T08:00:00.000-00:00") ]
[c (or (next-day end) #inst "2030-03-05T08:00:00.000-00:00") ]))] [c (or (next-day end) #inst "2030-03-05T08:00:00.000-00:00") ]))]
[(:e r) (first (:v r)) (second (:v r))])) [(:e r) (first (:v r)) (second (:v r))]))
(defn ident [x]
(:db/ident x))

1
resources/datomic/extensions.edn Normal file
View File

@@ -0,0 +1 @@
{:xforms [clj-time.coerce/to-date clj-time.coerce/from-date iol-ion.query/ident ]}

5
resources/schema.edn
View File

@@ -1823,6 +1823,11 @@
:db/valueType :db.type/tuple :db/valueType :db.type/tuple
:db/tupleAttrs [ :cash-drawer-shift/client :cash-drawer-shift/date] :db/tupleAttrs [ :cash-drawer-shift/client :cash-drawer-shift/date]
:db/cardinality :db.cardinality/one :db/cardinality :db.cardinality/one
:db/index true}
{:db/ident :expected-deposit/client+date
:db/valueType :db.type/tuple
:db/tupleAttrs [ :expected-deposit/client :expected-deposit/date]
:db/cardinality :db.cardinality/one
:db/index true}] :db/index true}]

119
src/clj/auto_ap/query_params.clj Normal file
View File

@@ -0,0 +1,119 @@
(ns auto-ap.query-params
(:require [auto-ap.time :as atime]
[auto-ap.ssr.svg :as svg]
[clj-time.core :as time]
[clojure.string :as str]))
(defn wrap-parse-query-params [handler parser]
(fn parsed-handler [request]
(handler (assoc request :parsed-query-params (parser (->> (concat (:hx-query-params request) (:query-params request))
(map (fn [[k v]] [(keyword k) v]))
(into {})))))))
(defn parse-key [k parser]
(fn [query-params]
(if (contains? query-params k)
(update query-params k #(some-> % not-empty parser))
query-params)))
(defn parse-date [d]
(atime/parse d atime/normal-date))
(defn parse-keyword [ns name]
(some->> name (keyword ns)))
(defn parse-sort [grid-spec q]
(if (not-empty q)
(->>
(str/split q #",")
(map (fn [k]
(let [[key asc?] (str/split k #":")
matching-header (first (filter #(= (str key) (:sort-key %)) (:headers grid-spec)))]
{:sort-key (str key)
:asc (boolean (= "asc" asc?))
:matching-header matching-header
:name (:name matching-header)
:sort-icon (if (= (boolean (= "asc" asc?)) true)
svg/sort-down
svg/sort-up)})))
(filter :matching-header)
(into []))
[]))
(defn parse-long [l]
(try
(Long/parseLong l)
(catch Exception e
nil)))
(defn parse-double [l]
(try
(Double/parseDouble l)
(catch Exception e
nil)))
(defn apply-date-range [source-key start-date-key end-date-key]
(fn [query-params]
(dissoc
(condp = (source-key query-params)
"week"
(assoc query-params
start-date-key (time/plus (time/now) (time/days -7))
end-date-key (time/now))
"month"
(assoc query-params
start-date-key (time/plus (time/now) (time/months -1))
end-date-key (time/now))
"year"
(assoc query-params
start-date-key (time/plus (time/now) (time/years -1))
end-date-key (time/now))
"all"
(assoc query-params
start-date-key (time/plus (time/now) (time/years -3))
end-date-key (time/now))
query-params)
:date-range)))
(defn apply-toggle-sort [grid-spec]
(fn toggle-sort [query-params]
(if (:toggle-sort query-params)
(let [key-to-toggle (:toggle-sort query-params)
current-sort (:sort query-params)
presently-sorted? ((set (map :sort-key current-sort)) key-to-toggle)
new-sort (if presently-sorted?
(mapv
(fn [s]
(if (= (:sort-key s)
key-to-toggle)
(-> s
(update :asc
#(boolean (not %)))
(update :sort-icon (fn [x]
(if (= x svg/sort-down)
svg/sort-up
svg/sort-down))))
s))
current-sort)
(conj current-sort {:sort-key key-to-toggle
:asc true
:name (:name (first (filter #(= (str key-to-toggle) (:sort-key %)) (:headers grid-spec))))
:sort-icon svg/sort-down}))]
(-> query-params
(assoc :sort new-sort)
(dissoc :toggle-sort)))
query-params)))
(defn apply-remove-sort []
(fn remove-sort [query-params]
(if-let [remove-sort-key (:remove-sort query-params)]
(-> query-params
(update :sort (fn [current-sort]
(filterv (comp (complement #{remove-sort-key}) :sort-key) current-sort)))
(dissoc :remove-sort))
query-params)))

1
src/clj/auto_ap/ssr/components.clj
View File

@@ -15,6 +15,7 @@
(def breadcrumbs breadcrumbs/breadcrumbs-) (def breadcrumbs breadcrumbs/breadcrumbs-)
(def button buttons/button-) (def button buttons/button-)
(def a-button buttons/a-button-)
(def button-icon buttons/button-icon-) (def button-icon buttons/button-icon-)
(def icon-button buttons/icon-button-) (def icon-button buttons/icon-button-)
(def a-icon-button buttons/a-icon-button-) (def a-icon-button buttons/a-icon-button-)

13
src/clj/auto_ap/ssr/components/buttons.clj
View File

@@ -17,6 +17,19 @@
[:div.ml-3 "Loading..."]] [:div.ml-3 "Loading..."]]
(into [:div.htmx-indicator-hidden.inline-flex.gap-2.items-center.justify-center] children)]) (into [:div.htmx-indicator-hidden.inline-flex.gap-2.items-center.justify-center] children)])
(defn a-button- [params & children]
[:a (update params
:class #(cond-> %
true (str " focus:ring-4 font-bold rounded-lg text-xs p-3 text-center mr-2 inline-flex items-center hover:scale-105 transition duration-100 justify-center")
(= :secondary (:color params)) (str " text-white bg-blue-500 hover:bg-blue-600 focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700")
(= :primary (:color params)) (str " text-white bg-green-500 hover:bg-green-600 focus:ring-green-300 dark:bg-green-600 dark:hover:bg-green-700 ")
(nil? (:color params))
(str " bg-white dark:bg-gray-600 border-gray-300 dark:border-gray-700 text-gray-500 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-100 font-medium border border-gray-300 dark:border-gray-700")))
[:div.htmx-indicator.flex.items-center
(svg/spinner {:class "inline w-4 h-4 text-white"})
[:div.ml-3 "Loading..."]]
(into [:div.htmx-indicator-hidden.inline-flex.gap-2.items-center.justify-center] children)])
(defn icon-button- [params & children] (defn icon-button- [params & children]
(into (into
[:button [:button

179
src/clj/auto_ap/ssr/grid_page_helper.clj
View File

@@ -1,23 +1,24 @@
(ns auto-ap.ssr.grid-page-helper (ns auto-ap.ssr.grid-page-helper
(:require (:require
[auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com] [auto-ap.ssr.components :as com]
[auto-ap.ssr.svg :as svg]
[auto-ap.ssr.ui :refer [base-page]] [auto-ap.ssr.ui :refer [base-page]]
[auto-ap.ssr.utils :refer [html-response]] [auto-ap.ssr.utils :refer [html-response]]
[hiccup2.core :as hiccup]
[bidi.bidi :as bidi] [bidi.bidi :as bidi]
[auto-ap.ssr-routes :as ssr-routes]
[cemerick.url :as url] [cemerick.url :as url]
[clojure.string :as str] [clojure.string :as str]
[auto-ap.ssr.svg :as svg] [hiccup2.core :as hiccup]
[clj-time.core :as time]
[auto-ap.time :as atime] [auto-ap.time :as atime]
[clj-time.core :as time])) [auto-ap.query-params :as query-params]))
(defn row* [gridspec user entity {:keys [flash? delete-after-settle? params] :as options}] (defn row* [gridspec user entity {:keys [flash? delete-after-settle? request] :as options}]
(let [cells (->> gridspec (let [cells (->> gridspec
:headers :headers
(filter (fn [h] (filter (fn [h]
(if (and (:hide? h) (if (and (:hide? h)
((:hide? h) params)) ((:hide? h) request))
nil nil
h))) h)))
(mapv (fn [header] (mapv (fn [header]
@@ -28,7 +29,7 @@
cells (conj cells (com/data-grid-right-stack-cell {} cells (conj cells (com/data-grid-right-stack-cell {}
(into [:form (into [:form
[:input {:type :hidden :name "id" :value ((:id-fn gridspec) entity)}]] [:input {:type :hidden :name "id" :value ((:id-fn gridspec) entity)}]]
((:row-buttons gridspec) user entity))))] ((:row-buttons gridspec) request entity))))] ;; TODO double check usage of row buttons user and identity in callers
(apply com/data-grid-row (apply com/data-grid-row
{:class (when flash? {:class (when flash?
"live-added") "live-added")
@@ -66,12 +67,11 @@
)) ))
"default sort")) "default sort"))
(defn table* [grid-spec user {{:keys [start per-page clients flash-id sort]} :parsed-query-params :as params}] (defn table* [grid-spec user {{:keys [start per-page flash-id sort]} :parsed-query-params :as request}]
(let [start (or start 0) (let [start (or start 0)
per-page (or per-page 30) per-page (or per-page 30)
[entities total] ((:fetch-page grid-spec) [entities total] ((:fetch-page grid-spec)
user request)]
params)]
(com/data-grid-card {:id (:id grid-spec) (com/data-grid-card {:id (:id grid-spec)
:title (:title grid-spec) :title (:title grid-spec)
@@ -82,9 +82,9 @@
:subtitle [:div.flex.items-center.gap-2 :subtitle [:div.flex.items-center.gap-2
[:span (format "Total %s: %d, " (:entity-name grid-spec) total)] [:span (format "Total %s: %d, " (:entity-name grid-spec) total)]
(sort-by-list grid-spec sort)] (sort-by-list grid-spec sort)]
:action-buttons ((:action-buttons grid-spec) user params) :action-buttons ((:action-buttons grid-spec) request)
:rows (for [entity entities] :rows (for [entity entities]
(row* grid-spec user entity {:flash? (= flash-id ((:id-fn grid-spec) entity)) :params params})) (row* grid-spec user entity {:flash? (= flash-id ((:id-fn grid-spec) entity)) :request request}))
:thead-params {:hx-get (bidi/path-for ssr-routes/only-routes :thead-params {:hx-get (bidi/path-for ssr-routes/only-routes
(:route grid-spec)) (:route grid-spec))
:hx-target (str "#" (:id grid-spec)) :hx-target (str "#" (:id grid-spec))
@@ -99,7 +99,7 @@
(fn [h] (fn [h]
(cond (cond
(and (:hide? h) (and (:hide? h)
((:hide? h) params)) ((:hide? h) request))
nil nil
(:sort-key h) (:sort-key h)
@@ -126,43 +126,9 @@
(defn parse-sort [grid-spec q]
(if (not-empty q)
(->>
(str/split q #",")
(map (fn [k]
(let [[key asc?] (str/split k #":")
matching-header (first (filter #(= (str key) (:sort-key %)) (:headers grid-spec)))]
{:sort-key (str key)
:asc (boolean (= "asc" asc?))
:matching-header matching-header
:name (:name matching-header)
:sort-icon (if (= (boolean (= "asc" asc?)) true)
svg/sort-down
svg/sort-up)})))
(filter :matching-header)
(into []))
[]))
(defn toggle-sort [grid-spec q k]
(if ((set (map :sort-key q)) k)
(mapv
(fn [s]
(if (= (:sort-key s)
k)
(-> s
(update :asc
#(boolean (not %)))
(update :sort-icon (fn [x]
(if (= x svg/sort-down)
svg/sort-up
svg/sort-down))))
s))
q)
(conj q {:sort-key k
:asc true
:name (:name (first (filter #(= (str k) (:sort-key %)) (:headers grid-spec))))
:sort-icon svg/sort-down})))
(defn sort->query [s] (defn sort->query [s]
(str/join "," (map (fn [k] (format "%s:%s" (:sort-key k) (if (= true (:asc k)) (str/join "," (map (fn [k] (format "%s:%s" (:sort-key k) (if (= true (:asc k))
@@ -176,77 +142,72 @@
(update :sort sort->query) (update :sort sort->query)
(url/map->query))) (url/map->query)))
(defn use-date-range [query-params date-range] (defn default-unparse-query-params [query-params]
(condp = date-range (reduce
"week" (fn [query-params [k value]]
(assoc query-params (assoc query-params k
:start-date (atime/unparse-local (time/plus (time/now) (time/days -7)) atime/normal-date) (cond (= k :sort)
:end-date (atime/unparse-local (time/now) atime/normal-date)) (sort->query value)
"month" (instance? org.joda.time.base.AbstractInstant value)
(assoc query-params (atime/unparse-local value atime/normal-date)
:start-date (atime/unparse-local (time/plus (time/now) (time/months -1)) atime/normal-date)
:end-date (atime/unparse-local (time/now) atime/normal-date))
"year" (instance? Long value)
(assoc query-params (str value)
:start-date (atime/unparse-local (time/plus (time/now) (time/years -1)) atime/normal-date)
:end-date (atime/unparse-local (time/now) atime/normal-date))
"all" (instance? Double value)
(assoc query-params (format "%.2f" value)
:start-date (atime/unparse-local (time/plus (time/now) (time/years -3)) atime/normal-date)
:end-date (atime/unparse-local (time/now) atime/normal-date))
(instance? Float value)
(format "%.2f" value)
(keyword? value)
(name value)
:else
value)))
query-params
query-params)) query-params))
(defn extract-params [grid-spec {:keys [query-params hx-query-params identity session] :as request}]
(let [{hx-start "start" hx-per-page "per-page" hx-sort "sort" } hx-query-params
{q-start "start" q-per-page "per-page" q-sort "sort" q-toggle-sort "toggle-sort" q-remove-sort "remove-sort" date-range "date-range"} query-params
raw-query-params (merge (or hx-query-params {}) query-params)
parsed-query-params (cond-> (into {} (map (fn [[k v]] [(keyword k) v]) raw-query-params))
hx-start (assoc :start (some-> hx-start not-empty (Long/parseLong )))
q-start (assoc :start (some-> q-start not-empty (Long/parseLong )))
hx-per-page (assoc :per-page (some-> hx-per-page not-empty (Long/parseLong )))
q-per-page (assoc :per-page (some-> q-per-page not-empty (Long/parseLong )))
hx-sort (assoc :sort (parse-sort grid-spec hx-sort))
q-sort (assoc :sort (parse-sort grid-spec q-sort))
(not-empty q-toggle-sort) (update :sort #(toggle-sort grid-spec % q-toggle-sort) )
(not-empty q-remove-sort) (update :sort (fn [s] (filter (comp (complement #{q-remove-sort}) :sort-key) s)) )
date-range (use-date-range date-range)
true (dissoc :toggle-sort :remove-sort :date-range))]
{:raw-query-params raw-query-params
:parsed-query-params parsed-query-params
:client-selection (:client-selection (:session request))
:clients (:clients request)
:client (:client request)
:request request}))
(defn table [grid-spec {:keys [identity] :as request}] (defn table [grid-spec {:keys [identity] :as request}]
(let [params (extract-params grid-spec request)] (let [unparse-query-params (or (:unparse-query grid-spec)
default-unparse-query-params)]
(html-response (table* (html-response (table*
grid-spec grid-spec
identity identity
params) request)
:headers {"hx-push-url" (str "?" (params->query-string params))} :headers {"hx-push-url" (str "?" (url/map->query (unparse-query-params (:parsed-query-params request))))}
:oob (when-let [oob-render (:oob-render grid-spec)] :oob (when-let [oob-render (:oob-render grid-spec)]
(oob-render identity params))))) (oob-render request)))))
(defn page [grid-spec {:keys [identity] :as request}] (defn page [grid-spec {:keys [identity] :as request}]
(let [params (extract-params grid-spec request)] (base-page
(base-page request
request (com/page {:nav (:nav grid-spec)
(com/page {:nav (:nav grid-spec) :page-specific (when-let [page-specific-nav (:page-specific-nav grid-spec)]
:page-specific (when-let [page-specific-nav (:page-specific-nav grid-spec)] [:div#page-specific-nav (page-specific-nav request)])
[:div#page-specific-nav (page-specific-nav params)]) :client-selection (:client-selection (:session request))
:client-selection (:client-selection (:session request)) :clients (:clients request)
:clients (:clients request) :client (:client request)
:client (:client request) :identity (:identity request)}
:identity (:identity request)} (apply com/breadcrumbs {} (:breadcrumbs grid-spec))
(apply com/breadcrumbs {} (:breadcrumbs grid-spec)) (table* grid-spec
(table* grid-spec identity
identity request))
params (:title grid-spec)))
))
(:title grid-spec)))) (defn default-parse-query-params [grid-spec]
(comp
(query-params/apply-remove-sort)
(query-params/apply-toggle-sort grid-spec)
(query-params/apply-date-range :date-range :start-date :end-date)
(query-params/parse-key :exact-match-id query-params/parse-long)
(query-params/parse-key :sort #(query-params/parse-sort grid-spec %))
(query-params/parse-key :per-page query-params/parse-long)
(query-params/parse-key :start query-params/parse-long)
(query-params/parse-key :start-date query-params/parse-date)
(query-params/parse-key :end-date query-params/parse-date)))

65
src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj
View File

@@ -9,6 +9,7 @@
pull-many pull-many
query2]] query2]]
[auto-ap.graphql.utils :refer [extract-client-ids]] [auto-ap.graphql.utils :refer [extract-client-ids]]
[auto-ap.query-params :as query-params]
[auto-ap.routes.utils [auto-ap.routes.utils
:refer [wrap-client-redirect-unauthenticated wrap-secure]] :refer [wrap-client-redirect-unauthenticated wrap-secure]]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
@@ -21,7 +22,6 @@
[datomic.api :as dc])) [datomic.api :as dc]))
;; always should be fast ;; always should be fast
;; make params parsing composable
(defn filters [params] (defn filters [params]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms" [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
@@ -35,36 +35,26 @@
(date-range-field* params) (date-range-field* params)
(total-field* params)]]) (total-field* params)]])
(defn <-datomic [result] (def default-read '[:db/id
(cond-> result :cash-drawer-shift/paid-in :cash-drawer-shift/paid-out :cash-drawer-shift/expected-cash :cash-drawer-shift/opened-cash
true (update :cash-drawer-shift/date c/from-date))) [:cash-drawer-shift/date :xform clj-time.coerce/from-date]
(def default-read '[*
{:cash-drawer-shift/client [:client/name :db/id :client/code]}]) {:cash-drawer-shift/client [:client/name :db/id :client/code]}])
(defn fetch-ids [db args] (defn fetch-ids [db request]
(let [query-params (:parsed-query-params args) (let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients args) valid-clients (extract-client-ids (:clients request)
(:client-id query-params) (:client-id query-params)
(when (:client-code query-params) (when (:client-code query-params)
[:client/code (:client-code query-params)])) [:client/code (:client-code query-params)]))
valid-clients (->> valid-clients valid-clients (->> valid-clients
(take 10) (take 10)
set) set)
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))
query (cond-> {:query {:find [] query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]] :in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-cash-drawer-shifts $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]} :where '[[(iol-ion.query/scan-cash-drawer-shifts $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients :args [db [valid-clients
(some-> start-date c/to-date) (some-> (:start-date query-params) c/to-date)
(some-> end-date c/to-date )]]} (some-> (:end-date query-params) c/to-date )]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :cash-drawer-shift/client ?c] (:sort query-params) (add-sorter-fields {"client" ['[?e :cash-drawer-shift/client ?c]
'[?c :client/name ?sort-client]] '[?c :client/name ?sort-client]]
"date" ['[?e :cash-drawer-shift/date ?sort-date]] "date" ['[?e :cash-drawer-shift/date ?sort-date]]
@@ -80,18 +70,6 @@
:where []} :where []}
:args [(:exact-match-id query-params)]}) :args [(:exact-match-id query-params)]})
start-date
(merge-query {:query {:in '[?start-date]
:where ['[?e :cash-drawer-shift/date ?date]
'[(>= ?date ?start-date)]]}
:args [(c/to-date start-date)]})
end-date
(merge-query {:query {:in '[?end-date]
:where ['[?e :cash-drawer-shift/date ?date]
'[(<= ?date ?end-date)]]}
:args [(c/to-date end-date)]})
true true
(merge-query {:query {:find ['?sort-default '?e] (merge-query {:query {:find ['?sort-default '?e]
:where ['[?e :cash-drawer-shift/date ?sort-default]]}}))] :where ['[?e :cash-drawer-shift/date ?sort-default]]}}))]
@@ -105,16 +83,14 @@
(group-by :db/id)) (group-by :db/id))
cash-drawer-shifts (->> ids cash-drawer-shifts (->> ids
(map results) (map results)
(map first) (map first))]
(mapv <-datomic)
)]
cash-drawer-shifts)) cash-drawer-shifts))
(defn fetch-page [_ args] (defn fetch-page [request]
(let [db (dc/db conn) (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])) matching-count]))
(def grid-page {:id "cash-drawer-shift-table" (def grid-page {:id "cash-drawer-shift-table"
@@ -123,8 +99,8 @@
:id-fn :db/id :id-fn :db/id
:fetch-page fetch-page :fetch-page fetch-page
:oob-render :oob-render
(fn [_ params] (fn [request]
[(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) [(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)} :company)}
"POS"] "POS"]
@@ -135,7 +111,7 @@
:title "Cash drawer shifts" :title "Cash drawer shifts"
:entity-name "Cash drawer shift" :entity-name "Cash drawer shift"
:route :pos-cash-drawer-shift-table :route :pos-cash-drawer-shift-table
:action-buttons (fn [_ args]) :action-buttons (fn [request])
:row-buttons (fn [_ e]) :row-buttons (fn [_ e])
:headers [{:key "client" :headers [{:key "client"
:name "Client" :name "Client"
@@ -167,8 +143,13 @@
(def row* (partial helper/row* grid-page)) (def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page)) (def table* (partial helper/table* grid-page))
(def table (partial helper/table grid-page)) (def table
(def page (partial helper/page grid-page)) (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 (def key->handler
{:pos-cash-drawer-shifts (wrap-client-redirect-unauthenticated (wrap-secure page)) {:pos-cash-drawer-shifts (wrap-client-redirect-unauthenticated (wrap-secure page))

44
src/clj/auto_ap/ssr/pos/common.clj
View File

@@ -1,9 +1,15 @@
(ns auto-ap.ssr.pos.common (ns auto-ap.ssr.pos.common
(:require [auto-ap.ssr.components :as com] (:require [auto-ap.ssr.components :as com]
[auto-ap.time :as atime])) [auto-ap.time :as atime]
[auto-ap.ssr.svg :as svg]))
;; TODO make date-input take clj date
;; TODO make total fields take decimals
(defn date-range-field* [params] (defn date-range-field* [request]
(println "DR" (some-> request
:parsed-query-params
))
[:div#date-range {} [:div#date-range {}
(com/field {:label "Date Range"} (com/field {:label "Date Range"}
[:div.space-y-4 [:div.space-y-4
@@ -16,26 +22,22 @@
] ]
[:div.flex.space-x-1.items-baseline [:div.flex.space-x-1.items-baseline
(com/date-input {:name "start-date" (com/date-input {:name "start-date"
:value (some-> params :value (some-> request
:parsed-query-params :parsed-query-params
:start-date :start-date
(atime/parse atime/normal-date) (atime/unparse-local atime/normal-date))
(atime/unparse-local
atime/normal-date))
:placeholder "Date" :placeholder "Date"
:size :small}) :size :small})
(com/date-input {:name "end-date" (com/date-input {:name "end-date"
:value (some-> params :value (some-> request
:parsed-query-params :parsed-query-params
:end-date :end-date
(atime/parse atime/normal-date) (atime/unparse-local atime/normal-date))
(atime/unparse-local
atime/normal-date))
:placeholder "Date" :placeholder "Date"
:size :small})]] :size :small})]])])
)])
(defn processor-field* [params] (defn processor-field* [request]
(com/field {:label "Processor"} (com/field {:label "Processor"}
(com/radio {:size :small (com/radio {:size :small
:name "processor" :name "processor"
@@ -56,14 +58,14 @@
{:value "na" {:value "na"
:content "No Processor"}]}))) :content "No Processor"}]})))
(defn total-field* [params] (defn total-field* [request]
(com/field {:label "Total"} (com/field {:label "Total"}
[:div.flex.space-x-4.items-baseline [:div.flex.space-x-4.items-baseline
(com/money-input {:name "total-gte" (com/money-input {:name "total-gte"
:id "total-gte" :id "total-gte"
:hx-preserve "true" :hx-preserve "true"
:class "hot-filter" :class "hot-filter"
:value (:total-gte (:parsed-query-params params)) :value (:total-gte (:parsed-query-params request))
:placeholder "0.01" :placeholder "0.01"
:size :small}) :size :small})
[:div.align-baseline [:div.align-baseline
@@ -72,6 +74,16 @@
:hx-preserve "true" :hx-preserve "true"
:id "total-lte" :id "total-lte"
:class "hot-filter" :class "hot-filter"
:value (:total-lte (:parsed-query-params params)) :value (:total-lte (:parsed-query-params request))
:placeholder "9999.34" :placeholder "9999.34"
:size :small})])) :size :small})]))
(defn exact-match-id-field* [request]
(when-let [exact-match-id (:exact-match-id (:parsed-query-params request))]
[:div
(com/field {:label "Exact match"}
(com/pill {:color :primary}
[:span.inline-flex.gap-2
exact-match-id
[:a {:href "?exact-match-id="}
[:div.h-4.w-4 svg/x]]]))]))

182
src/clj/auto_ap/ssr/pos/expected_deposits.clj
View File

@@ -1,21 +1,31 @@
(ns auto-ap.ssr.pos.expected-deposits (ns auto-ap.ssr.pos.expected-deposits
(:require (:require
[auto-ap.datomic.expected-deposit :as d-expected-deposit] [auto-ap.datomic
: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 [auto-ap.routes.utils
:refer [wrap-client-redirect-unauthenticated wrap-secure]] :refer [wrap-client-redirect-unauthenticated wrap-secure]]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com] [auto-ap.ssr.components :as com]
[auto-ap.ssr.grid-page-helper :as helper] [auto-ap.ssr.grid-page-helper :as helper]
[auto-ap.ssr.pos.common :refer [date-range-field* total-field*]] [auto-ap.ssr.pos.common :refer [date-range-field* total-field* exact-match-id-field*]]
[auto-ap.ssr.svg :as svg] [auto-ap.ssr.svg :as svg]
[auto-ap.time :as atime] [auto-ap.time :as atime]
[bidi.bidi :as bidi])) [bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]
[auto-ap.client-routes :as client-routes]))
;; TODO refunds
;; always should be fast
;; make params parsing composable ;; make params parsing composable
(defn filters [params] (defn filters [request]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms" [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
"hx-get" (bidi/path-for ssr-routes/only-routes "hx-get" (bidi/path-for ssr-routes/only-routes
:pos-expected-deposit-table) :pos-expected-deposit-table)
@@ -24,36 +34,112 @@
#_#_:hx-disabled-elt "find fieldset"} #_#_:hx-disabled-elt "find fieldset"}
[:fieldset.space-y-6 [:fieldset.space-y-6
(date-range-field* params) (date-range-field* request)
(total-field* params)]]) (exact-match-id-field* request)]])
(defn args->graphql-params [args] (def default-read '[:db/id
{:clients (:clients args) :expected-deposit/location
:start (:start (:parsed-query-params args)) :expected-deposit/total
:sort (:sort (:parsed-query-params args)) :expected-deposit/fee
:per-page (:per-page (:parsed-query-params args)) [:expected-deposit/date :xform clj-time.coerce/from-date]
:exact-match-id (some-> (:parsed-query-params args) :exact-match-id Long/parseLong) {:expected-deposit/client [:client/name :db/id :client/code]
:date-range {:start (some-> args [:expected-deposit/status :xform iol-ion.query/ident] [:db/ident]
:parsed-query-params :transaction/_expected-deposit [:transaction/date :db/id]}])
:start-date
(atime/parse atime/normal-date)) (defn fetch-ids [db request]
:end (some-> args
:parsed-query-params (let [query-params (:parsed-query-params request)
:end-date valid-clients (extract-client-ids (:clients request)
(atime/parse atime/normal-date))} (:client request)
:total-gte (some-> args :raw-query-params (get "total-gte") not-empty (#(if (string? %) (Double/parseDouble %) (double %)))) (:client-id query-params)
:total-lte (some-> args :raw-query-params (get "total-lte") not-empty (#(if (string? %) (Double/parseDouble %) (double %))))}) (when (:client-code query-params)
[:client/code (:client-code query-params)]))
query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-expected-deposits $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients
(some-> (:start-date query-params) c/to-date)
(some-> (:end-date query-params) c/to-date)]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :expected-deposit/client ?c]
'[?c :client/name ?sort-client]]
"location" ['[?e :expected-deposit/location ?sort-location]]
"date" ['[?e :expected-deposit/date ?sort-date]]
"total" ['[?e :expected-deposit/total ?sort-total]]
"fee" ['[?e :expected-deposit/fee ?sort-fee]]}
query-params)
(:exact-match-id query-params)
(merge-query {:query {:in ['?e]
:where []}
:args [(:exact-match-id query-params)]})
(:total-gte query-params)
(merge-query {:query {:in ['?total-gte]
:where ['[?e :expected-deposit/total ?a]
'[(>= ?a ?total-gte)]]}
:args [(:total-gte query-params)]})
(:total-lte query-params)
(merge-query {:query {:in ['?total-lte]
:where ['[?e :expected-deposit/total ?a]
'[(<= ?a ?total-lte)]]}
:args [(:total-lte query-params)]})
(:total query-params)
(merge-query {:query {:in ['?total]
:where ['[?e :expected-deposit/total ?expected-deposit-total]
'[(iol-ion.query/dollars= ?expected-deposit-total ?total)]]}
:args [(:total query-params)]})
true
(merge-query {:query {:find ['?sort-default '?e]
:where ['[?e :expected-deposit/date ?sort-default]]}}))]
(cond->> (query2 query)
true (apply-sort-3 query-params)
true (apply-pagination query-params))))
(defn hydrate-results [ids db _]
(let [results (->> (pull-many db default-read ids)
(group-by :db/id))
payments (->> ids
(map results)
(map first)
(map (fn get-totals [ed]
(assoc ed :totals
(->> (dc/q '[:find ?d4 (count ?c) (sum ?a)
:in $ ?ed
:where [?ed :expected-deposit/charges ?c]
[?c :charge/total ?a]
[?o :sales-order/charges ?c]
[?o :sales-order/date ?d]
[(clj-time.coerce/from-date ?d) ?d2]
[(auto-ap.time/localize ?d2) ?d3]
[(clj-time.coerce/to-local-date ?d3) ?d4]]
(dc/db conn)
(:db/id ed))
(map (fn [[date count amount]]
{:date (c/to-date-time date)
:count count
:amount amount})))))))]
payments))
(defn fetch-page [args]
(let [db (dc/db conn)
{ids-to-retrieve :ids matching-count :count} (fetch-ids db args)]
[(->> (hydrate-results ids-to-retrieve db args))
matching-count]))
(def grid-page {:id "expected-deposit-table" (def grid-page {:id "expected-deposit-table"
:nav (com/main-aside-nav) :nav (com/main-aside-nav)
:page-specific-nav filters :page-specific-nav filters
:id-fn :db/id :id-fn :db/id
:fetch-page (fn [_ args] :fetch-page fetch-page
(d-expected-deposit/get-graphql
(args->graphql-params args)))
:oob-render :oob-render
(fn [_ params] (fn [request]
[(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) [(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)} :company)}
"POS"] "POS"]
@@ -64,19 +150,18 @@
:title "Expected deposits" :title "Expected deposits"
:entity-name "Expected deposit" :entity-name "Expected deposit"
:route :pos-expected-deposit-table :route :pos-expected-deposit-table
:action-buttons (fn [_ args] :action-buttons (fn [request]
#_(let [{:keys [total tax]} (d-sales/summarize-graphql (args->graphql-params args))] )
[
(com/pill {:color :primary}
(format "Total $%.2f" total)
)
(com/pill {:color :secondary}
(format "Tax $%.2f" tax )
)]))
:row-buttons (fn [_ e] :row-buttons (fn [_ e]
(when (:expected-deposit/reference-link e) [
[(com/a-icon-button {:href (:expected-deposit/reference-link e)} (when (:expected-deposit/reference-link e)
svg/external-link)])) (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" :headers [{:key "client"
:name "Client" :name "Client"
:sort-key "client" :sort-key "client"
@@ -102,8 +187,19 @@
(def row* (partial helper/row* grid-page)) (def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page)) (def table* (partial helper/table* grid-page))
(def table (partial helper/table grid-page)) (def table (-> (partial helper/table 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 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 (def key->handler
{:pos-expected-deposits (wrap-client-redirect-unauthenticated (wrap-secure page)) {:pos-expected-deposits (wrap-client-redirect-unauthenticated (wrap-secure page))

93
src/clj/auto_ap/ssr/pos/refunds.clj
View File

@@ -20,13 +20,14 @@
[bidi.bidi :as bidi] [bidi.bidi :as bidi]
[clj-time.coerce :as c] [clj-time.coerce :as c]
[datomic.api :as dc] [datomic.api :as dc]
[clojure.set :as set])) [clojure.set :as set]
[auto-ap.query-params :as query-params]))
;; TODO refunds ;; TODO refunds
;; always should be fast ;; always should be fast
;; make params parsing composable ;; make params parsing composable
(defn filters [params] (defn filters [request]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms" [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
"hx-get" (bidi/path-for ssr-routes/only-routes "hx-get" (bidi/path-for ssr-routes/only-routes
:pos-refund-table) :pos-refund-table)
@@ -35,47 +36,37 @@
#_#_:hx-disabled-elt "find fieldset"} #_#_:hx-disabled-elt "find fieldset"}
[:fieldset.space-y-6 [:fieldset.space-y-6
(date-range-field* params) (date-range-field* request)
(total-field* params)]]) (total-field* request)]])
(defn <-datomic [result] (def default-read '[:db/id
(cond-> result :sales-refund/total
true (update :sales-refund/date c/from-date))) :sales-refund/fee
:sales-refund/type
(def default-read '[* [:sales-refund/date :xform clj-time.coerce/from-date]
{:sales-refund/client [:client/name :db/id :client/code]}]) {:sales-refund/client [:client/name :db/id :client/code]}])
(defn fetch-ids [db args] (defn fetch-ids [db request]
(let [query-params (:parsed-query-params args) (let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients args) valid-clients (extract-client-ids (:clients request)
(:client-id query-params) (:client-id query-params)
(when (:client-code query-params) (when (:client-code query-params)
[:client/code (:client-code query-params)])) [:client/code (:client-code query-params)]))
valid-clients (->> valid-clients valid-clients (->> valid-clients
(take 10) (take 10)
set) set)
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 %))))
query (cond-> {:query {:find [] query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]] :in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-sales-refunds $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]} :where '[[(iol-ion.query/scan-sales-refunds $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients :args [db [valid-clients
(some-> start-date c/to-date) (some-> query-params :start-date c/to-date)
(some-> end-date c/to-date )]]} (some-> query-params :end-date c/to-date )]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :sales-refund/client ?c] (:sort query-params) (add-sorter-fields {"client" ['[?e :sales-refund/client ?c]
'[?c :client/name ?sort-client]] '[?c :client/name ?sort-client]]
"date" ['[?e :sales-refund/date ?sort-date]] "date" ['[?e :sales-refund/date ?sort-date]]
"total" ['[?e :sales-refund/total ?sort-total]] "total" ['[?e :sales-refund/total ?sort-total]]
"fee" ['[?e :sales-refund/fee ?sort-tip]] "fee" ['[?e :sales-refund/fee ?sort-tip]]
"type" ['[?e :sales-refund/type ?type]]} "type" ['[?e :sales-refund/type ?sort-type]]}
query-params) query-params)
(:exact-match-id query-params) (:exact-match-id query-params)
@@ -83,29 +74,17 @@
:where []} :where []}
:args [(:exact-match-id query-params)]}) :args [(:exact-match-id query-params)]})
total-gte (:total-gte query-params)
(merge-query {:query {:in ['?total-gte] (merge-query {:query {:in ['?total-gte]
:where ['[?e :sales-refund/total ?a] :where ['[?e :sales-refund/total ?a]
'[(>= ?a ?total-gte)]]} '[(>= ?a ?total-gte)]]}
:args [total-gte]}) :args [(:total-gte query-params)]})
total-lte (:total-lte query-params)
(merge-query {:query {:in ['?total-lte] (merge-query {:query {:in ['?total-lte]
:where ['[?e :sales-refund/total ?a] :where ['[?e :sales-refund/total ?a]
'[(<= ?a ?total-lte)]]} '[(<= ?a ?total-lte)]]}
:args [total-lte]}) :args [(:total-lte query-params)]})
start-date
(merge-query {:query {:in '[?start-date]
:where ['[?e :sales-refund/date ?date]
'[(>= ?date ?start-date)]]}
:args [(c/to-date start-date)]})
end-date
(merge-query {:query {:in '[?end-date]
:where ['[?e :sales-refund/date ?date]
'[(<= ?date ?end-date)]]}
:args [(c/to-date end-date)]})
true true
(merge-query {:query {:find ['?sort-default '?e] (merge-query {:query {:find ['?sort-default '?e]
@@ -120,16 +99,14 @@
(group-by :db/id)) (group-by :db/id))
refunds (->> ids refunds (->> ids
(map results) (map results)
(map first) (map first))]
(mapv <-datomic)
)]
refunds)) refunds))
(defn fetch-page [_ args] (defn fetch-page [request]
(let [db (dc/db conn) (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])) matching-count]))
(def grid-page {:id "refund-table" (def grid-page {:id "refund-table"
@@ -138,8 +115,8 @@
:id-fn :db/id :id-fn :db/id
:fetch-page fetch-page :fetch-page fetch-page
:oob-render :oob-render
(fn [_ params] (fn [request]
[(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) [(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)} :company)}
"POS"] "POS"]
@@ -150,8 +127,8 @@
:title "Refunds" :title "Refunds"
:entity-name "Refund" :entity-name "Refund"
:route :pos-refund-table :route :pos-refund-table
:action-buttons (fn [_ args]) :action-buttons (fn [request])
:row-buttons (fn [_ e]) :row-buttons (fn [request _])
:headers [{:key "client" :headers [{:key "client"
:name "Client" :name "Client"
:sort-key "client" :sort-key "client"
@@ -177,8 +154,18 @@
(def row* (partial helper/row* grid-page)) (def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page)) (def table* (partial helper/table* grid-page))
(def table (partial helper/table grid-page)) (def table (-> (partial helper/table 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 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 (def key->handler
{:pos-refunds (wrap-client-redirect-unauthenticated (wrap-secure page)) {:pos-refunds (wrap-client-redirect-unauthenticated (wrap-secure page))

239
src/clj/auto_ap/ssr/pos/sales_orders.clj
View File

@@ -1,6 +1,16 @@
(ns auto-ap.ssr.pos.sales-orders (ns auto-ap.ssr.pos.sales-orders
(:require (:require
[auto-ap.datomic
: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.datomic.sales-orders :as d-sales]
[auto-ap.graphql.utils :refer [extract-client-ids]]
[auto-ap.query-params :as query-params]
[auto-ap.routes.utils [auto-ap.routes.utils
:refer [wrap-client-redirect-unauthenticated wrap-secure]] :refer [wrap-client-redirect-unauthenticated wrap-secure]]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
@@ -10,15 +20,16 @@
:refer [date-range-field* processor-field* total-field*]] :refer [date-range-field* processor-field* total-field*]]
[auto-ap.ssr.svg :as svg] [auto-ap.ssr.svg :as svg]
[auto-ap.time :as atime] [auto-ap.time :as atime]
[bidi.bidi :as bidi])) [bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]))
;; TODO refunds ;; TODO incorporate parsing into spec
;; TODO expected deposits ;; TODO incorporate permissions into spec
;; always should be fast ;; TODO incorporate limiting clients into spec
;; make params parsing composable
(defn filters [params] (defn filters [request]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms" [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
"hx-get" (bidi/path-for ssr-routes/only-routes "hx-get" (bidi/path-for ssr-routes/only-routes
:pos-sales-table) :pos-sales-table)
@@ -27,25 +38,25 @@
#_#_:hx-disabled-elt "find fieldset"} #_#_:hx-disabled-elt "find fieldset"}
[:fieldset.space-y-6 [:fieldset.space-y-6
(date-range-field* params) (date-range-field* request)
[:div (total-field* params)] (total-field* request)
[:div [:div
(com/field {:label "Payment Method"} (com/field {:label "Payment Method"}
(com/radio {:size :small (com/radio {:size :small
:name "payment-method" :name "payment-method"
:options [{:value "all" :options [{:value ""
:content "All"} :content "All"}
{:value "cash" {:value "CASH"
:content "Cash"} :content "Cash"}
{:value "card" {:value "CARD"
:content "Card"} :content "Card"}
{:value "gift-card" {:value "SQUARE_GIFT_CARD"
:content "Gift Card"} :content "Gift Card"}
{:value "other" {:value "OTHER"
:content "Other"} :content "Other"}
]}))] ]}))]
[:div [:div
(processor-field* params)] (processor-field* request)]
[:div [:div
(com/field {:label "Category"} (com/field {:label "Category"}
@@ -53,46 +64,132 @@
:class "hot-filter" :class "hot-filter"
:id "category" :id "category"
:hx-preserve "true" :hx-preserve "true"
:value (:category (:parsed-query-params params)) :value (:category (:parsed-query-params request))
:placeholder "Fries" :placeholder "Fries"
:size :small}))]]]) :size :small}))]]])
(defn args->graphql-params [args] (def default-read '[:db/id
{:clients (:clients args) :sales-order/external-id,
:start (:start (:parsed-query-params args)) :sales-order/location,
:sort (:sort (:parsed-query-params args)) [:sales-order/date, :xform clj-time.coerce/from-date]
:per-page (:per-page (:parsed-query-params args)) :sales-order/total,
:category (not-empty (:category (:parsed-query-params args))) :sales-order/tax,
:date-range {:start (some-> args :sales-order/tip,
:parsed-query-params :sales-order/line-items,
:start-date :sales-order/discount,
(atime/parse atime/normal-date)) :sales-order/returns,
:end (some-> args :sales-order/service-charge,
:parsed-query-params :sales-order/vendor,
:end-date :sales-order/source,
(atime/parse atime/normal-date))} :sales-order/reference-link,
:total-gte (some-> args :raw-query-params (get "total-gte") not-empty (#(if (string? %) (Double/parseDouble %) (double %)))) {:sales-order/client [:client/name :db/id :client/code]
:total-lte (some-> args :raw-query-params (get "total-lte") not-empty (#(if (string? %) (Double/parseDouble %) (double %)))) :sales-order/charges [
:type-name (condp = (:payment-method (:parsed-query-params args)) :charge/type-name,
"cash" "CASH" :charge/total,
"" nil :charge/tax,
"all" nil :charge/tip,
"card" "CARD" :charge/external-id,
"gift-card" "SQUARE_GIFT_CARD" :charge/note,
"other" "OTHER" :charge/date,
nil) :charge/client,
:processor (some-> args :parsed-query-params :processor not-empty keyword)}) :charge/location,
:charge/reference-link,
{:charge/processor [:db/ident]} {:expected-deposit/_charges [:db/id]}]}])
(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
(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]
'[?c :client/name ?sort-client]]
"date" ['[?e :sales-order/date ?sort-date]]
"total" ['[?e :sales-order/total ?sort-total]]
"tax" ['[?e :sales-order/tax ?sort-tax]]
"tip" ['[?e :sales-order/tip ?sort-tip]]
"source" ['[?e :sales-order/source ?sort-source]]
"processor" ['[?e :sales-order/processor ?p]
'[?p :db/ident ?p2]
'[(name ?p2) ?sort-processor]]}
query-params)
(:exact-match-id query-params)
(merge-query {:query {:in ['?e]
:where []}
:args [(:exact-match-id query-params)]})
(:total-gte query-params)
(merge-query {:query {:in ['?total-gte]
:where ['[?e :sales-order/total ?a]
'[(>= ?a ?total-gte)]]}
:args [(:total-gte query-params)]})
(:total-lte query-params)
(merge-query {:query {:in ['?total-lte]
:where ['[?e :sales-order/total ?a]
'[(<= ?a ?total-lte)]]}
:args [(:total-lte query-params)]})
(not-empty (:payment-method query-params))
(merge-query {:query {:in ['?type-name]
:where ['[?e :sales-order/charges ?chg]
'[?chg :charge/type-name ?type-name]]}
:args [(:payment-method query-params)]})
(not-empty (:category query-params))
(merge-query {:query {:in ['?category]
:where ['[?e :sales-order/line-items ?li]
'[?li :order-line-item/category ?category]]}
:args [(:category query-params)]})
(:processor query-params)
(merge-query {:query {:in ['?processor]
:where ['[?e :sales-order/charges ?chg]
'[?chg :charge/processor ?processor]]}
:args [(:processor query-params)]})
true
(merge-query {:query {:find ['?sort-default '?e]}}))]
(cond->> (query2 query)
true (apply-sort-3 query-params)
true (apply-pagination query-params))))
(defn hydrate-results [ids db _]
(let [results (->> (pull-many db default-read ids)
(group-by :db/id))
charges (->> ids
(map results)
(map first))]
charges))
(defn fetch-page [request]
(let [db (dc/db conn)
{ids-to-retrieve :ids matching-count :count} (fetch-ids db request)]
[(->> (hydrate-results ids-to-retrieve db request))
matching-count]))
(def grid-page {:id "sales-table" (def grid-page {:id "sales-table"
:nav (com/main-aside-nav) :nav (com/main-aside-nav)
:page-specific-nav filters :page-specific-nav filters
:id-fn :db/id :id-fn :db/id
:fetch-page (fn [_ args] :fetch-page fetch-page
(d-sales/get-graphql
(args->graphql-params args)))
:oob-render :oob-render
(fn [_ params] (fn [request]
[(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) [(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)} :company)}
"POS"] "POS"]
@@ -103,15 +200,16 @@
:title "Sales orders" :title "Sales orders"
:entity-name "Sales orders" :entity-name "Sales orders"
:route :pos-sales-table :route :pos-sales-table
:action-buttons (fn [_ args] :action-buttons (fn [request]
(let [{:keys [total tax]} (d-sales/summarize-graphql (args->graphql-params args))] (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 :primary}
) (format "Total $%.2f" total)
(com/pill {:color :secondary} )
(format "Tax $%.2f" tax ) (com/pill {:color :secondary}
)])) (format "Tax $%.2f" tax )
)])))
:row-buttons (fn [_ e] :row-buttons (fn [_ e]
(when (:sales-order/reference-link e) (when (:sales-order/reference-link e)
[(com/a-icon-button {:href (:sales-order/reference-link e)} [(com/a-icon-button {:href (:sales-order/reference-link e)}
@@ -149,14 +247,37 @@
{:key "Payment methods" {:key "Payment methods"
:name "Payment Methods" :name "Payment Methods"
:render (fn [sales-order] :render (fn [sales-order]
(for [method (->> sales-order :sales-order/charges (map :charge/type-name) set)] [:div.flex.space-x-2
(com/pill {:color :primary } (for [payment-method (->> sales-order :sales-order/charges (map :charge/type-name) set)]
method)))}]}) (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 row* (partial helper/row* grid-page))
(def table* (partial helper/table* 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 (def key->handler
{:pos-sales (wrap-client-redirect-unauthenticated (wrap-secure page)) {:pos-sales (wrap-client-redirect-unauthenticated (wrap-secure page))

112
src/clj/auto_ap/ssr/pos/tenders.clj
View File

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