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

everything except actually matching.

Browse Source
This commit is contained in:
Bryce Covert
2019-04-24 07:50:40 -07:00
parent 9013f54f32
commit fd573633d2
2 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cljs/auto_ap/views/components/expense_accounts_field.cljs
View File

@@ -94,7 +94,7 @@
[:i "New " descriptor])]]
[:div.column.is-narrow
(when-not disabled
[:a.button {:on-click (dispatch-event [::remove-expense-account event expense-accounts id])} [:span.icon [:i.fa.fa-times]]])]]
[:a.delete {:on-click (dispatch-event [::remove-expense-account event expense-accounts id])}])]]
[:div.field
[:div.columns
[:div.column

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

@@ -150,14 +150,15 @@
:subscription data}]]]]
(if (seq (:potential-payment-matches data))
(if (and (seq (:potential-payment-matches data))
(not (:payment data)))
[:div.box
[:div.columns
[:div.column
[:h1.subtitle.is-5 "Potentially matching payments:"]]
[:div.column.is-narrow
[:a.button {:on-click (dispatch-event [::manual-match])} [:i.fa.fa-times]]]]
[:a.delete {:on-click (dispatch-event [::manual-match])} ]]]
[:table.table.compact.is-borderless
(list
@@ -194,33 +195,26 @@
:disabled (boolean (:payment data))
:locations locations
:event change-event
:subscription data}]]]])
:subscription data}]]]
[:div.field
[:div.control
[:label.checkbox
[bind-field
[:input.checkbox {:type "checkbox"
:field [:exclude-from-ledger]
:subscription data
:event change-event}
]]
" Exclude from ledger?"
]]]
[:div.field
[:p.help]
[:div.control
[:label.checkbox
[bind-field
[:input.checkbox {:type "checkbox"
:field [:exclude-from-ledger]
:subscription data
:event change-event}
]]
" Exclude from ledger?"
]]]
(comment
[:div.field
[:p.control
[:label.checkbox
[:input.checkbox {:type "checkbox"
:field [:always-map]
:subscription data}]
" Always match Merchant '" (:merchant-name data) "' to '" (:vendor-name data) "'" ]]])
(when error
^{:key error} [:div.notification.is-warning.animated.fadeInUp
error])
[:button.button.is-medium.is-primary.is-fullwidth {:disabled (if @(re-frame/subscribe [::can-submit])
""
"disabled")
:class (str @(re-frame/subscribe [::forms/loading-class ::edit-transaction])
(when error " animated shake"))} "Save"]])])
(when error
^{:key error} [:div.notification.is-warning.animated.fadeInUp
error])
[:button.button.is-medium.is-primary.is-fullwidth {:disabled (if @(re-frame/subscribe [::can-submit])
""
"disabled")
:class (str @(re-frame/subscribe [::forms/loading-class ::edit-transaction])
(when error " animated shake"))} "Save"]])])])