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

Now overrides actually make an impact

Browse Source
This commit is contained in:
Bryce Covert
2020-04-19 17:02:05 -07:00
parent a48ee8dd52
commit 47babdfe7c
10 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,10 +131,18 @@
(re-frame/reg-sub
::vendor-default-account
(fn [db [_ v]]
(let [i (if (:default-account v)
(-> v :default-account :id)
(-> (:vendors db) (get v) :default-account :id))]
(fn [db [_ v client]]
(let [vendor (if (:default-account v)
v
(-> (:vendors db) (get v)))
client-override (->> (:account-overrides vendor)
(filter #(= (:id (:client %)) (:id client))
)
first
:account
:id)
default-id (:id (:default-account v))
i (or client-override default-id)]
(first (filter
#(= (:id %) i)
(:accounts db))))))

3
src/cljs/auto_ap/views/components/invoice_table.cljs
View File

@@ -173,8 +173,6 @@
[:td.has-text-right (nf total )]
[:td.has-text-right (nf outstanding-balance )]
[:td.expandable
[:div.buttons
(when (seq expense-accounts)
[drop-down {:id [::expense-accounts id ]
@@ -182,7 +180,6 @@
:aria-haspopup true
:on-click (dispatch-event [::events/toggle-menu [::expense-accounts id]])
:tab-index "0"
} "Accounts"]}
[drop-down-contents
[:div

5
src/cljs/auto_ap/views/pages/admin/rules/form.cljs
View File

@@ -160,10 +160,9 @@
(fn [data field value]
(cond (and (= [:vendor] field)
value
(doto (expense-accounts-field/can-replace-with-default? (:accounts data))
println))
(expense-accounts-field/can-replace-with-default? (:accounts data)))
[[:accounts] (expense-accounts-field/default-account (:accounts data)
@(re-frame/subscribe [::subs/vendor-default-account value])
@(re-frame/subscribe [::subs/vendor-default-account value (:client data)])
(:total data)
[])]

3
src/cljs/auto_ap/views/pages/import_invoices.cljs
View File

@@ -91,7 +91,8 @@
(re-frame/reg-event-db
::errored
(fn [db [_ error]]
(assoc db ::error (:message (edn/read-string error)))))
(assoc db ::error (or (:message (edn/read-string error))
"An unknown error has occured."))))
(re-frame/reg-event-fx
::reject-invoices-clicked

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

@@ -142,7 +142,7 @@
value
(expense-accounts-field/can-replace-with-default? (:expense-accounts data)))
[[:expense-accounts] (expense-accounts-field/default-account (:expense-accounts data)
@(re-frame/subscribe [::subs/vendor-default-account value])
@(re-frame/subscribe [::subs/vendor-default-account value (:client data)])
(:total data)
locations)]

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

@@ -69,7 +69,7 @@
value
(expense-accounts-field/can-replace-with-default? (:accounts data)))
[[:accounts] (expense-accounts-field/default-account (:accounts data)
@(re-frame/subscribe [::subs/vendor-default-account value])
@(re-frame/subscribe [::subs/vendor-default-account value (:client data)])
(:amount data)
locations)]
[])))))