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

progress on migrating all grids.

Browse Source
This commit is contained in:
Bryce
2023-09-28 22:22:25 -07:00
parent d1798f6b5c
commit 99accc067c
15 changed files with 743 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scratch-sessions/fix-page-performance.repl
View File

@@ -213,4 +213,15 @@
{:user/name "hydrate-tuples"}) {:user/name "hydrate-tuples"})
(auto-ap.datomic/audit-transact-batch (->> (dc/q '[:find ?e ?c
:in $
:where [?e :expected-deposit/client ?c]]
(dc/db conn)
)
(map (fn [[i c]]
{:db/id i
:expected-deposit/client c})))
{:user/name "hydrate-tuples"})
) )

2
src/clj/auto_ap/datomic/yodlee2.clj
View File

@@ -12,7 +12,7 @@
[clj-time.coerce :as c] [clj-time.coerce :as c]
[datomic.api :as dc])) [datomic.api :as dc]))
(def default-read '[*]) (def default-read '[* {:yodlee-provider-account/client [:client/code]}])
(defn <-datomic [x] (defn <-datomic [x]
(-> x (update :yodlee-provider-account/last-updated c/from-date))) (-> x (update :yodlee-provider-account/last-updated c/from-date)))

174
src/clj/auto_ap/ssr/company/company_1099.clj
View File

@@ -115,91 +115,93 @@
:per-page (:per-page (:parsed-query-params args))} all)] :per-page (:per-page (:parsed-query-params args))} all)]
[(:entries paginated) (:count paginated)])) [(:entries paginated) (:count paginated)]))
(def grid-page {:id "vendor-table" (def grid-page
:nav (com/company-aside-nav) (helper/build
:id-fn (comp :db/id second) {:id "vendor-table"
:fetch-page (fn [user args] :nav (com/company-aside-nav)
(get-1099-companies user args) :id-fn (comp :db/id second)
#_(r/get-graphql (into args {:id user}))) :fetch-page (fn [user args]
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes (get-1099-companies user args)
:company)} #_(r/get-graphql (into args {:id user})))
"My Company"] :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"My Company"]
[:a {:href (bidi/path-for ssr-routes/only-routes [:a {:href (bidi/path-for ssr-routes/only-routes
:company-1099)} :company-1099)}
"1099 Vendor Info"]] "1099 Vendor Info"]]
:title "1099 Vendors" :title "1099 Vendors"
:entity-name "Vendors" :entity-name "Vendors"
:route :company-1099-vendor-table :route :company-1099-vendor-table
:action-buttons (fn [user _] :action-buttons (fn [user _]
nil) nil)
:row-buttons (fn [user e] :row-buttons (fn [user e]
[(com/icon-button {:hx-get (str (bidi/path-for ssr-routes/only-routes [(com/icon-button {:hx-get (str (bidi/path-for ssr-routes/only-routes
:company-1099-vendor-dialog :company-1099-vendor-dialog
:vendor-id (:db/id (second e))) :vendor-id (:db/id (second e)))
"?" "?"
(url/map->query {:client-id (:db/id (first e))})) (url/map->query {:client-id (:db/id (first e))}))
:hx-ext "debug" :hx-ext "debug"
:hx-target "#modal-holder" :hx-target "#modal-holder"
:hx-swap "outerHTML"} :hx-swap "outerHTML"}
svg/pencil)]) svg/pencil)])
:headers [{:key "Client" :headers [{:key "Client"
:name "Client" :name "Client"
:sort-key "client" :sort-key "client"
:render (comp :client/code first)} :render (comp :client/code first)}
{:key "vendor-name" {:key "vendor-name"
:name "Vendor Name" :name "Vendor Name"
:sort-key "vendor" :sort-key "vendor"
:render (fn [[_ vendor]] :render (fn [[_ vendor]]
[:div.flex.whitespace-nowrap.items-center.gap-4 [:div.flex.whitespace-nowrap.items-center.gap-4
[:div [:div (:vendor/name vendor)] [:div [:div (:vendor/name vendor)]
[:div.text-sm.text-gray-400 [:div.text-sm.text-gray-400
(or (-> vendor :vendor/legal-entity-name not-empty) (or (-> vendor :vendor/legal-entity-name not-empty)
(str (-> vendor :vendor/legal-entity-first-name) " " (str (-> vendor :vendor/legal-entity-first-name) " "
(-> vendor :vendor/legal-entity-middle-name) " " (-> vendor :vendor/legal-entity-middle-name) " "
(-> vendor :vendor/legal-entity-last-name)))]] (-> vendor :vendor/legal-entity-last-name)))]]
(when-let [t99-type (some-> vendor :vendor/legal-entity-1099-type :db/ident name)] (when-let [t99-type (some-> vendor :vendor/legal-entity-1099-type :db/ident name)]
(com/pill (com/pill
{:class "text-xs font-medium" {:class "text-xs font-medium"
:color :primary} :color :primary}
(str/capitalize t99-type)) (str/capitalize t99-type))
)])} )])}
{:key "tin" {:key "tin"
:name "TIN" :name "TIN"
:sort-key "tin" :sort-key "tin"
:show-starting "md" :show-starting "md"
:render (fn [[_ vendor]] :render (fn [[_ vendor]]
[:div.flex.gap-4 [:div.flex.gap-4
(when-let [tin (-> vendor :vendor/legal-entity-tin)] (when-let [tin (-> vendor :vendor/legal-entity-tin)]
[:span {:class "text-xs font-medium py-0.5 "} [:span {:class "text-xs font-medium py-0.5 "}
tin]) tin])
(when-let [tin-type (some-> vendor :vendor/legal-entity-tin-type :db/ident name)] (when-let [tin-type (some-> vendor :vendor/legal-entity-tin-type :db/ident name)]
(com/pill {:class "text-xs font-medium" (com/pill {:class "text-xs font-medium"
:color :yellow} :color :yellow}
(name tin-type)))] (name tin-type)))]
)} )}
{:key "address" {:key "address"
:name "Address" :name "Address"
:sort-key "address" :sort-key "address"
:show-starting "lg" :show-starting "lg"
:render (fn [[_ vendor]] :render (fn [[_ vendor]]
(if (-> vendor :vendor/address :address/street1) (if (-> vendor :vendor/address :address/street1)
[:div [:div
[:div (-> vendor :vendor/address :address/street1)] " " [:div (-> vendor :vendor/address :address/street1)] " "
[:div [:div
(-> vendor :vendor/address :address/street2)] " " (-> vendor :vendor/address :address/street2)] " "
[:div [:div
(-> vendor :vendor/address :address/city) " " (-> vendor :vendor/address :address/city) " "
(-> vendor :vendor/address :address/state) "," (-> vendor :vendor/address :address/state) ","
(-> vendor :vendor/address :address/zip)]] (-> vendor :vendor/address :address/zip)]]
[:p.text-sm.italic.text-gray-400 "No address"]))} [:p.text-sm.italic.text-gray-400 "No address"]))}
{:key "paid" {:key "paid"
:name "Paid" :name "Paid"
:sort-key "paid" :sort-key "paid"
:render (fn [[_ _ paid]] :render (fn [[_ _ paid]]
(com/pill {:class "text-xs font-medium" (com/pill {:class "text-xs font-medium"
:color :primary} :color :primary}
"Paid $" (Math/round paid)))}]}) "Paid $" (Math/round paid)))}]}))
@@ -318,5 +320,5 @@
"Save")]]] "Save")]]]
[:div])]])))) [:div])]]))))
(def vendor-table (partial helper/table grid-page)) (def vendor-table (helper/table-route grid-page))
(def page (partial helper/page grid-page)) (def page (helper/page-route grid-page))

