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

Fixes mistake in client selection on 1099 page.

Browse Source
This commit is contained in:
Bryce Covert
2023-01-23 14:16:26 -08:00
parent be44000b6a
commit 1fb037e4f4
1 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
src/clj/auto_ap/ssr/company/company_1099.clj
View File

@@ -25,98 +25,99 @@
(map first) (map first)
set) set)
results (cond results (cond
(and (some-> session :client :db/id) (and (some-> session :client :db/id)
(can-see-client? user (can-see-client? user
(some-> session :client :db/id))) (some-> session :client :db/id)))
:else (d/q '[:find
(d/q '[:find (pull ?c [:client/code :db/id])
(pull ?c [:client/code :db/id]) (pull ?v [:db/id
(pull ?v [:db/id :vendor/name
:vendor/name {:vendor/legal-entity-1099-type [:db/ident]}
{:vendor/legal-entity-1099-type [:db/ident]} {:vendor/legal-entity-tin-type [:db/ident]}
{:vendor/legal-entity-tin-type [:db/ident]} {:vendor/address [:address/street1
{:vendor/address [:address/street1 :address/city
:address/city :address/state
:address/state :address/zip]}
:address/zip]} :vendor/legal-entity-tin
:vendor/legal-entity-tin :vendor/legal-entity-name
:vendor/legal-entity-name :vendor/legal-entity-first-name
:vendor/legal-entity-first-name :vendor/legal-entity-middle-name
:vendor/legal-entity-middle-name :vendor/legal-entity-last-name])
:vendor/legal-entity-last-name]) (sum ?a)
(sum ?a) :with ?d
:with ?d :in $ ?c
:in $ ?c :where
:where [?p :payment/client ?c]
[?p :payment/client ?c] [?p :payment/date ?d ]
[?p :payment/date ?d ] [(>= ?d #inst "2022-01-01T08:00")]
[(>= ?d #inst "2022-01-01T08:00")] [(< ?d #inst "2023-01-01T08:00")]
[(< ?d #inst "2023-01-01T08:00")] [?p :payment/type :payment-type/check]
[?p :payment/type :payment-type/check]
[?p :payment/amount ?a] [?p :payment/amount ?a]
[?p :payment/vendor ?v]] [?p :payment/vendor ?v]]
(d/db conn) (d/db conn)
(some-> session :client :db/id)) (some-> session :client :db/id))
(is-admin? user) (is-admin? user)
(d/q '[:find (d/q '[:find
(pull ?c [:client/code :db/id]) (pull ?c [:client/code :db/id])
(pull ?v [:db/id (pull ?v [:db/id
:vendor/name :vendor/name
{:vendor/legal-entity-1099-type [:db/ident]} {:vendor/legal-entity-1099-type [:db/ident]}
{:vendor/legal-entity-tin-type [:db/ident]} {:vendor/legal-entity-tin-type [:db/ident]}
{:vendor/address [:address/street1 {:vendor/address [:address/street1
:address/city :address/city
:address/state :address/state
:address/zip]} :address/zip]}
:vendor/legal-entity-tin :vendor/legal-entity-tin
:vendor/legal-entity-name :vendor/legal-entity-name
:vendor/legal-entity-first-name :vendor/legal-entity-first-name
:vendor/legal-entity-middle-name :vendor/legal-entity-middle-name
:vendor/legal-entity-last-name]) :vendor/legal-entity-last-name])
(sum ?a) (sum ?a)
:with ?d :with ?d
:in $ :in $
:where :where
[?p :payment/date ?d ] [?p :payment/date ?d ]
[(>= ?d #inst "2022-01-01T08:00")] [(>= ?d #inst "2022-01-01T08:00")]
[(< ?d #inst "2023-01-01T08:00")] [(< ?d #inst "2023-01-01T08:00")]
[?p :payment/type :payment-type/check] [?p :payment/type :payment-type/check]
[?p :payment/client ?c] [?p :payment/client ?c]
[?p :payment/amount ?a] [?p :payment/amount ?a]
[?p :payment/vendor ?v]] [?p :payment/vendor ?v]]
(d/db conn)) (d/db conn))
(d/q '[:find
(pull ?c [:client/code :db/id])
(pull ?v [:db/id
:vendor/name
{:vendor/legal-entity-1099-type [:db/ident]}
{:vendor/legal-entity-tin-type [:db/ident]}
{:vendor/address [:address/street1
:address/city
:address/state
:address/zip]}
:vendor/legal-entity-tin
:vendor/legal-entity-name
:vendor/legal-entity-first-name
:vendor/legal-entity-middle-name
:vendor/legal-entity-last-name])
(sum ?a)
:with ?d
:in $ [?c ...]
:where
[?p :payment/client ?c]
[?p :payment/date ?d ]
[(>= ?d #inst "2022-01-01T08:00")]
[(< ?d #inst "2023-01-01T08:00")]
[?p :payment/type :payment-type/check]
[?p :payment/amount ?a] :else
[?p :payment/vendor ?v]] (d/q '[:find
(d/db conn) (pull ?c [:client/code :db/id])
clients))] (pull ?v [:db/id
:vendor/name
{:vendor/legal-entity-1099-type [:db/ident]}
{:vendor/legal-entity-tin-type [:db/ident]}
{:vendor/address [:address/street1
:address/city
:address/state
:address/zip]}
:vendor/legal-entity-tin
:vendor/legal-entity-name
:vendor/legal-entity-first-name
:vendor/legal-entity-middle-name
:vendor/legal-entity-last-name])
(sum ?a)
:with ?d
:in $ [?c ...]
:where
[?p :payment/client ?c]
[?p :payment/date ?d ]
[(>= ?d #inst "2022-01-01T08:00")]
[(< ?d #inst "2023-01-01T08:00")]
[?p :payment/type :payment-type/check]
[?p :payment/amount ?a]
[?p :payment/vendor ?v]]
(d/db conn)
clients))]
(->> results (->> results
(filter (fn [[_ _ a]] (filter (fn [[_ _ a]]
(>= (or a 0.0) 600.0))) (>= (or a 0.0) 600.0)))