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

minor fix for finding vendors.

Browse Source
This commit is contained in:
Bryce Covert
2021-06-02 13:14:03 -07:00
parent 6f06892759
commit 3243902515
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hours.txt
View File

@@ -1 +1,4 @@
7/16/2020 4 hours 7/16/2020 4 hours
5/25/2021 3 hours
6/1/2021 0.5 hours

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

@@ -230,6 +230,17 @@
:content (:name v)}) :content (:name v)})
searchable-vendors)))))) searchable-vendors))))))
(re-frame/reg-sub
::all-vendors-index
:<- [::all-vendors]
(fn [all-vendors]
(doto (MiniSearch. #js {:fields #js ["name" "content"]
:storeFields #js ["id" "name" "content"]})
(.addAll (clj->js (map (fn [v] {:id (:id v)
:name (:name v)
:content (:name v)})
all-vendors))))))
(re-frame/reg-sub (re-frame/reg-sub
::all-vendors ::all-vendors
(fn [db] (fn [db]

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

@@ -172,13 +172,13 @@
value value
(expense-accounts-field/can-replace-with-default? (:accounts data))) (expense-accounts-field/can-replace-with-default? (:accounts data)))
[[:accounts] (expense-accounts-field/default-account (:accounts data) [[:accounts] (expense-accounts-field/default-account (: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)
[])] [])]
(= [:client] field) (= [:client] field)
[[:accounts] (expense-accounts-field/default-account (:accounts data) [[:accounts] (expense-accounts-field/default-account (:accounts data)
@(re-frame/subscribe [::subs/vendor-default-account (:vendor data) value]) @(re-frame/subscribe [::subs/vendor-default-account (:id (:vendor data)) value])
(:total data) (:total data)
[]) [])
[:bank-account] nil] [:bank-account] nil]
@@ -321,20 +321,22 @@
(field "Assign Vendor" (field "Assign Vendor"
[typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id]) [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
:entity-index @(re-frame/subscribe [::subs/searchable-vendors-index]) :entity-index @(re-frame/subscribe [::subs/all-vendors-index])
:entity->text :name :entity->text :name
:type "typeahead-v3" :type "typeahead-v3"
:field [:vendor] :field [:vendor]
:spec ::entity/vendor}]) :spec ::entity/vendor}])
(field nil (with-meta
[expense-accounts-field {:type "expense-accounts" (field nil
:descriptor "account asssignment" [expense-accounts-field {:type "expense-accounts"
:percentage-only? true :descriptor "account asssignment"
:client (:client data) :percentage-only? true
:locations (into ["Shared"] @(re-frame/subscribe [::subs/locations-for-client-or-bank-account (:id (:client data)) (:id (:bank-account data))])) :client (:client data)
:max 100 :locations (into ["Shared"] @(re-frame/subscribe [::subs/locations-for-client-or-bank-account (:id (:client data)) (:id (:bank-account data))]))
:field [:accounts]}]) :max 100
:field [:accounts]}])
{:key (some-> data :vendor :id str)})
(field "Approval Status" (field "Approval Status"
[button-radio [button-radio