148
src/clj/auto_ap/ssr/company/plaid.clj
View File

@@ -9,8 +9,7 @@
pull-attr pull-attr
pull-many-by-id pull-many-by-id
query2]] query2]]
[auto-ap.graphql.utils [auto-ap.graphql.utils :refer [assert-can-see-client]]
:refer [assert-can-see-client extract-client-ids]]
[auto-ap.logging :as alog] [auto-ap.logging :as alog]
[auto-ap.plaid.core :as p] [auto-ap.plaid.core :as p]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
@@ -36,43 +35,36 @@
:plaid-account/balance :plaid-account/balance
:plaid-account/name]}]) :plaid-account/name]}])
(defn raw-graphql-ids [db args] (defn fetch-ids [db request]
(let [valid-clients (extract-client-ids (:clients args) (let [query-params (:parsed-query-params request)
(:client-id args)
(when (:client-code args)
[:client/code (:client-code args)]))
query (cond-> {:query {:find [] query (cond-> {:query {:find []
:in ['$ '[?xx ...]] :in ['$ '[?xx ...]]
:where ['[?e :plaid-item/client ?xx]]} :where ['[?e :plaid-item/client ?xx]]}
:args [db valid-clients]} :args [db (:trimmed-clients request)]}
(:sort args) (add-sorter-fields {"external-id" ['[?e :plaid-item/external-id ?sort-external-id]] (:sort query-params) (add-sorter-fields {"external-id" ['[?e :plaid-item/external-id ?sort-external-id]]
"status" ['[?e :plaid-item/status ?sort-status]]} "status" ['[?e :plaid-item/status ?sort-status]]}
args) query-params)
(:client-id args)
(merge-query {:query {:in '[?client-id]
:where ['[?e :plaid-item/client ?client-id]]}
:args [(:client-id args)]})
true true
(merge-query {:query {:find ['?e] (merge-query {:query {:find ['?e]
:where ['[?e :plaid-item/external-id]]}}))] :where ['[?e :plaid-item/external-id]]}}))]
(clojure.pprint/pprint query-params)
(cond->> (query2 query) (cond->> (query2 query)
true (apply-sort-3 args) true (apply-sort-3 query-params)
true (apply-pagination args)))) true (apply-pagination query-params))))
(defn graphql-results [ids db _] (defn hydrate-results [ids db _]
(let [results (pull-many-by-id db default-read ids)] (let [results (pull-many-by-id db default-read ids)]
(->> ids (->> ids
(map results)))) (map results))))
(defn get-page [args] (defn fetch-page [request]
(let [db (dc/db conn) (let [db (dc/db conn)
{ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)] {ids-to-retrieve :ids matching-count :count} (fetch-ids db request)]
[(graphql-results ids-to-retrieve db args) [(hydrate-results ids-to-retrieve db request)
matching-count])) matching-count]))
@@ -138,65 +130,61 @@
"Start relink")]))) "Start relink")])))
(def grid-page {:id "plaid-table" (def grid-page
:nav (com/company-aside-nav) (helper/build
:id-fn :db/id {:id "plaid-table"
:fetch-page (fn [user args] :nav (com/company-aside-nav)
(get-page {:client (:client args) :fetch-page fetch-page
:clients (:clients args) :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:start (:start (:parsed-query-params args)) :company)}
:sort (:sort (:parsed-query-params args)) "My Company"]
:per-page (:per-page (:parsed-query-params args))
}))
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"My Company"]
[:a {:href (bidi/path-for ssr-routes/only-routes [:a {:href (bidi/path-for ssr-routes/only-routes
:company-plaid)} :company-plaid)}
"Plaid"]] "Plaid"]]
:title "Plaid Accounts" :title "Plaid Accounts"
:entity-name "Plaid accounts" :entity-name "Plaid accounts"
:route :company-plaid-table :route :company-plaid-table
:action-buttons (fn [user params] :action-buttons (fn [request]
(when-let [client-code (:client/code (:client params))] (when-let [client-code (:client/code (:client request))]
[[:div {:hx-post (str (bidi/path-for ssr-routes/only-routes [[:div {:hx-post (str (bidi/path-for ssr-routes/only-routes
:company-plaid-link :company-plaid-link
:request-method :post)) :request-method :post))
:hx-vals (hiccup/raw (format "js:{client_code: \"%s\", public_token: event.detail.public_token}", client-code)) :hx-vals (hiccup/raw (format "js:{client_code: \"%s\", public_token: event.detail.public_token}", client-code))
:hx-trigger "linked"} :hx-trigger "linked"}
[:script (hiccup/raw (plaid-link-script (p/get-link-token client-code)))] [:script (hiccup/raw (plaid-link-script (p/get-link-token client-code)))]
(com/button {:color :primary (com/button {:color :primary
:id "link-account" :id "link-account"
:onClick "window.plaid.open()"} :onClick "window.plaid.open()"}
(com/button-icon {} svg/refresh) (com/button-icon {} svg/refresh)
"Link new account")]])) (format "Link %s account" client-code))]]))
:row-buttons (fn [user e] :row-buttons (fn [request e]
[[:div (com/button {:hx-put (str (bidi/path-for ssr-routes/only-routes [[:div (com/button {:hx-put (str (bidi/path-for ssr-routes/only-routes
:company-plaid-relink) :company-plaid-relink)
"?plaid-item-id=" (:db/id e)) "?plaid-item-id=" (:db/id e))
:color :primary :color :primary
:hx-target "closest div"} :hx-target "closest div"}
"Reauthenticate")]]) "Reauthenticate")]])
:headers [{:key "plaid-item" :headers [{:key "plaid-item"
:name "Plaid Item" :name "Plaid Item"
:sort-key "external-id" :sort-key "external-id"
:render :plaid-item/external-id} :render :plaid-item/external-id}
{:key "status" {:key "status"
:name "Status" :name "Status"
:sort-key "status" :sort-key "status"
:render #(when-let [status (:plaid-item/status %)] :render #(when-let [status (:plaid-item/status %)]
[:div [:div (com/pill {:color :primary} [:div [:div (com/pill {:color :primary}
status)] status)]
[:div (atime/unparse-local (coerce/to-date-time (:plaid-item/last-updated %)) atime/normal-date)]])} [:div (atime/unparse-local (coerce/to-date-time (:plaid-item/last-updated %)) atime/normal-date)]])}
{:key "accounts" {:key "accounts"
:name "Accounts" :name "Accounts"
:show-starting "md" :show-starting "md"
:render (fn [e] :render (fn [e]
[:ul [:ul
(for [a (:plaid-item/accounts e)] (for [a (:plaid-item/accounts e)]
[:li (:plaid-account/name a) " - " (:plaid-account/number a)])])}]}) [:li (:plaid-account/name a) " - " (:plaid-account/number a)])])}]}))
(def page (partial helper/page grid-page))
(def table (partial helper/table grid-page)) (def page (helper/page-route grid-page))
(def table (helper/table-route grid-page))

