everything except actually matching.
This commit is contained in:
@@ -94,7 +94,7 @@
|
|||||||
[:i "New " descriptor])]]
|
[:i "New " descriptor])]]
|
||||||
[:div.column.is-narrow
|
[:div.column.is-narrow
|
||||||
(when-not disabled
|
(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.field
|
||||||
[:div.columns
|
[:div.columns
|
||||||
[:div.column
|
[:div.column
|
||||||
|
|||||||
@@ -150,14 +150,15 @@
|
|||||||
:subscription data}]]]]
|
:subscription data}]]]]
|
||||||
|
|
||||||
|
|
||||||
(if (seq (:potential-payment-matches data))
|
(if (and (seq (:potential-payment-matches data))
|
||||||
|
(not (:payment data)))
|
||||||
|
|
||||||
[:div.box
|
[:div.box
|
||||||
[:div.columns
|
[:div.columns
|
||||||
[:div.column
|
[:div.column
|
||||||
[:h1.subtitle.is-5 "Potentially matching payments:"]]
|
[:h1.subtitle.is-5 "Potentially matching payments:"]]
|
||||||
[:div.column.is-narrow
|
[: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
|
[:table.table.compact.is-borderless
|
||||||
(list
|
(list
|
||||||
@@ -194,9 +195,10 @@
|
|||||||
:disabled (boolean (:payment data))
|
:disabled (boolean (:payment data))
|
||||||
:locations locations
|
:locations locations
|
||||||
:event change-event
|
:event change-event
|
||||||
:subscription data}]]]])
|
:subscription data}]]]
|
||||||
|
|
||||||
[:div.field
|
[:div.field
|
||||||
|
[:p.help]
|
||||||
[:div.control
|
[:div.control
|
||||||
[:label.checkbox
|
[:label.checkbox
|
||||||
[bind-field
|
[bind-field
|
||||||
@@ -208,14 +210,6 @@
|
|||||||
" Exclude from ledger?"
|
" 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
|
(when error
|
||||||
^{:key error} [:div.notification.is-warning.animated.fadeInUp
|
^{:key error} [:div.notification.is-warning.animated.fadeInUp
|
||||||
error])
|
error])
|
||||||
@@ -223,4 +217,4 @@
|
|||||||
""
|
""
|
||||||
"disabled")
|
"disabled")
|
||||||
:class (str @(re-frame/subscribe [::forms/loading-class ::edit-transaction])
|
:class (str @(re-frame/subscribe [::forms/loading-class ::edit-transaction])
|
||||||
(when error " animated shake"))} "Save"]])])
|
(when error " animated shake"))} "Save"]])])])
|
||||||
|
|||||||
Reference in New Issue
Block a user