Bank balances are visible + import invoices should be open

This commit is contained in:
2021-01-29 07:35:05 -08:00
parent 0dd633c6bf
commit e920c48773
10 changed files with 123 additions and 15 deletions

View File

@@ -46,7 +46,8 @@
[:span {:class "icon icon-bin-2" :style {:font-size "25px"}}]
[:span {:class "name"} "Voided Invoices"]]]
(when (= "admin" (:user/role user))
(when (or (= "admin" (:user/role user))
(= "power-user" (:user/role user)))
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :import-invoices)
:class [(active-when ap = :import-invoices)]}

View File

@@ -16,4 +16,4 @@
:description_original
[:payment [:check_number :s3_url :id :date]]
[:client [:name :id]]
[:bank-account [:name :yodlee-account-id]]])
[:bank-account [:name :yodlee-account-id :current-balance]]])

View File

@@ -67,7 +67,9 @@
(defn table [{:keys [id data-page check-boxes?]}]
(let [selected-client @(re-frame/subscribe [::subs/client])
{:keys [data status params]} @(re-frame/subscribe [::data-page/page data-page])
states @(re-frame/subscribe [::status/multi ::edits])]
states @(re-frame/subscribe [::status/multi ::edits])
is-power-user? @(re-frame/subscribe [::subs/is-power-user?])
is-admin? @(re-frame/subscribe [::subs/is-admin?])]
[grid/grid {:data-page data-page
:column-count (if selected-client 6 7)
:check-boxes? check-boxes?}
@@ -92,7 +94,13 @@
[grid/cell {} (:name client)])
#_[:td description-original]
[grid/cell {} (:name bank-account )]
[grid/cell {}
(if (and (:current-balance bank-account)
(or is-power-user?
is-admin?))
[:span.has-tooltip-arrow.has-tooltip-right {:data-tooltip (str "Current Balance: " (nf (:current-balance bank-account) ))}
(:name bank-account ) ]
(:name bank-account ))]
[grid/cell {} (cond vendor
(:name vendor)
yodlee-merchant