101
src/clj/auto_ap/ssr/company/reports.clj
View File

@@ -15,59 +15,60 @@
[datomic.api :as dc] [datomic.api :as dc]
[com.brunobonacci.mulog :as mu])) [com.brunobonacci.mulog :as mu]))
(def grid-page {:id "report-table" (def grid-page
:nav (com/company-aside-nav) (helper/build {:id "report-table"
:id-fn :db/id :nav (com/company-aside-nav)
:fetch-page (fn [user args] :id-fn :db/id
(prn args) :fetch-page (fn [user args]
(r/get-graphql {:client (:client args) (prn args)
:clients (:clients args) (r/get-graphql {:client (:client args)
:start (:start (:parsed-query-params args)) :clients (:clients args)
:per-page (:per-page (:parsed-query-params args)) :start (:start (:parsed-query-params args))
:sort (:sort (:parsed-query-params args)) :per-page (:per-page (:parsed-query-params args))
})) :sort (:sort (:parsed-query-params args))
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes }))
:company)} :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
"My Company"] :company)}
"My Company"]
[:a {:href (bidi/path-for ssr-routes/only-routes [:a {:href (bidi/path-for ssr-routes/only-routes
:company-reports)} :company-reports)}
"Reports"]] "Reports"]]
:title "Reports" :title "Reports"
:entity-name "Reports" :entity-name "Reports"
:route :company-reports-table :route :company-reports-table
:action-buttons (fn [user _] :action-buttons (fn [user _]
nil) nil)
:row-buttons (fn [user e] :row-buttons (fn [user e]
(com/a-icon-button {:href (:report/url e)} (com/a-icon-button {:href (:report/url e)}
svg/download)[ svg/download)[
(when (is-admin? user) (when (is-admin? user)
(com/icon-button {:hx-delete (str (bidi/path-for ssr-routes/only-routes (com/icon-button {:hx-delete (str (bidi/path-for ssr-routes/only-routes
:company-reports-delete :company-reports-delete
:request-method :delete)) :request-method :delete))
:hx-target "closest tr"} :hx-target "closest tr"}
svg/trash))]) svg/trash))])
:headers [{:key "name" :headers [{:key "name"
:name "Name" :name "Name"
:sort-key "name" :sort-key "name"
:render :report/name} :render :report/name}
{:key "created-by" {:key "created-by"
:name "Created by" :name "Created by"
:sort-key "creator" :sort-key "creator"
:render (fn [report] :render (fn [report]
(when (:report/creator report) (when (:report/creator report)
(com/pill {:color :primary } (com/pill {:color :primary }
(:report/creator report))))} (:report/creator report))))}
{:key "created" {:key "created"
:name "Created" :name "Created"
:sort-key "created" :sort-key "created"
:render #(atime/unparse-local (:report/created %) :render #(atime/unparse-local (:report/created %)
atime/normal-date)}]}) atime/normal-date)}]}))
(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 (helper/table-route grid-page))
(def page (partial helper/page grid-page)) (def page (helper/page-route grid-page))
(defn delete-report [{:keys [form-params identity]}] (defn delete-report [{:keys [form-params identity]}]
@@ -76,7 +77,7 @@
:where [?i :report/key ?k]] :where [?i :report/key ?k]]
(dc/db conn) (dc/db conn)
(some-> (get form-params "id") not-empty Long/parseLong))) (some-> (get form-params "id") not-empty Long/parseLong)))
report (dc/pull (dc/db conn) r/default-read id-to-delete)] report (dc/pull (dc/db conn) r/default-read id-to-delete)]
(assert-can-see-client identity (:report/client report)) (assert-can-see-client identity (:report/client report))
(when id-to-delete (when id-to-delete
(s3/delete-object :bucket-name (:data-bucket env) (s3/delete-object :bucket-name (:data-bucket env)

157
src/clj/auto_ap/ssr/company/yodlee.clj
View File

@@ -1,21 +1,19 @@
(ns auto-ap.ssr.company.yodlee (ns auto-ap.ssr.company.yodlee
(:require (:require
[auto-ap.datomic :refer [conn]] [auto-ap.datomic :refer [conn pull-attr]]
[auto-ap.datomic.yodlee2 :as yodlee2] [auto-ap.datomic.yodlee2 :as yodlee2]
[auto-ap.graphql.utils :refer [is-admin?]] [auto-ap.graphql.utils :refer [is-admin?]]
[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.svg :as svg]
[auto-ap.ssr.ui :refer [base-page]]
[auto-ap.ssr.grid-page-helper :as helper] [auto-ap.ssr.grid-page-helper :as helper]
[auto-ap.ssr.svg :as svg]
[auto-ap.ssr.utils :refer [html-response]] [auto-ap.ssr.utils :refer [html-response]]
[auto-ap.time :as atime] [auto-ap.time :as atime]
[auto-ap.yodlee.core2 :as yodlee] [auto-ap.yodlee.core2 :as yodlee]
[bidi.bidi :as bidi] [bidi.bidi :as bidi]
[config.core :refer [env]] [config.core :refer [env]]
[datomic.api :as dc] [datomic.api :as dc]
[hiccup2.core :as hiccup] [hiccup2.core :as hiccup]))
[auto-ap.datomic :refer [pull-attr]]))
(def default-read '[:db/id (def default-read '[:db/id
:yodlee-provider-account/last-updated :yodlee-provider-account/last-updated
@@ -77,79 +75,88 @@ fastlink.open({fastLinkURL: '%s',
(pull-attr (dc/db conn) :yodlee-provider-account/id (Long/parseLong (get form-params "id")))))]] (pull-attr (dc/db conn) :yodlee-provider-account/id (Long/parseLong (get form-params "id")))))]]
[:div])))) [:div]))))
(def grid-page {:id "yodlee-table" (def grid-page
:nav (com/company-aside-nav) (helper/build
:id-fn :db/id {:id "yodlee-table"
:fetch-page (fn [user args] :nav (com/company-aside-nav)
(yodlee2/get-graphql :id-fn :db/id
{:client (:client args) :fetch-page (fn [request]
:clients (:clients args) (println (count (:clients request)))
:sort (:sort (:parsed-query-params args)) (yodlee2/get-graphql
:start (:start (:parsed-query-params args)) {:client (:client request)
:per-page (:per-page (:parsed-query-params args))})) :clients (:clients request)
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes :sort (:sort (:parsed-query-params request))
:company)} :start (:start (:parsed-query-params request))
"My Company"] :per-page (:per-page (:parsed-query-params request))}))
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"My Company"]
[:a {:href (bidi/path-for ssr-routes/only-routes [:a {:href (bidi/path-for ssr-routes/only-routes
:company-yodlee)} :company-yodlee)}
"Yodlee"]] "Yodlee"]]
:title "Yodlee Accounts" :title "Yodlee Accounts"
:entity-name "Yodlee accounts" :entity-name "Yodlee accounts"
:route :company-yodlee-table :route :company-yodlee-table
:action-buttons (fn [user _] :action-buttons (fn [request]
[(com/button {:color :primary [(com/button {:color :primary
:on-click "openFastlink()" :on-click "openFastlink()"
:hx-get (bidi/path-for ssr-routes/only-routes :hx-get (bidi/path-for ssr-routes/only-routes
:company-yodlee-fastlink-dialog) :company-yodlee-fastlink-dialog)
:hx-target "#modal-holder"} :hx-target "#modal-holder"}
(com/button-icon {} svg/refresh) (com/button-icon {} svg/refresh)
"Link new account")]) "Link new account")])
:row-buttons (fn [user e] :row-buttons (fn [request _]
[ [
(com/button {:hx-put (bidi/path-for ssr-routes/only-routes (com/button {:hx-put (bidi/path-for ssr-routes/only-routes
:company-yodlee-provider-account-reauthenticate) :company-yodlee-provider-account-reauthenticate)
:color :primary :color :primary
:hx-target "#modal-holder"} :hx-target "#modal-holder"}
"Reauthenticate") "Reauthenticate")
(when (is-admin? user) (when (is-admin? (:identity request))
(com/icon-button {:hx-put (bidi/path-for ssr-routes/only-routes (com/icon-button {:hx-put (bidi/path-for ssr-routes/only-routes
:company-yodlee-provider-account-refresh) :company-yodlee-provider-account-refresh)
:hx-target "closest tr"} :hx-target "closest tr"}
svg/refresh))]) svg/refresh))])
:headers [{:key "provider-account" :headers [{:key "client"
:name "Provider Account" :name "Client"
:sort-key "provider-account" :sort-key "client"
:render :yodlee-provider-account/id} :hide? (fn [args]
{:key "status" (= (count (:clients args)) 1))
:name "Status" :render #(-> % :yodlee-provider-account/client :client/code)}
:sort-key "status" {:key "provider-account"
:render #(when-let [status (:yodlee-provider-account/status %)] :name "Provider Account"
(com/pill {:color (if (not= status "SUCCESS") :sort-key "provider-account"
:yellow :render :yodlee-provider-account/id}
:primary) } {:key "status"
status))} :name "Status"
{:key "detailed-status" :sort-key "status"
:name "Detailed Status" :render #(when-let [status (:yodlee-provider-account/status %)]
:sort-key "detailed-status" (com/pill {:color (if (not= status "SUCCESS")
:render #(when-let [status (:yodlee-provider-account/detailed-status %)] :yellow
status)} :primary) }
status))}
{:key "detailed-status"
:name "Detailed Status"
:sort-key "detailed-status"
:render #(when-let [status (:yodlee-provider-account/detailed-status %)]
status)}
{:key "last-updated" {:key "last-updated"
:name "Last Updated" :name "Last Updated"
:sort-key "last-updated" :sort-key "last-updated"
:render #(atime/unparse-local (:yodlee-provider-account/last-updated %) :render #(atime/unparse-local (:yodlee-provider-account/last-updated %)
atime/normal-date)} atime/normal-date)}
{:key "accounts" {:key "accounts"
:name "Accounts" :name "Accounts"
:show-starting "md" :show-starting "md"
:render (fn [e] :render (fn [e]
[:ul [:ul
(for [a (:yodlee-provider-account/accounts e)] (for [a (:yodlee-provider-account/accounts e)]
[:li (:yodlee-account/name a) " - " (:yodlee-account/number a)])])}]}) [:li (:yodlee-account/name a) " - " (:yodlee-account/number a)])])}]}))
(def page (partial helper/page grid-page)) (def page (helper/page-route grid-page))
(def table (partial helper/table grid-page)) (def table (helper/table-route grid-page))
;; TODO delete-after-settle ;; TODO delete-after-settle
(defn refresh-provider-account [{:keys [form-params identity]}] (defn refresh-provider-account [{:keys [form-params identity]}]

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

@@ -12,6 +12,7 @@
(assoc :type "button") (assoc :type "button")
(update :class str " cursor-pointer flex items-center p-2 w-full text-xs text-gray-600 rounded-lg transition duration-75 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700") (update :class str " cursor-pointer flex items-center p-2 w-full text-xs text-gray-600 rounded-lg transition duration-75 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700")
(assoc :hx-indicator "find .htmx-indicator") (assoc :hx-indicator "find .htmx-indicator")
(assoc :hx-boost "true")
(assoc :hx-select "#app-contents") (assoc :hx-select "#app-contents")
(assoc :hx-target "#app-contents") (assoc :hx-target "#app-contents")
(assoc :hx-swap "outerHTML")) (assoc :hx-swap "outerHTML"))

