started on expense accounts.

This commit is contained in:
Bryce Covert
2018-05-31 18:43:12 -07:00
parent d38059cb1d
commit b98d00a196
14 changed files with 128 additions and 12 deletions

View File

@@ -38,7 +38,7 @@
:query-obj {:venia/queries [[:company
[:id :name [:bank-accounts [:id :number :check-number :name]]]]
[:vendor
[:id :name]]]}
[:id :name :default-expense-account]]]}
:on-success [::received-initial]}}))))
@@ -54,7 +54,7 @@
:query-obj {:venia/queries [[:company
[:id :name [:bank-accounts [:id :number :check-number :name]]]]
[:vendor
[:id :name]]]}
[:id :name :default-expense-account]]]}
:on-success [::received-initial]}
:db (assoc db :user (assoc user :token token))}))

View File

@@ -20,7 +20,13 @@
{:venia/queries [[:invoice_page
(assoc params
:company-id (:id @(re-frame/subscribe [::subs/company])))
[[:invoices [:id :total :outstanding-balance :invoice-number :date [:vendor [:name :id]] [:company [:name :id]] [:checks [:amount [:check [:amount :s3_url :check_number ]]]]]]
[[:invoices [:id :total :outstanding-balance :invoice-number :date
[:vendor [:name :id]]
[:expense_accounts [:amount :id
[:expense_account [:id :name [:parent [:id :name]]]]]]
[:company [:name :id]]
[:checks [:amount [:check [:amount :s3_url :check_number ]]]]
]]
:total
:start
:end]]]})
@@ -76,19 +82,27 @@
:sort-by sort-by
:asc asc}
"Amount"]
[sorted-column {:on-sort opc
:style {:width "10em" :cursor "pointer"}
:sort-key "outstanding"
:sort-by sort-by
:asc asc}
"Outstanding"]
"Outstanding"]
[sorted-column {:on-sort opc
:style {:width "8em" :cursor "pointer"}
:sort-key "total"
:sort-by sort-by
:asc asc}
"Expense Accounts"]
[:th {:style {:width "10em"}} "" ]]]
[:tbody
(if (:loading @status)
[:tr
[:td {:col-span 5}
[:i.fa.fa-spin.fa-spinner]]]
(for [{:keys [company checks invoice-number date total outstanding-balance id vendor] :as i} (:invoices @invoice-page)]
(for [{:keys [company checks expense-accounts invoice-number date total outstanding-balance id vendor] :as i} (:invoices @invoice-page)]
^{:key id}
[:tr {:class (:class i)}
(when check-boxes
@@ -105,6 +119,9 @@
[:td (gstring/format "$%.2f" total )]
[:td (gstring/format "$%.2f" outstanding-balance )]
[:td (for [e expense-accounts]
^{:key (:id e)}
[:a.tag (:name (:expense-account e)) " "(gstring/format "$%.2f" (:amount e) ) ])]
[:td (for [check checks]
^{:key (:id check)}
[:a.tag {:href (:s3-url (:check check)) :target "_new"} [:i.fa.fa-money-check] [:span.icon [:i.fa.fa-money]] (str " " (:check-number (:check check)) " (" (gstring/format "$%.2f" (:amount check) ) ")")])]]))]]]))))

View File

@@ -10,6 +10,9 @@
[auto-ap.views.components.modal :refer [modal]]
[clojure.spec.alpha :as s]
[auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field]]
[auto-ap.views.components.typeahead :refer [typeahead]]
[auto-ap.expense-accounts :refer [expense-accounts]]
[cljs.reader :as edn]
[auto-ap.routes :as routes]
[bidi.bidi :as bidi]))
@@ -187,13 +190,26 @@
:event ::events/change
:subscription editing-vendor}]]
" Never"]]]
[:h2.subtitle "Expense Accounts"]
[horizontal-field
[:label.label "Default"]
[bind-field
[typeahead {:matches (map (fn [[k v]] [k (:name v)]) expense-accounts)
:type "typeahead"
:field [:default-expense-account]
:spec ::entity/default-expense-account
:event ::events/change
:subscription editing-vendor}]]]
[:h2.subtitle "Clients"]
#_[:h2.subtitle "Clients"]
[horizontal-field
#_[horizontal-field
nil
[:div.control
[:div.control@(re-frame/subscribe [::subs/exp])
[:div.select.is-expanded
[bind-field
[:select {:type "select"
@@ -214,7 +230,7 @@
{:on-click (dispatch-event [::events/add-relationship])}
[:span.icon
[:i.fa.fa-plus]]]]]
[horizontal-field
#_[horizontal-field
nil
[:ul
(for [[i r] (map vector (range) (:relationships editing-vendor))]