This commit is contained in:
Bryce Covert
2020-06-14 08:29:23 -07:00
parent ad4054d820
commit bd17cd3caa
9 changed files with 126 additions and 70 deletions

View File

@@ -116,12 +116,14 @@
(into
[:cell {:colspan 9}]
(let [{:keys [:client/name]
{:keys [:address/street1 :address/city :address/state :address/zip ]} :client/address} client]
(list
[:paragraph " " name]
[:paragraph " " street1]
[:paragraph " " city ", " state " " zip]
)))
{:keys [:address/street1 :address/street2 :address/city :address/state :address/zip ]} :client/address} client]
(filter identity
(list
[:paragraph " " name]
[:paragraph " " street1]
(when (not (str/blank? street2))
[:paragraph " " street2])
[:paragraph " " city ", " state " " zip]))))
[:cell {:colspan 2 :size 13}
check]]
@@ -131,6 +133,9 @@
[:cell {:colspan 5} [:paragraph
" " vendor-name "\n"
" " (:address/street1 (:vendor/address vendor)) "\n"
(when (not (str/blank? (:address/street2 (:vendor/address vendor))))
(str " " (:address/street2 (:vendor/address vendor)) "\n")
)
" " (:address/city (:vendor/address vendor)) ", " (:address/state (:vendor/address vendor)) " " (:address/zip (:vendor/address vendor))]]
[:cell {:align :right}
"Paid to:\n"

View File

@@ -104,8 +104,9 @@
[comparable-results] (l/get-graphql {:client-id (:client_id args)
:to-date (coerce/to-date (time/minus (:date args) (time/years 1)))
:date-range {:end (coerce/to-date (time/minus (:date args) (time/years 1)))}
:count Integer/MAX_VALUE})]
(println "count" (take 3 comparable-results))
(->graphql
{:balance-sheet-accounts (roll-up client results)
:comparable-balance-sheet-accounts (roll-up client comparable-results)})))