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

Merge branch 'master' of bitbucket.org:brycecovertoperations/integreat

Browse Source
This commit is contained in:
Bryce Covert
2019-10-04 22:10:00 -07:00
parent 4dba769f9b 032646f591
commit ad9db51695
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cljs/auto_ap/views/pages/checks.cljs
View File

@@ -183,7 +183,7 @@
"Status"]
[:th {:style {:width "10em"}} "" ]]]
[:th {:style {:width "8em"}} "" ]]]
[:tbody
(if (:loading @status)
[:tr
@@ -199,7 +199,10 @@
[:td (cond
(= :cash type) "Cash"
(= :debit type) "Debit"
:else check-number)]
:else (if s3-url
[:a {:href s3-url :target "_new"} [:a.button [:span.icon [:i.fa.fa-share-square-o]]
[:span (str " " check-number )]]]
check-number))]
[:td (date->str date) ]
[:td.has-text-right (nf amount )]
[:td status]
@@ -207,12 +210,7 @@
(when (or (= :pending status)
(and (#{":cash" ":debit" :cash :debit} type)
(not= :voided status)))
[:button.button.is-warning.is-outlined {:on-click (dispatch-event [::void-check i])} [:span [:span.icon [:i.fa.fa-minus-circle]]]])
(if s3-url
[:a.tag {:href s3-url :target "_new"} [:i.fa.fa-money-check] [:span.icon [:i.fa.fa-money]] (str " " check-number " (" (gstring/format "$%.2f" amount ) ")")]
[:span.tag [:i.fa.fa-money-check] [:span.icon [:i.fa.fa-money]] (str " " check-number " (" (gstring/format "$%.2f" amount ) ")")])
]
]))]]]))))
[:button.button.is-warning.is-outlined {:on-click (dispatch-event [::void-check i])} [:span [:span.icon [:i.fa.fa-minus-circle]]]])]]))]]]))))
(def checks-content

3
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -955,7 +955,8 @@
")"))
[:span " "]
[:span.icon.is-small [:i.fa.fa-angle-down {:aria-hidden "true"}]]]
:id ::print-checks}
:id ::print-checks
:is-right? true}
[:div
(list
(for [{:keys [id number name type]} (->> (:bank-accounts current-client) (filter :visible) (sort-by :sort-order))]