merged
This commit is contained in:
@@ -132,12 +132,12 @@
|
||||
|
||||
(def grid-page
|
||||
(helper/build {:id "entity-table"
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
:parse-query-params (comp
|
||||
(query-params/parse-key :code query-params/parse-long)
|
||||
(helper/default-parse-query-params grid-page))
|
||||
(query-params/parse-key :code query-params/parse-long)
|
||||
(helper/default-parse-query-params grid-page))
|
||||
:action-buttons (fn [_]
|
||||
[(com/button {:hx-get (str (bidi/path-for ssr-routes/only-routes
|
||||
:admin-account-new-dialog))
|
||||
@@ -145,8 +145,8 @@
|
||||
"New Account")])
|
||||
:row-buttons (fn [_ entity]
|
||||
[(com/icon-button {:hx-get (str (bidi/path-for ssr-routes/only-routes
|
||||
:admin-account-edit-dialog
|
||||
:db/id (:db/id entity)))}
|
||||
:admin-account-edit-dialog
|
||||
:db/id (:db/id entity)))}
|
||||
svg/pencil)])
|
||||
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:admin)}
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
(def grid-page
|
||||
(helper/build {:id "job-table"
|
||||
:id-fn :arn
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:fetch-page fetch-page
|
||||
:action-buttons (fn [request]
|
||||
[(com/button {:hx-get (str (bidi/path-for ssr-routes/only-routes :admin-job-start-dialog))
|
||||
@@ -118,8 +118,8 @@
|
||||
(when (and (:start-date e)
|
||||
(:end-date e))
|
||||
(str (time/in-minutes (time/interval
|
||||
(:start-date e)
|
||||
(:end-date e))) " minutes")))}
|
||||
(:start-date e)
|
||||
(:end-date e))) " minutes")))}
|
||||
{:key "name"
|
||||
:name "Name"
|
||||
:render :name}
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
|
||||
(def grid-page
|
||||
(helper/build {:id "entity-table"
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
:parse-query-params (helper/default-parse-query-params grid-page)
|
||||
@@ -1352,14 +1352,16 @@
|
||||
:validation-route ::route/navigate))
|
||||
mm/Initializable
|
||||
(init-step-params
|
||||
[_ request]
|
||||
[_ multi-form-state request]
|
||||
(let [bank-account-type (get-in request [:query-params :bank-account-type])]
|
||||
(cond->
|
||||
{:db/id (str (java.util.UUID/randomUUID))
|
||||
:new? true}
|
||||
(if (= {} (:step-params multi-form-state))
|
||||
(cond->
|
||||
{:db/id (str (java.util.UUID/randomUUID))
|
||||
:new? true}
|
||||
|
||||
bank-account-type (assoc :bank-account/type (keyword "bank-account-type" bank-account-type)
|
||||
:bank-account/visible true))))
|
||||
bank-account-type (assoc :bank-account/type (keyword "bank-account-type" bank-account-type)
|
||||
:bank-account/visible true))
|
||||
(:step-params multi-form-state))))
|
||||
|
||||
mm/Discardable
|
||||
(can-discard? [_ step-params]
|
||||
|
||||
@@ -242,11 +242,12 @@
|
||||
(defn page [{:keys [form-params form-errors] :as request}]
|
||||
(base-page
|
||||
request
|
||||
(com/page {:nav (com/admin-aside-nav)
|
||||
(com/page {:nav com/admin-aside-nav
|
||||
:client-selection (:client-selection (:session request))
|
||||
:clients (:clients request)
|
||||
:client (:client request)
|
||||
:identity (:identity request)}
|
||||
:identity (:identity request)
|
||||
:request request}
|
||||
(com/breadcrumbs {} [:a {:href (bidi/path-for ssr-routes/only-routes ::route/page)}
|
||||
"Admin"])
|
||||
[:div.flex.space-x-4
|
||||
|
||||
@@ -165,10 +165,11 @@
|
||||
(let [entity-id (or (some-> query-params (get "entity-id") Long/parseLong)
|
||||
(some-> route-params (get :entity-id) Long/parseLong))]
|
||||
(base-page request
|
||||
(com/page {:nav (com/admin-aside-nav)
|
||||
(com/page {:nav com/admin-aside-nav
|
||||
:client-selection (:client-selection (:session request))
|
||||
:client (:client request)
|
||||
:identity (:identity request)
|
||||
:request request
|
||||
:app-params {:hx-get (bidi/path-for ssr-routes/only-routes
|
||||
:admin-history)
|
||||
:hx-trigger "clientSelected from:body"
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
(def grid-page
|
||||
(helper/build {:id "entity-table"
|
||||
:id-fn :db/id
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:fetch-page fetch-page
|
||||
:page-specific-nav filters
|
||||
:row-buttons (fn [_ entity]
|
||||
@@ -138,7 +138,7 @@
|
||||
:end (:end-date (:parsed-query-params request))}
|
||||
:id "date-range"}) [1 :hx-swap-oob] true)])
|
||||
:parse-query-params (comp
|
||||
(helper/default-parse-query-params grid-page))
|
||||
(helper/default-parse-query-params grid-page))
|
||||
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
|
||||
:admin)}
|
||||
"Admin"]
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
(def grid-page
|
||||
(helper/build {:id "entity-table"
|
||||
:id-fn :db/id
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:fetch-page fetch-page
|
||||
:page-specific-nav filters
|
||||
:row-buttons (fn [_ entity]
|
||||
@@ -162,9 +162,9 @@
|
||||
(reduce + 0.0 (map :sales-summary-item/discount x)))
|
||||
(reduce + 0.0 (map :sales-summary-item/tax x))))])
|
||||
[:li "Sales subtotal: " (format "$%,.2f" (- (+ (reduce + 0.0 (map :sales-summary-item/total (:sales-summary/sales-items ss)))
|
||||
(reduce + 0.0 (map :sales-summary-item/discount (:sales-summary/sales-items ss))))
|
||||
(reduce + 0.0 (map :sales-summary-item/discount (:sales-summary/sales-items ss))))
|
||||
|
||||
(reduce + 0.0 (map :sales-summary-item/tax (:sales-summary/sales-items ss)))))]
|
||||
(reduce + 0.0 (map :sales-summary-item/tax (:sales-summary/sales-items ss)))))]
|
||||
[:li "Tax: " (format "$%,.2f" (:sales-summary/total-tax ss))]
|
||||
[:li "Tips: " (format "$%,.2f" (:sales-summary/total-tip ss))]
|
||||
[:li (com/pill {:color (if (dollars= total-debits total-credits)
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
|
||||
(def grid-page
|
||||
(helper/build {:id "entity-table"
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
:parse-query-params (comp
|
||||
@@ -470,6 +470,7 @@
|
||||
(com/validated-field
|
||||
{:errors (fc/field-errors)
|
||||
:x-data (hx/json {:location (fc/field-value)})}
|
||||
;; TODO make this thing into a component
|
||||
[:div {:hx-trigger "changed"
|
||||
:hx-target "next *"
|
||||
:hx-swap "outerHTML"
|
||||
@@ -815,7 +816,7 @@
|
||||
(fc/with-field :transaction-rule/transaction-approval-status
|
||||
(com/validated-field {:label "Approval status"
|
||||
:errors (fc/field-errors)}
|
||||
(com/radio {:options (ref->radio-options "transaction-approval-status")
|
||||
(com/radio-card {:options (ref->radio-options "transaction-approval-status")
|
||||
:value (fc/field-value)
|
||||
:name (fc/field-name)
|
||||
:size :small
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
:placeholder "Cash"
|
||||
:size :small}))
|
||||
(com/field {:label "Type"}
|
||||
(com/radio {:size :small
|
||||
(com/radio-card {:size :small
|
||||
:name "type"
|
||||
:value (:type (:parsed-query-params request))
|
||||
:options [{:value ""
|
||||
@@ -136,7 +136,7 @@
|
||||
|
||||
(def grid-page
|
||||
(helper/build {:id "entity-table"
|
||||
:nav (com/admin-aside-nav)
|
||||
:nav com/admin-aside-nav
|
||||
:page-specific-nav filters
|
||||
:fetch-page fetch-page
|
||||
:parse-query-params (comp
|
||||
|
||||
Reference in New Issue
Block a user