diff --git a/iol_ion/src/iol_ion/query.clj b/iol_ion/src/iol_ion/query.clj index 85ad604e..76ed64d7 100644 --- a/iol_ion/src/iol_ion/query.clj +++ b/iol_ion/src/iol_ion/query.clj @@ -101,6 +101,15 @@ [c (or (next-day end) #inst "2030-03-05T08:00:00.000-00:00") ]))] [(: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] (for [c clients :let [c (entid db c)] @@ -145,3 +154,6 @@ [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 ident [x] + (:db/ident x)) diff --git a/resources/datomic/extensions.edn b/resources/datomic/extensions.edn new file mode 100644 index 00000000..5b7271be --- /dev/null +++ b/resources/datomic/extensions.edn @@ -0,0 +1 @@ +{:xforms [clj-time.coerce/to-date clj-time.coerce/from-date iol-ion.query/ident ]} diff --git a/resources/schema.edn b/resources/schema.edn index 4d177fba..9c2a6558 100644 --- a/resources/schema.edn +++ b/resources/schema.edn @@ -1823,6 +1823,11 @@ :db/valueType :db.type/tuple :db/tupleAttrs [ :cash-drawer-shift/client :cash-drawer-shift/date] :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}] diff --git a/src/clj/auto_ap/query_params.clj b/src/clj/auto_ap/query_params.clj new file mode 100644 index 00000000..3f4f8d4b --- /dev/null +++ b/src/clj/auto_ap/query_params.clj @@ -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))) diff --git a/src/clj/auto_ap/ssr/components.clj b/src/clj/auto_ap/ssr/components.clj index 6904fafd..86dae15f 100644 --- a/src/clj/auto_ap/ssr/components.clj +++ b/src/clj/auto_ap/ssr/components.clj @@ -15,6 +15,7 @@ (def breadcrumbs breadcrumbs/breadcrumbs-) (def button buttons/button-) +(def a-button buttons/a-button-) (def button-icon buttons/button-icon-) (def icon-button buttons/icon-button-) (def a-icon-button buttons/a-icon-button-) diff --git a/src/clj/auto_ap/ssr/components/buttons.clj b/src/clj/auto_ap/ssr/components/buttons.clj index 1beef696..14a7aa1e 100644 --- a/src/clj/auto_ap/ssr/components/buttons.clj +++ b/src/clj/auto_ap/ssr/components/buttons.clj @@ -17,6 +17,19 @@ [:div.ml-3 "Loading..."]] (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] (into [:button diff --git a/src/clj/auto_ap/ssr/grid_page_helper.clj b/src/clj/auto_ap/ssr/grid_page_helper.clj index fbd1fb7f..230362ec 100644 --- a/src/clj/auto_ap/ssr/grid_page_helper.clj +++ b/src/clj/auto_ap/ssr/grid_page_helper.clj @@ -1,23 +1,24 @@ (ns auto-ap.ssr.grid-page-helper (:require + [auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr.components :as com] + [auto-ap.ssr.svg :as svg] [auto-ap.ssr.ui :refer [base-page]] [auto-ap.ssr.utils :refer [html-response]] - [hiccup2.core :as hiccup] [bidi.bidi :as bidi] - [auto-ap.ssr-routes :as ssr-routes] [cemerick.url :as url] [clojure.string :as str] - [auto-ap.ssr.svg :as svg] + [hiccup2.core :as hiccup] + [clj-time.core :as time] [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 :headers (filter (fn [h] (if (and (:hide? h) - ((:hide? h) params)) + ((:hide? h) request)) nil h))) (mapv (fn [header] @@ -28,7 +29,7 @@ cells (conj cells (com/data-grid-right-stack-cell {} (into [:form [: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 {:class (when flash? "live-added") @@ -66,12 +67,11 @@ )) "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) per-page (or per-page 30) [entities total] ((:fetch-page grid-spec) - user - params)] + request)] (com/data-grid-card {:id (:id grid-spec) :title (:title grid-spec) @@ -82,9 +82,9 @@ :subtitle [:div.flex.items-center.gap-2 [:span (format "Total %s: %d, " (:entity-name grid-spec) total)] (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] - (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 (:route grid-spec)) :hx-target (str "#" (:id grid-spec)) @@ -99,7 +99,7 @@ (fn [h] (cond (and (:hide? h) - ((:hide? h) params)) + ((:hide? h) request)) nil (: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] (str/join "," (map (fn [k] (format "%s:%s" (:sort-key k) (if (= true (:asc k)) @@ -176,77 +142,72 @@ (update :sort sort->query) (url/map->query))) -(defn use-date-range [query-params date-range] - (condp = date-range - "week" - (assoc query-params - :start-date (atime/unparse-local (time/plus (time/now) (time/days -7)) atime/normal-date) - :end-date (atime/unparse-local (time/now) atime/normal-date)) +(defn default-unparse-query-params [query-params] + (reduce + (fn [query-params [k value]] + (assoc query-params k + (cond (= k :sort) + (sort->query value) - "month" - (assoc query-params - :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)) + (instance? org.joda.time.base.AbstractInstant value) + (atime/unparse-local value atime/normal-date) - "year" - (assoc query-params - :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)) + (instance? Long value) + (str value) - "all" - (assoc query-params - :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? Double value) + (format "%.2f" value) + (instance? Float value) + (format "%.2f" value) + + (keyword? value) + (name value) + + :else + value))) + 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}] - (let [params (extract-params grid-spec request)] + (let [unparse-query-params (or (:unparse-query grid-spec) + default-unparse-query-params)] (html-response (table* grid-spec identity - params) - :headers {"hx-push-url" (str "?" (params->query-string params))} + request) + :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-render identity params))))) + (oob-render request))))) + (defn page [grid-spec {:keys [identity] :as request}] - (let [params (extract-params grid-spec request)] - (base-page - request - (com/page {:nav (:nav grid-spec) - :page-specific (when-let [page-specific-nav (:page-specific-nav grid-spec)] - [:div#page-specific-nav (page-specific-nav params)]) - :client-selection (:client-selection (:session request)) - :clients (:clients request) - :client (:client request) - :identity (:identity request)} - (apply com/breadcrumbs {} (:breadcrumbs grid-spec)) - (table* grid-spec - identity - params - )) - (:title grid-spec)))) + (base-page + request + (com/page {:nav (:nav grid-spec) + :page-specific (when-let [page-specific-nav (:page-specific-nav grid-spec)] + [:div#page-specific-nav (page-specific-nav request)]) + :client-selection (:client-selection (:session request)) + :clients (:clients request) + :client (:client request) + :identity (:identity request)} + (apply com/breadcrumbs {} (:breadcrumbs grid-spec)) + (table* grid-spec + identity + request)) + (: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))) diff --git a/src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj b/src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj index 93574c6b..df5cc696 100644 --- a/src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj +++ b/src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj @@ -9,6 +9,7 @@ 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] @@ -21,7 +22,6 @@ [datomic.api :as dc])) ;; always should be fast -;; make params parsing composable (defn filters [params] [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms" @@ -35,36 +35,26 @@ (date-range-field* params) (total-field* params)]]) -(defn <-datomic [result] - (cond-> result - true (update :cash-drawer-shift/date c/from-date))) - -(def default-read '[* +(def default-read '[:db/id + :cash-drawer-shift/paid-in :cash-drawer-shift/paid-out :cash-drawer-shift/expected-cash :cash-drawer-shift/opened-cash + [:cash-drawer-shift/date :xform clj-time.coerce/from-date] {:cash-drawer-shift/client [:client/name :db/id :client/code]}]) -(defn fetch-ids [db args] - (let [query-params (:parsed-query-params args) - valid-clients (extract-client-ids (:clients args) +(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) - 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 [] :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 - (some-> start-date c/to-date) - (some-> end-date c/to-date )]]} + (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] '[?c :client/name ?sort-client]] "date" ['[?e :cash-drawer-shift/date ?sort-date]] @@ -80,18 +70,6 @@ :where []} :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 (merge-query {:query {:find ['?sort-default '?e] :where ['[?e :cash-drawer-shift/date ?sort-default]]}}))] @@ -105,16 +83,14 @@ (group-by :db/id)) cash-drawer-shifts (->> ids (map results) - (map first) - (mapv <-datomic) - )] + (map first))] cash-drawer-shifts)) -(defn fetch-page [_ args] +(defn fetch-page [request] (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])) (def grid-page {:id "cash-drawer-shift-table" @@ -123,8 +99,8 @@ :id-fn :db/id :fetch-page fetch-page :oob-render - (fn [_ params] - [(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) + (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"] @@ -135,7 +111,7 @@ :title "Cash drawer shifts" :entity-name "Cash drawer shift" :route :pos-cash-drawer-shift-table - :action-buttons (fn [_ args]) + :action-buttons (fn [request]) :row-buttons (fn [_ e]) :headers [{:key "client" :name "Client" @@ -167,8 +143,13 @@ (def row* (partial helper/row* 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 + (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)) diff --git a/src/clj/auto_ap/ssr/pos/common.clj b/src/clj/auto_ap/ssr/pos/common.clj index b87b78c7..3eeaa63d 100644 --- a/src/clj/auto_ap/ssr/pos/common.clj +++ b/src/clj/auto_ap/ssr/pos/common.clj @@ -1,9 +1,15 @@ (ns auto-ap.ssr.pos.common (: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 {} (com/field {:label "Date Range"} [:div.space-y-4 @@ -16,26 +22,22 @@ ] [:div.flex.space-x-1.items-baseline (com/date-input {:name "start-date" - :value (some-> params + :value (some-> request :parsed-query-params :start-date - (atime/parse atime/normal-date) - (atime/unparse-local - atime/normal-date)) + (atime/unparse-local atime/normal-date)) :placeholder "Date" :size :small}) (com/date-input {:name "end-date" - :value (some-> params + :value (some-> request :parsed-query-params :end-date - (atime/parse atime/normal-date) - (atime/unparse-local - atime/normal-date)) + (atime/unparse-local atime/normal-date)) :placeholder "Date" - :size :small})]] - )]) -(defn processor-field* [params] + :size :small})]])]) + +(defn processor-field* [request] (com/field {:label "Processor"} (com/radio {:size :small :name "processor" @@ -56,14 +58,14 @@ {:value "na" :content "No Processor"}]}))) -(defn total-field* [params] +(defn total-field* [request] (com/field {:label "Total"} [:div.flex.space-x-4.items-baseline (com/money-input {:name "total-gte" :id "total-gte" :hx-preserve "true" :class "hot-filter" - :value (:total-gte (:parsed-query-params params)) + :value (:total-gte (:parsed-query-params request)) :placeholder "0.01" :size :small}) [:div.align-baseline @@ -72,6 +74,16 @@ :hx-preserve "true" :id "total-lte" :class "hot-filter" - :value (:total-lte (:parsed-query-params params)) + :value (:total-lte (:parsed-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))] + [: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]]]))])) diff --git a/src/clj/auto_ap/ssr/pos/expected_deposits.clj b/src/clj/auto_ap/ssr/pos/expected_deposits.clj index 142c0b3d..1aebefd0 100644 --- a/src/clj/auto_ap/ssr/pos/expected_deposits.clj +++ b/src/clj/auto_ap/ssr/pos/expected_deposits.clj @@ -1,21 +1,31 @@ (ns auto-ap.ssr.pos.expected-deposits (: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 :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] - [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.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 -(defn filters [params] +(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 :pos-expected-deposit-table) @@ -24,36 +34,112 @@ #_#_:hx-disabled-elt "find fieldset"} [:fieldset.space-y-6 - (date-range-field* params) - (total-field* params)]]) + (date-range-field* request) + (exact-match-id-field* request)]]) -(defn args->graphql-params [args] - {:clients (:clients args) - :start (:start (:parsed-query-params args)) - :sort (:sort (:parsed-query-params args)) - :per-page (:per-page (:parsed-query-params args)) - :exact-match-id (some-> (:parsed-query-params args) :exact-match-id Long/parseLong) - :date-range {:start (some-> args - :parsed-query-params - :start-date - (atime/parse atime/normal-date)) - :end (some-> args - :parsed-query-params - :end-date - (atime/parse atime/normal-date))} - :total-gte (some-> args :raw-query-params (get "total-gte") not-empty (#(if (string? %) (Double/parseDouble %) (double %)))) - :total-lte (some-> args :raw-query-params (get "total-lte") not-empty (#(if (string? %) (Double/parseDouble %) (double %))))}) +(def default-read '[:db/id + :expected-deposit/location + :expected-deposit/total + :expected-deposit/fee + [:expected-deposit/date :xform clj-time.coerce/from-date] + {:expected-deposit/client [:client/name :db/id :client/code] + [:expected-deposit/status :xform iol-ion.query/ident] [:db/ident] + :transaction/_expected-deposit [:transaction/date :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)])) + 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" :nav (com/main-aside-nav) :page-specific-nav filters :id-fn :db/id - :fetch-page (fn [_ args] - (d-expected-deposit/get-graphql - (args->graphql-params args))) + :fetch-page fetch-page :oob-render - (fn [_ params] - [(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) + (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"] @@ -64,19 +150,18 @@ :title "Expected deposits" :entity-name "Expected deposit" :route :pos-expected-deposit-table - :action-buttons (fn [_ args] - #_(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 ) - )])) + :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 (: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" @@ -102,8 +187,19 @@ (def row* (partial helper/row* 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 :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)) diff --git a/src/clj/auto_ap/ssr/pos/refunds.clj b/src/clj/auto_ap/ssr/pos/refunds.clj index e767901b..b774b226 100644 --- a/src/clj/auto_ap/ssr/pos/refunds.clj +++ b/src/clj/auto_ap/ssr/pos/refunds.clj @@ -20,13 +20,14 @@ [bidi.bidi :as bidi] [clj-time.coerce :as c] [datomic.api :as dc] - [clojure.set :as set])) + [clojure.set :as set] + [auto-ap.query-params :as query-params])) ;; TODO refunds ;; 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" "hx-get" (bidi/path-for ssr-routes/only-routes :pos-refund-table) @@ -35,47 +36,37 @@ #_#_:hx-disabled-elt "find fieldset"} [:fieldset.space-y-6 - (date-range-field* params) - (total-field* params)]]) + (date-range-field* request) + (total-field* request)]]) -(defn <-datomic [result] - (cond-> result - true (update :sales-refund/date c/from-date))) - -(def default-read '[* +(def default-read '[:db/id + :sales-refund/total + :sales-refund/fee + :sales-refund/type + [:sales-refund/date :xform clj-time.coerce/from-date] {:sales-refund/client [:client/name :db/id :client/code]}]) -(defn fetch-ids [db args] - (let [query-params (:parsed-query-params args) - valid-clients (extract-client-ids (:clients args) +(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) - 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 [] :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 - (some-> start-date c/to-date) - (some-> end-date c/to-date )]]} + (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] '[?c :client/name ?sort-client]] "date" ['[?e :sales-refund/date ?sort-date]] "total" ['[?e :sales-refund/total ?sort-total]] "fee" ['[?e :sales-refund/fee ?sort-tip]] - "type" ['[?e :sales-refund/type ?type]]} + "type" ['[?e :sales-refund/type ?sort-type]]} query-params) (:exact-match-id query-params) @@ -83,29 +74,17 @@ :where []} :args [(:exact-match-id query-params)]}) - total-gte + (:total-gte query-params) (merge-query {:query {:in ['?total-gte] :where ['[?e :sales-refund/total ?a] '[(>= ?a ?total-gte)]]} - :args [total-gte]}) + :args [(:total-gte query-params)]}) - total-lte + (:total-lte query-params) (merge-query {:query {:in ['?total-lte] :where ['[?e :sales-refund/total ?a] '[(<= ?a ?total-lte)]]} - :args [total-lte]}) - - 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)]}) + :args [(:total-lte query-params)]}) true (merge-query {:query {:find ['?sort-default '?e] @@ -120,16 +99,14 @@ (group-by :db/id)) refunds (->> ids (map results) - (map first) - (mapv <-datomic) - )] + (map first))] refunds)) -(defn fetch-page [_ args] +(defn fetch-page [request] (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])) (def grid-page {:id "refund-table" @@ -138,8 +115,8 @@ :id-fn :db/id :fetch-page fetch-page :oob-render - (fn [_ params] - [(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) + (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"] @@ -150,8 +127,8 @@ :title "Refunds" :entity-name "Refund" :route :pos-refund-table - :action-buttons (fn [_ args]) - :row-buttons (fn [_ e]) + :action-buttons (fn [request]) + :row-buttons (fn [request _]) :headers [{:key "client" :name "Client" :sort-key "client" @@ -177,8 +154,18 @@ (def row* (partial helper/row* 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 :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)) diff --git a/src/clj/auto_ap/ssr/pos/sales_orders.clj b/src/clj/auto_ap/ssr/pos/sales_orders.clj index 3aaaf682..54133acc 100644 --- a/src/clj/auto_ap/ssr/pos/sales_orders.clj +++ b/src/clj/auto_ap/ssr/pos/sales_orders.clj @@ -1,6 +1,16 @@ (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]] [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 :refer [wrap-client-redirect-unauthenticated wrap-secure]] [auto-ap.ssr-routes :as ssr-routes] @@ -10,15 +20,16 @@ :refer [date-range-field* processor-field* total-field*]] [auto-ap.ssr.svg :as svg] [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 expected deposits -;; always should be fast -;; make params parsing composable +;; TODO incorporate parsing into spec +;; TODO incorporate permissions into spec +;; TODO incorporate limiting clients into spec -(defn filters [params] +(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 :pos-sales-table) @@ -27,25 +38,25 @@ #_#_:hx-disabled-elt "find fieldset"} [:fieldset.space-y-6 - (date-range-field* params) - [:div (total-field* params)] + (date-range-field* request) + (total-field* request) [:div (com/field {:label "Payment Method"} (com/radio {:size :small :name "payment-method" - :options [{:value "all" + :options [{:value "" :content "All"} - {:value "cash" + {:value "CASH" :content "Cash"} - {:value "card" + {:value "CARD" :content "Card"} - {:value "gift-card" + {:value "SQUARE_GIFT_CARD" :content "Gift Card"} - {:value "other" + {:value "OTHER" :content "Other"} ]}))] [:div - (processor-field* params)] + (processor-field* request)] [:div (com/field {:label "Category"} @@ -53,46 +64,132 @@ :class "hot-filter" :id "category" :hx-preserve "true" - :value (:category (:parsed-query-params params)) + :value (:category (:parsed-query-params request)) :placeholder "Fries" :size :small}))]]]) -(defn args->graphql-params [args] - {:clients (:clients args) - :start (:start (:parsed-query-params args)) - :sort (:sort (:parsed-query-params args)) - :per-page (:per-page (:parsed-query-params args)) - :category (not-empty (:category (:parsed-query-params args))) - :date-range {:start (some-> args - :parsed-query-params - :start-date - (atime/parse atime/normal-date)) - :end (some-> args - :parsed-query-params - :end-date - (atime/parse atime/normal-date))} - :total-gte (some-> args :raw-query-params (get "total-gte") not-empty (#(if (string? %) (Double/parseDouble %) (double %)))) - :total-lte (some-> args :raw-query-params (get "total-lte") not-empty (#(if (string? %) (Double/parseDouble %) (double %)))) - :type-name (condp = (:payment-method (:parsed-query-params args)) - "cash" "CASH" - "" nil - "all" nil - "card" "CARD" - "gift-card" "SQUARE_GIFT_CARD" - "other" "OTHER" - nil) - :processor (some-> args :parsed-query-params :processor not-empty keyword)}) +(def default-read '[:db/id + :sales-order/external-id, + :sales-order/location, + [:sales-order/date, :xform clj-time.coerce/from-date] + :sales-order/total, + :sales-order/tax, + :sales-order/tip, + :sales-order/line-items, + :sales-order/discount, + :sales-order/returns, + :sales-order/service-charge, + :sales-order/vendor, + :sales-order/source, + :sales-order/reference-link, + {:sales-order/client [:client/name :db/id :client/code] + :sales-order/charges [ + :charge/type-name, + :charge/total, + :charge/tax, + :charge/tip, + :charge/external-id, + :charge/note, + :charge/date, + :charge/client, + :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" :nav (com/main-aside-nav) :page-specific-nav filters :id-fn :db/id - :fetch-page (fn [_ args] - (d-sales/get-graphql - (args->graphql-params args))) + :fetch-page fetch-page :oob-render - (fn [_ params] - [(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) + (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"] @@ -103,15 +200,16 @@ :title "Sales orders" :entity-name "Sales orders" :route :pos-sales-table - :action-buttons (fn [_ args] - (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 ) - )])) + :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)} @@ -149,14 +247,37 @@ {:key "Payment methods" :name "Payment Methods" :render (fn [sales-order] - (for [method (->> sales-order :sales-order/charges (map :charge/type-name) set)] - (com/pill {:color :primary } - method)))}]}) + [: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)) -(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 {:pos-sales (wrap-client-redirect-unauthenticated (wrap-secure page)) diff --git a/src/clj/auto_ap/ssr/pos/tenders.clj b/src/clj/auto_ap/ssr/pos/tenders.clj index 1d6de99e..b615d195 100644 --- a/src/clj/auto_ap/ssr/pos/tenders.clj +++ b/src/clj/auto_ap/ssr/pos/tenders.clj @@ -20,13 +20,11 @@ [bidi.bidi :as bidi] [clj-time.coerce :as c] [datomic.api :as dc] - [clojure.set :as set])) + [auto-ap.query-params :as query-params])) -;; TODO refunds ;; 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" "hx-get" (bidi/path-for ssr-routes/only-routes :pos-tender-table) @@ -35,52 +33,36 @@ #_#_:hx-disabled-elt "find fieldset"} [:fieldset.space-y-6 - (date-range-field* params) - (processor-field* params) - (total-field* params)]]) + (date-range-field* request) + (processor-field* request) + (total-field* request)]]) -(defn <-datomic [result] - (let [expected-deposit (some-> (:expected-deposit/_charges result) - first - (update :expected-deposit/date c/from-date))] - (cond-> result - true (update :charge/date c/from-date) - true (update :charge/processor :db/ident) - expected-deposit (assoc :expected-deposit expected-deposit)))) +(def default-read '[:db/id + :charge/reference-link + :charge/total + :charge/tip + [:charge/date :xform clj-time.coerce/from-date] + {:charge/client [:client/name :db/id :client/code] + [:charge/processor :xform iol-ion.query/ident] [:db/ident] + :expected-deposit/_charges [:expected-deposit/date :db/id]}]) -(def default-read '[* - {:charge/client [:client/name :db/id :client/code] - :charge/processor [:db/ident] - :expected-deposit/_charges [:expected-deposit/date :db/id]}]) - -(defn fetch-ids [db args] - (let [query-params (:parsed-query-params args) - valid-clients (extract-client-ids (:clients args) - (:client args) +(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) - _ (println "valid clients" valid-clients) - 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 %)))) + 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 - (some-> start-date c/to-date) - (some-> end-date c/to-date )]]} + (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] '[?c :client/name ?sort-client]] "date" ['[?e :charge/date ?sort-date]] @@ -96,17 +78,17 @@ :where []} :args [(:exact-match-id query-params)]}) - total-gte + (:total-gte query-params) (merge-query {:query {:in ['?total-gte] :where ['[?e :charge/total ?a] '[(>= ?a ?total-gte)]]} - :args [total-gte]}) + :args [(:total-gte query-params)]}) - total-lte + (:total-lte query-params) (merge-query {:query {:in ['?total-lte] :where ['[?e :charge/total ?a] '[(<= ?a ?total-lte)]]} - :args [total-lte]}) + :args [(:total-lte query-params)]}) processor (merge-query {:query {:in '[?processor] @@ -116,6 +98,7 @@ true (merge-query {:query {:find ['?sort-default '?e]}}))] + (cond->> (query2 query) true (apply-sort-3 query-params) true (apply-pagination query-params)))) @@ -125,16 +108,14 @@ (group-by :db/id)) charges (->> ids (map results) - (map first) - (mapv <-datomic) - )] + (map first))] charges)) -(defn fetch-page [_ args] +(defn fetch-page [request] (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])) (def grid-page {:id "tender-table" @@ -143,8 +124,8 @@ :id-fn :db/id :fetch-page fetch-page :oob-render - (fn [_ params] - [(assoc-in (date-range-field* params) [1 :hx-swap-oob] true)]) + (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"] @@ -155,16 +136,16 @@ :title "Tenders" :entity-name "Tender" :route :pos-tender-table - :action-buttons (fn [_ args]) - :row-buttons (fn [_ e] + :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 [args] - (= (count (:clients args)) 1)) + :hide? (fn [request] + (= (count (:clients request)) 1)) :render #(-> % :charge/client :client/code)} {:key "date" :name "Date" @@ -188,17 +169,30 @@ {:key "links" :name "Links" :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 :pos-expected-deposits) - "?exact-match-id=" expected-deposit-id)} + "?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)) -(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 - {: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))})