Tons of small fixes

This commit is contained in:
Bryce Covert
2020-07-27 21:28:02 -07:00
parent 3737cfa628
commit fdc1d3e9e4
26 changed files with 428 additions and 178 deletions

View File

@@ -25,6 +25,7 @@
:<- [::subs/vendors-by-id]
:<- [::subs/query-params]
(fn [[specific-filters vendors-by-id query-params] ]
(println "Q:UERY" query-params)
(let [url-filters (-> query-params
(select-keys #{:vendor-id
:date-range
@@ -42,8 +43,8 @@
:amount-lte (:amount-lte url-filters)}
:settled {:amount-gte (:amount-gte url-filters)
:amount-lte (:amount-lte url-filters)}}
:invoice-number-like {:raw (:invoice-number-like url-filters)
:settled (:invoice-number-like url-filters)}}]
:invoice-number-like {:raw (str (:invoice-number-like url-filters))
:settled (str (:invoice-number-like url-filters))}}]
(merge url-filters specific-filters ))))
(re-frame/reg-sub
@@ -56,7 +57,8 @@
::filter-params
:<- [::filters]
:<- [::subs/active-page]
(fn [[filters ap]]
(fn [[filters ap ]]
{:vendor-id (:id (:vendor filters))
:date-range (:date-range filters)
:due-range (:due-range filters)