Add vendor pre-population for bulk code and individual edit forms
- Add vendor-changed HTMX handlers for both bulk code and individual edit - Pre-populate default account at 100% when vendor is selected and no accounts exist - Fix render-accounts-section to render from step-params correctly - Change bulk code vendor-changed from hx-get to hx-post to include form data - Add routes for vendor-changed endpoints - Update e2e tests to cover vendor pre-population - Run lein cljfmt fix across codebase
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
"hx-indicator" "#tender-table"
|
||||
#_#_:hx-disabled-elt "find fieldset"}
|
||||
|
||||
[:fieldset.space-y-6
|
||||
[:fieldset.space-y-6
|
||||
(date-range-field* request)
|
||||
(processor-field* request)
|
||||
(total-field* request)]])
|
||||
@@ -79,13 +79,13 @@
|
||||
:where []}
|
||||
:args [(:exact-match-id query-params)]})
|
||||
|
||||
(:total-gte query-params)
|
||||
(:total-gte query-params)
|
||||
(merge-query {:query {:in ['?total-gte]
|
||||
:where ['[?e :charge/total ?a]
|
||||
'[(>= ?a ?total-gte)]]}
|
||||
:args [(:total-gte query-params)]})
|
||||
|
||||
(:total-lte query-params)
|
||||
(:total-lte query-params)
|
||||
(merge-query {:query {:in ['?total-lte]
|
||||
:where ['[?e :charge/total ?a]
|
||||
'[(<= ?a ?total-lte)]]}
|
||||
@@ -96,10 +96,9 @@
|
||||
:where ['[?e :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))))
|
||||
@@ -121,63 +120,62 @@
|
||||
|
||||
(def grid-page
|
||||
(helper/build
|
||||
{:id "tender-table"
|
||||
:nav com/main-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
:oob-render
|
||||
(fn [request]
|
||||
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
|
||||
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:company)}
|
||||
"POS"]
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-tenders)}
|
||||
"Tenders"]]
|
||||
:title "Tenders"
|
||||
:entity-name "Tender"
|
||||
:query-schema query-schema
|
||||
: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")]))}]}))
|
||||
{:id "tender-table"
|
||||
:nav com/main-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
:oob-render
|
||||
(fn [request]
|
||||
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
|
||||
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:company)}
|
||||
"POS"]
|
||||
|
||||
[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:pos-tenders)}
|
||||
"Tenders"]]
|
||||
:title "Tenders"
|
||||
:entity-name "Tender"
|
||||
:query-schema query-schema
|
||||
: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")]))}]}))
|
||||
|
||||
(def row* (partial helper/row* grid-page))
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
Reference in New Issue
Block a user