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

tons of bug fixes

Browse Source
This commit is contained in:
Bryce Covert
2020-07-08 21:44:11 -07:00
parent 86f51f93e4
commit d120b7e810
18 changed files with 442 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/cljs/auto_ap/views/pages/transactions/form.cljs
View File

@@ -216,22 +216,23 @@
:field [:description-original]
:disabled "disabled"}]]
(when (and (seq (:potential-transaction-rule-matches data))
(not (:matched-rule data))
(not (:payment data))
is-admin?)
(cond
(and (seq (:potential-transaction-rule-matches data))
(not (:matched-rule data))
(not (:payment data))
is-admin?)
[potential-transaction-rule-matches-box {:potential-transaction-rule-matches (:potential-transaction-rule-matches data)
:edit-completed edit-completed}])
:edit-completed edit-completed}]
(when (and (seq (:potential-payment-matches data))
(not (:payment data))
is-admin?)
(and (seq (:potential-payment-matches data))
(not (:payment data))
is-admin?)
[potential-payment-matches-box {:potential-payment-matches (:potential-payment-matches data)
:edit-completed edit-completed}])
:edit-completed edit-completed}]
(when (and (not (seq (:potential-payment-matches data)))
(not (seq (:potential-transaction-rule-matches data))))
(and (not (seq (:potential-payment-matches data)))
(not (seq (:potential-transaction-rule-matches data))))
[:div
[field "Vendor"
[typeahead-entity {:matches @(re-frame/subscribe [::subs/vendors])
@@ -274,4 +275,30 @@
[error-notification]
(when-not should-disable-for-client?
[submit-button "Save"])])])])
[submit-button "Save"])]
:else
[:div
[field "Approval Status"
[button-radio
{:type "button-radio"
:field [:approval-status]
:options [[:unapproved "Unapproved"]
[:requires-feedback "Client Review"]
[:approved "Approved"]
[:excluded "Excluded from Ledger"]]
:disabled should-disable-for-client?}]]
[field "Forecasted-transaction"
[typeahead-entity {:matches (doto @(re-frame/subscribe [::subs/forecasted-transactions-for-client (:id (:client data))]) println)
:match->text :identifier
:type "typeahead-entity"
:field [:forecast-match]}]]
[:hr]
[error-notification]
(when-not should-disable-for-client?
[submit-button "Save"])]
)])])