notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 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])]] [: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

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

@@ -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,33 +195,26 @@
: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
[:div.control [:p.help]
[:label.checkbox [:div.control
[bind-field [:label.checkbox
[:input.checkbox {:type "checkbox" [bind-field
:field [:exclude-from-ledger] [:input.checkbox {:type "checkbox"
:subscription data :field [:exclude-from-ledger]
:event change-event} :subscription data
]] :event change-event}
" Exclude from ledger?" ]]
]]] " Exclude from ledger?"
]]]
(comment (when error
[:div.field ^{:key error} [:div.notification.is-warning.animated.fadeInUp
[:p.control error])
[:label.checkbox [:button.button.is-medium.is-primary.is-fullwidth {:disabled (if @(re-frame/subscribe [::can-submit])
[:input.checkbox {:type "checkbox" ""
:field [:always-map] "disabled")
:subscription data}] :class (str @(re-frame/subscribe [::forms/loading-class ::edit-transaction])
" Always match Merchant '" (:merchant-name data) "' to '" (:vendor-name data) "'" ]]]) (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"]])])