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

Adds location filter.

Browse Source
This commit is contained in:
Bryce Covert
2020-10-01 08:04:57 -07:00
parent 5445d55063
commit 71c716e669
9 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/clj/auto_ap/datomic/invoices.clj
View File

@@ -105,6 +105,12 @@
'[(.contains ^String ?invoice-number ?invoice-number-like)]]}
:args [(:invoice-number-like args)]})
(seq (:location args))
(merge-query {:query {:in ['?location]
:where ['[?e :invoice/expense-accounts ?eas]
'[?eas :invoice-expense-account/location ?location]]}
:args [(:location args)]})
(:sort args) (add-sorter-fields {"client" ['[?e :invoice/client ?c]
'[?c :client/name ?sort-client]]
"vendor" ['[?e :invoice/vendor ?v]

6
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -95,6 +95,12 @@
'[?c :client/original-id ?original-id]]}
:args [(:original-id args)]})
(seq (:location args))
(merge-query {:query {:in ['?location]
:where ['[?e :transaction/accounts ?tas]
'[?tas :transaction-account/location ?location]]}
:args [(:location args)]})
(:description args)
(merge-query {:query {:in ['?description]
:where ['[?e :transaction/description-original ?do]

2
src/clj/auto_ap/graphql.clj
View File

@@ -485,6 +485,7 @@
:amount_lte {:type :money}
:amount_gte {:type :money}
:invoice_number_like {:type 'String}
:location {:type 'String}
:start {:type 'Int}
:per_page {:type 'Int}
:sort {:type '(list :sort_item)}}
@@ -588,6 +589,7 @@
:bank_account_id {:type :id}
:account_id {:type :id}
:date_range {:type :date_range}
:location {:type 'String}
:amount_lte {:type :money}
:amount_gte {:type :money}
:description {:type 'String}

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

@@ -31,6 +31,7 @@
:due-range (:due-range params)
:amount-gte (:amount-gte (:amount-range params))
:amount-lte (:amount-lte (:amount-range params))
:location (:location params)
:invoice-number-like (:invoice-number-like params)
:client-id (:id @(re-frame/subscribe [::subs/client]))
:import-status (:import-status params)

7
src/cljs/auto_ap/views/components/invoices/side_bar.cljs
View File

@@ -88,6 +88,13 @@
{:on-change-event [::data-page/filter-changed data-page :amount-range]
:value @(re-frame/subscribe [::data-page/filter data-page :amount-range])}]]
[:p.menu-label "Location"]
[:div.field
[:div.control [:input.input {:placeholder "SC"
:style {:width "3em"}
:value @(re-frame/subscribe [::data-page/filter data-page :location])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :location ])} ]]]
[:p.menu-label "Invoice #"]
[:div
[invoice-number-filter params]]])]))

1
src/cljs/auto_ap/views/pages/ledger.cljs
View File

@@ -30,6 +30,7 @@
:vendor-id (:id (:vendor params))
:date-range (:date-range params)
:account-id (:id (:account params))
:location (:location params)
:bank-account-id (:id (:bank-account params))
:amount-gte (:amount-gte (:amount-range params))
:amount-lte (:amount-lte (:amount-range params))})

7
src/cljs/auto_ap/views/pages/ledger/side_bar.cljs
View File

@@ -88,6 +88,13 @@
{:on-change-event [::data-page/filter-changed data-page :amount-range]
:value @(re-frame/subscribe [::data-page/filter data-page :amount-range])}]]
[:p.menu-label "Location"]
[:div.field
[:div.control [:input.input {:placeholder "SC"
:style {:width "3em"}
:value @(re-frame/subscribe [::data-page/filter data-page :location])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :location ])} ]]]
(when (= :external-ledger ap)
[:<>
[:p.menu-label "External ID"]

1
src/cljs/auto_ap/views/pages/transactions.cljs
View File

@@ -31,6 +31,7 @@
:account-id (:id (:account params))
:bank-account-id (:id (:bank-account params))
:amount-gte (:amount-gte (:amount-range params))
:location (:location params)
:amount-lte (:amount-lte (:amount-range params))
:description (:description params)
:approval-status (condp = @(re-frame/subscribe [::subs/active-page])

6
src/cljs/auto_ap/views/pages/transactions/side_bar.cljs
View File

@@ -89,6 +89,12 @@
:value @(re-frame/subscribe [::data-page/filter data-page :date-range])}]]
[:p.menu-label "Location"]
[:div.field
[:div.control [:input.input {:placeholder "SC"
:style {:width "3em"}
:value @(re-frame/subscribe [::data-page/filter data-page :location])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :location ])} ]]]
[:p.menu-label "Description"]
[:div