10
src/clj/auto_ap/ssr/components/page.clj
View File

@@ -6,7 +6,10 @@
[auto-ap.ssr.svg :as svg])) [auto-ap.ssr.svg :as svg]))
(defn page- [{:keys [nav page-specific client client-selection identity app-params] :or {app-params {}}} & children] (defn page- [{:keys [nav page-specific client client-selection identity app-params] :or {app-params {}}} & children]
[:div#app [:div#app {"_" (hiccup/raw "
on notification put event.detail.value into #notification-details then add .htmx-added to #notification-holder then remove .hidden from #notification-holder then wait 30ms then remove .htmx-added from #notification-holder
on htmx:responseError put event.detail.xhr.response into #error-details then add .htmx-added to #error-holder then remove .hidden from #error-holder then wait 30ms then remove .htmx-added from #error-holder"
)}
(navbar- {:client-selection client-selection (navbar- {:client-selection client-selection
:client client :client client
:identity identity}) :identity identity})
@@ -14,10 +17,7 @@
(left-aside- {:nav nav (left-aside- {:nav nav
:page-specific page-specific}) :page-specific page-specific})
[:div#main-content {:class "relative w-full h-full lg:pl-64 overflow-y-auto px-4 bg-gray-100 dark:bg-gray-900 min-h-content " [:div#main-content {:class "relative w-full h-full lg:pl-64 overflow-y-auto px-4 bg-gray-100 dark:bg-gray-900 min-h-content "
"_" (hiccup/raw " }
on notification put event.detail.value into #notification-details then add .htmx-added to #notification-holder then remove .hidden from #notification-holder then wait 30ms then remove .htmx-added from #notification-holder
on htmx:responseError put event.detail.xhr.response into #error-details then add .htmx-added to #error-holder then remove .hidden from #error-holder then wait 30ms then remove .htmx-added from #error-holder"
)}
[:div#notification-holder.hidden [:div#notification-holder.hidden
[:div.fixed.top-0.right-0.left-0.z-30.mx-auto.max-w-screen-lg.w-screen-lg.my-0.pt-8.rounded-lg [:div.fixed.top-0.right-0.left-0.z-30.mx-auto.max-w-screen-lg.w-screen-lg.my-0.pt-8.rounded-lg
[:div.relative [:div.relative

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

@@ -1,17 +1,21 @@
(ns auto-ap.ssr.grid-page-helper (ns auto-ap.ssr.grid-page-helper
(:require (:require
[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-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.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]]
[auto-ap.time :as atime]
[malli.core :as m]
[bidi.bidi :as bidi] [bidi.bidi :as bidi]
[cemerick.url :as url] [cemerick.url :as url]
[clojure.string :as str] [clojure.string :as str]
[hiccup2.core :as hiccup] [hiccup2.core :as hiccup]
[clj-time.core :as time] [malli.transform :as mt2]))
[auto-ap.time :as atime]
[auto-ap.query-params :as query-params]))
(defn row* [gridspec user entity {:keys [flash? delete-after-settle? request] :as options}] (defn row* [gridspec user entity {:keys [flash? delete-after-settle? request] :as options}]
(let [cells (->> gridspec (let [cells (->> gridspec
@@ -125,23 +129,12 @@
(com/data-grid-header {}))}))) (com/data-grid-header {}))})))
(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))
"asc" "asc"
"desc"))) "desc")))
s))) s)))
(defn params->query-string [q]
(-> q
:parsed-query-params
(update :sort sort->query)
(url/map->query)))
(defn default-unparse-query-params [query-params] (defn default-unparse-query-params [query-params]
(reduce (reduce
(fn [query-params [k value]] (fn [query-params [k value]]
@@ -169,37 +162,6 @@
query-params query-params
query-params)) query-params))
(defn table [grid-spec {:keys [identity] :as request}]
(let [unparse-query-params (or (:unparse-query grid-spec)
default-unparse-query-params)]
(html-response (table*
grid-spec
identity
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 request)))))
(defn page [grid-spec {:keys [identity] :as 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 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] (defn default-parse-query-params [grid-spec]
(comp (comp
(query-params/apply-remove-sort) (query-params/apply-remove-sort)
@@ -211,3 +173,116 @@
(query-params/parse-key :start 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 :start-date query-params/parse-date)
(query-params/parse-key :end-date query-params/parse-date))) (query-params/parse-key :end-date query-params/parse-date)))
(defn wrap-trim-client-ids [handler]
(fn trim-client-ids [request]
(let [valid-clients (extract-client-ids (:clients request)
(:client request)
(:client-id (:parsed-query-params request))
(when (:client-code (:parsed-query-params request))
[:client/code (:client-code (:parsed-query-params request))]))
valid-clients (->> valid-clients
(take 20)
set)]
(handler (assoc request :trimmed-clients valid-clients)))))
(defn table-route [grid-spec]
(-> (fn table [{:keys [identity] :as request}]
(let [unparse-query-params (or (:unparse-query grid-spec)
default-unparse-query-params)]
(html-response (table*
grid-spec
identity
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 request)))))
(wrap-trim-client-ids)
(query-params/wrap-parse-query-params (or (:parse-query-params grid-spec)
(default-parse-query-params grid-spec)))
(wrap-secure)
(wrap-client-redirect-unauthenticated)))
(defn page-route [grid-spec ]
(-> (fn page [{:keys [identity] :as 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 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)))
(wrap-trim-client-ids)
(query-params/wrap-parse-query-params (or (:parse-query-params grid-spec)
(default-parse-query-params grid-spec)))
(wrap-secure)
(wrap-client-redirect-unauthenticated)))
(def request-spec (m/schema [:map]))
(def entity-spec (m/schema [:map]))
(def header-spec (m/schema [:map
[:key :string]
[:name :string]
[:sort-key {:optional true} :string]
[:render [:=> [:cat entity-spec] :any]]
[:hide? {:optional true} [:=> [:cat entity-spec] :boolean]]]))
(def grid-spec (m/schema [:map
[:id :string]
[:nav vector?]
[:page-specific-nav
{:optional true
:default (fn [request])}
[:maybe [:=>
[:cat request-spec]
vector?]]]
[:id-fn {:default :db/id
:optional true}
[:=>
[:cat map?]
nat-int?]]
[:fetch-page [:=>
[:cat request-spec]
[:cat [:vector entity-spec] :int]]]
[:parse-query-params
{:optional true}
[:=>
[:cat [:map-of :keyword :any]]
[:map-of :keyword :any]]]
[:oob-render
{:optional true
:default (fn [request])}
[:=>
[:cat request-spec]
vector?]]
[:breadcrumbs [:vector vector?]]
[:title :string]
[:entity-name :string]
[:route :keyword]
[:action-buttons
{:default (fn [request])
:optional true}
[:=>
[:cat request-spec]
[:maybe [:vector vector?]]]]
[:row-buttons
{:default (fn [request entity])
:optional true}
[:=>
[:cat request-spec entity-spec]
[:maybe [:vector vector?]]]]
[:headers [:vector header-spec]]]))
(defn build [grid-page]
(when-not (m/validate grid-spec grid-page)
(throw (ex-info "Could not validate grid"
(m/explain grid-spec grid-page))))
(m/decode grid-spec grid-page (mt2/default-value-transformer {::mt2/add-optional-keys true})))

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

@@ -8,10 +8,6 @@
merge-query merge-query
pull-many pull-many
query2]] 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-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]
@@ -19,7 +15,8 @@
[auto-ap.time :as atime] [auto-ap.time :as atime]
[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]
[malli.core :as m]))
;; always should be fast ;; always should be fast
@@ -42,17 +39,10 @@
(defn fetch-ids [db request] (defn fetch-ids [db request]
(let [query-params (:parsed-query-params request) (let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
query (cond-> {:query {:find [] 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 [(:trimmed-clients request)
(some-> (:start-date query-params) c/to-date) (some-> (:start-date query-params) c/to-date)
(some-> (:end-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] (:sort query-params) (add-sorter-fields {"client" ['[?e :cash-drawer-shift/client ?c]
@@ -93,64 +83,57 @@
[(->> (hydrate-results ids-to-retrieve db request)) [(->> (hydrate-results ids-to-retrieve db request))
matching-count])) matching-count]))
(def grid-page {:id "cash-drawer-shift-table" (def grid-page
:nav (com/main-aside-nav) (helper/build
:page-specific-nav filters {:id "cash-drawer-shift-table"
:id-fn :db/id :nav (com/main-aside-nav)
:fetch-page fetch-page :page-specific-nav filters
:oob-render :fetch-page fetch-page
(fn [request] :oob-render
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)]) (fn [request]
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes [(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:company)} :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
"POS"] :company)}
"POS"]
[:a {:href (bidi/path-for ssr-routes/only-routes
:pos-cash-drawer-shifts)}
"Cash Drawer Shifts"]]
:title "Cash drawer shifts"
:entity-name "Cash drawer shift"
:route :pos-cash-drawer-shift-table
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
(= (count (:clients args)) 1))
:render #(-> % :cash-drawer-shift/client :client/code)}
{:key "date"
:name "Date"
:sort-key "date"
:render #(atime/unparse-local (:cash-drawer-shift/date %) atime/standard-time)}
{:key "paid-in"
:name "Paid in"
:sort-key "paid-in"
:render #(some->> % :cash-drawer-shift/paid-in (format "$%.2f"))}
{:key "paid-out"
:name "Paid out"
:sort-key "paid-out"
:render #(some->> % :cash-drawer-shift/paid-out (format "$%.2f"))}
{:key "expected-cash"
:name "Expected cash"
:sort-key "expected-cash"
:render #(some->> % :cash-drawer-shift/expected-cash (format "$%.2f"))}
{:key "opened-cash"
:name "Opened cash"
:sort-key "opened-cash"
:render #(some->> % :cash-drawer-shift/opened-cash (format "$%.2f"))}
]}))
[:a {:href (bidi/path-for ssr-routes/only-routes
:pos-cash-drawer-shifts)}
"Cash Drawer Shifts"]]
:title "Cash drawer shifts"
:entity-name "Cash drawer shift"
:route :pos-cash-drawer-shift-table
:action-buttons (fn [request])
:row-buttons (fn [_ e])
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
(= (count (:clients args)) 1))
:render #(-> % :cash-drawer-shift/client :client/code)}
{:key "date"
:name "Date"
:sort-key "date"
:render #(atime/unparse-local (:cash-drawer-shift/date %) atime/standard-time)}
{:key "paid-in"
:name "Paid in"
:sort-key "paid-in"
:render #(some->> % :cash-drawer-shift/paid-in (format "$%.2f"))}
{:key "paid-out"
:name "Paid out"
:sort-key "paid-out"
:render #(some->> % :cash-drawer-shift/paid-out (format "$%.2f"))}
{:key "expected-cash"
:name "Expected cash"
:sort-key "expected-cash"
:render #(some->> % :cash-drawer-shift/expected-cash (format "$%.2f"))}
{:key "opened-cash"
:name "Opened cash"
:sort-key "opened-cash"
:render #(some->> % :cash-drawer-shift/opened-cash (format "$%.2f"))}
]})
(def row* (partial helper/row* grid-page)) (def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page)) (def table* (partial helper/table* grid-page))
(def table
(query-params/wrap-parse-query-params (partial helper/table grid-page)
(helper/default-parse-query-params grid-page))
)
(def page (query-params/wrap-parse-query-params (partial helper/page grid-page)
(helper/default-parse-query-params grid-page)))
(def key->handler (def key->handler
{:pos-cash-drawer-shifts (wrap-client-redirect-unauthenticated (wrap-secure page)) {:pos-cash-drawer-shifts (helper/page-route grid-page)
:pos-cash-drawer-shift-table (wrap-client-redirect-unauthenticated (wrap-secure table))}) :pos-cash-drawer-shift-table (helper/table-route grid-page)})

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

@@ -7,9 +7,6 @@
;; TODO make total fields take decimals ;; TODO make total fields take decimals
(defn date-range-field* [request] (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

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

@@ -21,7 +21,8 @@
[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]
[auto-ap.client-routes :as client-routes])) [auto-ap.client-routes :as client-routes]
[malli.core :as m]))
;; make params parsing composable ;; make params parsing composable
@@ -132,75 +133,65 @@
[(->> (hydrate-results ids-to-retrieve db args)) [(->> (hydrate-results ids-to-retrieve db args))
matching-count])) matching-count]))
(def grid-page {:id "expected-deposit-table" (def grid-page
:nav (com/main-aside-nav) (helper/build
:page-specific-nav filters {:id "expected-deposit-table"
:id-fn :db/id :nav (com/main-aside-nav)
:fetch-page fetch-page :page-specific-nav filters
:oob-render :fetch-page fetch-page
(fn [request] :parse-query-params (comp
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)]) (query-params/parse-key :total-gte query-params/parse-double)
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes (query-params/parse-key :total-lte query-params/parse-double)
:company)} (helper/default-parse-query-params grid-page))
"POS"] :oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"POS"]
[:a {:href (bidi/path-for ssr-routes/only-routes [:a {:href (bidi/path-for ssr-routes/only-routes
:pos-expected-deposits)} :pos-expected-deposits)}
"Expected deposits"]] "Expected deposits"]]
: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 [request] :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)} (when-let [transaction-id (-> e (:transaction/_expected-deposit) first :db/id)]
svg/external-link)) (com/a-button {:href (str (bidi/path-for client-routes/routes
(when-let [transaction-id (-> e (:transaction/_expected-deposit) first :db/id)] :transactions)
(com/a-button {:href (str (bidi/path-for client-routes/routes "?exact-match-id="
:transactions) transaction-id)} "Transaction"))])
"?exact-match-id=" :headers [{:key "client"
transaction-id)} "Transaction"))]) :name "Client"
:headers [{:key "client" :sort-key "client"
:name "Client" :hide? (fn [args]
:sort-key "client" (= (count (:clients args)) 1))
:hide? (fn [args] :render #(-> % :expected-deposit/client :client/code)}
(= (count (:clients args)) 1)) {:key "date"
:render #(-> % :expected-deposit/client :client/code)} :name "Date"
{:key "date" :sort-key "date"
:name "Date" :render #(atime/unparse-local (:expected-deposit/date %) atime/standard-time)}
:sort-key "date" {:key "sales-date"
:render #(atime/unparse-local (:expected-deposit/date %) atime/standard-time)} :name "Sales Date"
{:key "sales-date" :sort-key "sales-date"
:name "Sales Date" :render #(atime/unparse-local (:expected-deposit/sales-date %) atime/standard-time)}
:sort-key "sales-date" {:key "total"
:render #(atime/unparse-local (:expected-deposit/sales-date %) atime/standard-time)} :name "Total"
{:key "total" :sort-key "total"
:name "Total" :render #(some->> % :expected-deposit/total (format "$%.2f"))}
:sort-key "total" {:key "fee"
:render #(some->> % :expected-deposit/total (format "$%.2f"))} :name "Fee"
{:key "fee" :sort-key "fee"
:name "Fee" :render #(some->> % :expected-deposit/fee (format "$%.2f"))}]}))
:sort-key "fee"
:render #(some->> % :expected-deposit/fee (format "$%.2f"))}]})
(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)
(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 (helper/page-route grid-page)
:pos-expected-deposit-table (wrap-client-redirect-unauthenticated (wrap-secure table))}) :pos-expected-deposit-table (helper/table-route grid-page)})

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

@@ -21,7 +21,8 @@
[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])) [auto-ap.query-params :as query-params]
[malli.core :as m]))
;; TODO refunds ;; TODO refunds
;; always should be fast ;; always should be fast
@@ -48,17 +49,10 @@
(defn fetch-ids [db request] (defn fetch-ids [db request]
(let [query-params (:parsed-query-params request) (let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
query (cond-> {:query {:find [] 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 [(:trimmed-clients request)
(some-> query-params :start-date c/to-date) (some-> query-params :start-date c/to-date)
(some-> query-params :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]
@@ -109,64 +103,54 @@
[(->> (hydrate-results ids-to-retrieve db request)) [(->> (hydrate-results ids-to-retrieve db request))
matching-count])) matching-count]))
(def grid-page {:id "refund-table" (def grid-page
:nav (com/main-aside-nav) (helper/build {:id "refund-table"
:page-specific-nav filters :nav (com/main-aside-nav)
:id-fn :db/id :page-specific-nav filters
:fetch-page fetch-page :fetch-page fetch-page
:oob-render :parse-query-params (comp
(fn [request] (query-params/parse-key :total-gte query-params/parse-double)
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)]) (query-params/parse-key :total-lte query-params/parse-double)
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes (helper/default-parse-query-params grid-page))
:company)} :oob-render
"POS"] (fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"POS"]
[:a {:href (bidi/path-for ssr-routes/only-routes [:a {:href (bidi/path-for ssr-routes/only-routes
:pos-refunds)} :pos-refunds)}
"Refunds"]] "Refunds"]]
:title "Refunds" :title "Refunds"
:entity-name "Refund" :entity-name "Refund"
:route :pos-refund-table :route :pos-refund-table
:action-buttons (fn [request]) :headers [{:key "client"
:row-buttons (fn [request _]) :name "Client"
:headers [{:key "client" :sort-key "client"
:name "Client" :hide? (fn [args]
:sort-key "client" (= (count (:clients args)) 1))
:hide? (fn [args] :render #(-> % :sales-refund/client :client/code)}
(= (count (:clients args)) 1)) {:key "date"
:render #(-> % :sales-refund/client :client/code)} :name "Date"
{:key "date" :sort-key "date"
:name "Date" :render #(atime/unparse-local (:sales-refund/date %) atime/standard-time)}
:sort-key "date" {:key "total"
:render #(atime/unparse-local (:sales-refund/date %) atime/standard-time)} :name "Total"
{:key "total" :sort-key "total"
:name "Total" :render #(some->> % :sales-refund/total (format "$%.2f"))}
:sort-key "total" {:key "type"
:render #(some->> % :sales-refund/total (format "$%.2f"))} :name "Type"
{:key "type" :sort-key "type"
:name "Type" :render :sales-refund/type}
:sort-key "type" {:key "fee"
:render :sales-refund/type} :name "Fee"
{:key "fee" :sort-key "fee"
:name "Fee" :render #(some->> % :sales-refund/fee (format "$%.2f"))}]}))
:sort-key "fee"
:render #(some->> % :sales-refund/fee (format "$%.2f"))}]})
(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)
(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 (helper/page-route grid-page)
:pos-refund-table (wrap-client-redirect-unauthenticated (wrap-secure table))}) :pos-refund-table (helper/table-route grid-page)})

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

@@ -22,12 +22,8 @@
[auto-ap.time :as atime] [auto-ap.time :as atime]
[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]
[malli.core :as m]))
;; TODO incorporate parsing into spec
;; TODO incorporate permissions into spec
;; TODO incorporate limiting clients into spec
(defn filters [request] (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"
@@ -98,18 +94,10 @@
(defn fetch-ids [db request] (defn fetch-ids [db request]
(let [query-params (:parsed-query-params 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 [] query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]] :in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]} :where '[[(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients :args [db [(:trimmed-clients request)
(some-> (:start-date query-params) c/to-date) (some-> (:start-date query-params) c/to-date)
(some-> (:end-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] (:sort query-params) (add-sorter-fields {"client" ['[?e :sales-order/client ?c]
@@ -182,103 +170,93 @@
matching-count])) matching-count]))
(def grid-page {:id "sales-table" (def grid-page
:nav (com/main-aside-nav) (helper/build
:page-specific-nav filters {:id "sales-table"
:id-fn :db/id :nav (com/main-aside-nav)
:fetch-page fetch-page :page-specific-nav filters
:oob-render :fetch-page fetch-page
(fn [request] :parse-query-params (comp
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)]) (query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes (query-params/parse-key :total-gte query-params/parse-double)
:company)} (query-params/parse-key :total-lte query-params/parse-double)
"POS"] (helper/default-parse-query-params grid-page))
:oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"POS"]
[:a {:href (bidi/path-for ssr-routes/only-routes
:pos-sales)}
"Sales"]]
:title "Sales orders"
:entity-name "Sales orders"
:route :pos-sales-table
:action-buttons (fn [request]
(let [{:keys [total tax]} (d-sales/summarize-orders (:ids (fetch-ids (dc/db conn) request)))]
(when (and total tax)
[
(com/pill {:color :primary}
(format "Total $%.2f" total)
)
(com/pill {:color :secondary}
(format "Tax $%.2f" tax )
)])))
:row-buttons (fn [_ e]
(when (:sales-order/reference-link e)
[(com/a-icon-button {:href (:sales-order/reference-link e)}
svg/external-link)]))
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
(= (count (:clients args)) 1))
:render #(-> % :sales-order/client :client/code)}
{:key "date"
:name "Date"
:sort-key "date"
:render #(atime/unparse-local (:sales-order/date %) atime/standard-time)}
{:key "source"
:name "Source"
:sort-key "source"
:render (fn [sales-order]
(when (:sales-order/source sales-order)
(com/pill {:color :primary }
(:sales-order/source sales-order))))}
{:key "total"
:name "Total"
:sort-key "total"
:render #(some->> % :sales-order/total (format "$%.2f"))}
{:key "tax"
:name "Tax"
:sort-key "tax"
:render #(some->> % :sales-order/tax (format "$%.2f"))}
{:key "tip"
:name "Tip"
:sort-key "tip"
:render #(some->> % :sales-order/tip (format "$%.2f"))}
{:key "Payment methods"
:name "Payment Methods"
:render (fn [sales-order]
[:div.flex.space-x-2
(for [payment-method (->> sales-order :sales-order/charges (map :charge/type-name) set)]
(com/pill {:color :primary }
(condp = payment-method
"CASH" "cash"
"" nil
"ALL" nil
"CARD" "card"
"SQUARE_GIFT_CARD" "gift card"
"OTHER" "other"
nil)))])}]}
))
[:a {:href (bidi/path-for ssr-routes/only-routes
:pos-sales)}
"Sales"]]
:title "Sales orders"
:entity-name "Sales orders"
:route :pos-sales-table
:action-buttons (fn [request]
(let [{:keys [total tax]} (d-sales/summarize-orders (:ids (fetch-ids (dc/db conn) request)))]
(when (and total tax)
[
(com/pill {:color :primary}
(format "Total $%.2f" total)
)
(com/pill {:color :secondary}
(format "Tax $%.2f" tax )
)])))
:row-buttons (fn [_ e]
(when (:sales-order/reference-link e)
[(com/a-icon-button {:href (:sales-order/reference-link e)}
svg/external-link)]))
:headers [
{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
(= (count (:clients args)) 1))
:render #(-> % :sales-order/client :client/code)}
{:key "date"
:name "Date"
:sort-key "date"
:render #(atime/unparse-local (:sales-order/date %) atime/standard-time)}
{:key "source"
:name "Source"
:sort-key "source"
:render (fn [sales-order]
(when (:sales-order/source sales-order)
(com/pill {:color :primary }
(:sales-order/source sales-order))))}
{:key "total"
:name "Total"
:sort-key "total"
:render #(some->> % :sales-order/total (format "$%.2f"))}
{:key "tax"
:name "Tax"
:sort-key "tax"
:render #(some->> % :sales-order/tax (format "$%.2f"))}
{:key "tip"
:name "Tip"
:sort-key "tip"
:render #(some->> % :sales-order/tip (format "$%.2f"))}
{:key "Payment methods"
:name "Payment Methods"
:render (fn [sales-order]
[:div.flex.space-x-2
(for [payment-method (->> sales-order :sales-order/charges (map :charge/type-name) set)]
(com/pill {:color :primary }
(condp = payment-method
"CASH" "cash"
"" nil
"ALL" nil
"CARD" "card"
"SQUARE_GIFT_CARD" "gift card"
"OTHER" "other"
nil)))])}]})
(def row* (partial helper/row* grid-page)) (def 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)
(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 (helper/page-route grid-page)
:pos-sales-table (wrap-client-redirect-unauthenticated (wrap-secure table))}) :pos-sales-table (helper/table-route grid-page)})

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

@@ -8,19 +8,19 @@
merge-query merge-query
pull-many pull-many
query2]] 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.pos.common :refer [date-range-field* processor-field* total-field*]]
[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* 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] [clj-time.coerce :as c]
[datomic.api :as dc] [datomic.api :as dc]
[auto-ap.query-params :as query-params])) [malli.core :as m]
[malli.transform :as mt2]))
;; always should be fast ;; always should be fast
@@ -48,19 +48,10 @@
(defn fetch-ids [db request] (defn fetch-ids [db request]
(let [query-params (:parsed-query-params request) (let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
processor (some-> query-params :processor (#(keyword "ccp-processor" (name %)))) ; TODO parse
query (cond-> {:query {:find [] 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 [(:trimmed-clients request)
(some-> (:start-date query-params) c/to-date) (some-> (:start-date query-params) c/to-date)
(some-> (:end-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] (:sort query-params) (add-sorter-fields {"client" ['[?e :charge/client ?c]
@@ -90,10 +81,10 @@
'[(<= ?a ?total-lte)]]} '[(<= ?a ?total-lte)]]}
:args [(:total-lte query-params)]}) :args [(:total-lte query-params)]})
processor (:processor query-params)
(merge-query {:query {:in '[?processor] (merge-query {:query {:in '[?processor]
:where ['[?e :charge/processor ?processor]]} :where ['[?e :charge/processor ?processor]]}
:args [processor]}) :args [(:processor query-params)]})
true true
@@ -118,81 +109,73 @@
[(->> (hydrate-results ids-to-retrieve db request)) [(->> (hydrate-results ids-to-retrieve db request))
matching-count])) matching-count]))
(def grid-page {:id "tender-table" (def grid-page
:nav (com/main-aside-nav) (helper/build
:page-specific-nav filters {:id "tender-table"
:id-fn :db/id :nav (com/main-aside-nav)
:fetch-page fetch-page :page-specific-nav filters
:oob-render :fetch-page fetch-page
(fn [request] :parse-query-params (comp
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)]) (query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes (query-params/parse-key :total-gte query-params/parse-double)
:company)} (query-params/parse-key :total-lte query-params/parse-double)
"POS"] (helper/default-parse-query-params grid-page))
:oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"POS"]
[:a {:href (bidi/path-for ssr-routes/only-routes
:pos-tenders)}
"Tenders"]]
:title "Tenders"
:entity-name "Tender"
:route :pos-tender-table
:row-buttons (fn [request e]
(when (:charge/reference-link e)
[(com/a-icon-button {:href (:charge/reference-link e)}
svg/external-link)]))
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [request]
(= (count (:clients request)) 1))
:render #(-> % :charge/client :client/code)}
{:key "date"
:name "Date"
:sort-key "date"
:render #(atime/unparse-local (:charge/date %) atime/standard-time)}
{:key "total"
:name "Total"
:sort-key "total"
:render #(some->> % :charge/total (format "$%.2f"))}
{:key "processor"
:name "Processor"
:sort-key "processor"
:render (fn [sales-order]
(when (:charge/processor sales-order)
(com/pill {:color :primary }
(name (:charge/processor sales-order)))))}
{:key "tip"
:name "Tip"
:sort-key "tip"
:render #(some->> % :charge/tip (format "$%.2f"))}
{:key "links"
:name "Links"
:render (fn [entity]
(when-let [expected-deposit-id (some->> entity :expected-deposit/_charges first :db/id)]
[:a {:href (str (bidi/path-for ssr-routes/only-routes
:pos-expected-deposits)
"?exact-match-id=" expected-deposit-id)
:hx-boost "true"}
(com/pill {:color :secondary} "expected deposit")]))}]}))
[:a {:href (bidi/path-for ssr-routes/only-routes
:pos-tenders)}
"Tenders"]]
:title "Tenders"
:entity-name "Tender"
:route :pos-tender-table
:action-buttons (fn [request])
:row-buttons (fn [request e]
(when (:charge/reference-link e)
[(com/a-icon-button {:href (:charge/reference-link e)}
svg/external-link)]))
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [request]
(= (count (:clients request)) 1))
:render #(-> % :charge/client :client/code)}
{:key "date"
:name "Date"
:sort-key "date"
:render #(atime/unparse-local (:charge/date %) atime/standard-time)}
{:key "total"
:name "Total"
:sort-key "total"
:render #(some->> % :charge/total (format "$%.2f"))}
{:key "processor"
:name "Processor"
:sort-key "processor"
:render (fn [sales-order]
(when (:charge/processor sales-order)
(com/pill {:color :primary }
(name (:charge/processor sales-order)))))}
{:key "tip"
:name "Tip"
:sort-key "tip"
:render #(some->> % :charge/tip (format "$%.2f"))}
{:key "links"
:name "Links"
:render (fn [entity]
(when-let [expected-deposit-id (some->> entity :expected-deposit/_charges first :db/id)]
[:a {:href (str (bidi/path-for ssr-routes/only-routes
:pos-expected-deposits)
"?exact-match-id=" expected-deposit-id)
:hx-boost "true"}
(com/pill {:color :secondary} "expected deposit")]))}]})
(def row* (partial helper/row* grid-page)) (def 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)
(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 (helper/page-route grid-page)
:pos-tender-table (wrap-client-redirect-unauthenticated (wrap-secure table))}) :pos-tender-table (helper/table-route grid-page)})