huge number of changes to start making all usages of expense accounts dynamic.

This commit is contained in:
Bryce Covert
2019-04-12 15:39:32 -07:00
parent e64820d71a
commit b6e73f0bfb
21 changed files with 103 additions and 181 deletions

View File

@@ -32,9 +32,9 @@
[:client [:id :name :locations]]
[:payments [:amount [:payment [:amount :s3_url :check_number ]]]]
[:vendor [:id :name]]
[:expense_accounts [:amount :id :expense_account_id
[:expense_accounts [:amount :id
:location
[:expense_account [:id :name [:parent [:id :name]]]]]]])
[:account [:id :numeric-code :name :location]]]]])
(defn does-amount-exceed-outstanding? [amount outstanding-balance]
(let [amount (js/parseFloat amount)
@@ -819,10 +819,10 @@
[:div
[:h2.subtitle "Expense Accounts"]
(for [[index {:keys [id location expense-account-id] :as expense-account}] (map vector (range) (:expense-accounts data))]
(for [[index {:keys [id location] :as expense-account {account-id :id account-numeric-code :numeric-code account-name :name} :account}] (map vector (range) (:expense-accounts data))]
^{:key id}
[:div.columns
[:div.column expense-account-id " - "(-> expense-account-id expense-accounts/expense-accounts :name)]
[:div.column account-numeric-code " - " account-name]
(when multi-location?
[:div.column location])