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

should fix the vendor issue

Browse Source
This commit is contained in:
Bryce Covert
2021-06-01 18:34:55 -07:00
parent 9e1cc4c6f9
commit 6f06892759
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cljs/auto_ap/subs.cljs
View File

@@ -253,7 +253,7 @@
first first
:account :account
:id) :id)
default-id (:id (:default-account v)) default-id (:id (:default-account vendor))
i (or client-override default-id)] i (or client-override default-id)]
(accounts i)))) (accounts i))))

21
src/cljs/auto_ap/views/pages/invoices/form.cljs
View File

@@ -177,6 +177,7 @@
(forms/change-handler ::form (forms/change-handler ::form
(fn [data field value] (fn [data field value]
(let [locations @(re-frame/subscribe [::subs/locations-for-client (:id (:client data))])] (let [locations @(re-frame/subscribe [::subs/locations-for-client (:id (:client data))])]
(cond (and (= [:vendor] field) (cond (and (= [:vendor] field)
value) value)
(let [schedule-payment-dom (get (by (comp :id :client ) :dom (:schedule-payment-dom value)) (let [schedule-payment-dom (get (by (comp :id :client ) :dom (:schedule-payment-dom value))
@@ -185,7 +186,7 @@
(expense-accounts-field/can-replace-with-default? (:expense-accounts data)) (expense-accounts-field/can-replace-with-default? (:expense-accounts data))
(into [[:expense-accounts] (expense-accounts-field/default-account (:expense-accounts data) (into [[:expense-accounts] (expense-accounts-field/default-account (:expense-accounts data)
@(re-frame/subscribe [::subs/vendor-default-account value (:client data)]) @(re-frame/subscribe [::subs/vendor-default-account (:id value) (:client data)])
(:total data) (:total data)
locations)]) locations)])
@@ -430,13 +431,17 @@
:spec ::invoice/total :spec ::invoice/total
:step "0.01"}]) :step "0.01"}])
(field nil (with-meta
[expense-accounts-field {:type "expense-accounts" (field nil
:descriptor "expense account" [expense-accounts-field {:type "expense-accounts"
:locations (:locations (:client data)) :descriptor "expense account"
:max (:total data) :locations (:locations (:client data))
:client (or (:client data) @(re-frame/subscribe [::subs/client])) :max (:total data)
:field [:expense-accounts]}]) :client (or (:client data) @(re-frame/subscribe [::subs/client]))
:field [:expense-accounts]}])
{:key (str (:id (:vendor data)))})