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

This commit is contained in:
Bryce Covert
2018-08-02 07:32:48 -07:00
8 changed files with 40 additions and 17 deletions

View File

@@ -169,7 +169,7 @@
:aria-haspopup true
:tab-index "0"
:on-blur (delayed-dispatch [::toggle-expense-accounts id])
#_#_:on-blur (delayed-dispatch [::toggle-expense-accounts id])
:on-focus (dispatch-event [::toggle-expense-accounts id])
} "Accounts"]]
[:div.dropdown-menu {:role "menu"}

View File

@@ -344,7 +344,7 @@
(re-frame/reg-event-fx
::invoice-create-failed
(fn [{:keys [db]} [_ data]]
{:dispatch [::events/modal-failed ::new-invoice "That invoice already exists."]}))
{:dispatch [::events/modal-failed ::new-invoice (:message data)]}))
(re-frame/reg-event-fx
::invoice-created
@@ -531,6 +531,14 @@
(when shown?
[modal {:title "Print Checks"
:foot [:button.button.is-primary {:on-click (dispatch-event [::advanced-print-checks-submitted])
:disabled (cond printing?
"disabled"
(seq (filter #(> (js/parseFloat (:amount %)) (js/parseFloat (:outstanding-balance %))) invoices))
"disabled"
:else
"")
:class (if printing? "is-loading" "")}
[:span "Print"]]
:hide-event [::cancel-advanced-print]}