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

supports new check layout, added bank account for campbell

Browse Source
This commit is contained in:
BC
2018-07-13 00:24:11 -07:00
parent 77eade2f15
commit 14d95dab8d
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
migrator/migrations/1531452173-DOWN-change-yodlee-transaction-id.sql
View File

@@ -1 +1,2 @@
-- 1531452173 DOWN change-yodlee-transaction-id -- 1531452173 DOWN change-yodlee-transaction-id
alter table transactions alter column id type int;

1
migrator/migrations/1531464885-DOWN-add-campbell-bank-account.sql Normal file
View File

@@ -0,0 +1 @@
-- 1531464885 DOWN add-campbell-bank-account

2
migrator/migrations/1531464885-UP-add-campbell-bank-account.sql Normal file
View File

@@ -0,0 +1,2 @@
-- 1531464885 UP add-campbell-bank-account
update companies set data ='{:locations ["CB"] :bank-accounts [{:number "123456789" :id 1 :check-number 6789 :bank-name "Test account" :bank-code "90-4149/1211" :routing "12345678" :name "test-acct" :yodlee-account-id 0}]}' where name = 'Campbell Brewing Co';

15
src/clj/auto_ap/routes/checks.clj
View File

@@ -36,7 +36,7 @@
(defn make-check-pdf [check] (defn make-check-pdf [check]
(let [output-stream (ByteArrayOutputStream.)] (let [output-stream (ByteArrayOutputStream.)]
(pdf/pdf (pdf/pdf
[{:left-margin 7 :right-margin 0 :top-margin 0 :bottom-margin 0 :size :letter} [{:left-margin 17 :right-margin 0 :top-margin 0 :bottom-margin 0 :size :letter}
(let [{:keys [paid-to company check date amount memo] {print-as :print-as vendor-name :name :as vendor} :vendor} check (let [{:keys [paid-to company check date amount memo] {print-as :print-as vendor-name :name :as vendor} :vendor} check
df (DecimalFormat. "#,###.00") df (DecimalFormat. "#,###.00")
word-amount (num->words amount) word-amount (num->words amount)
@@ -47,12 +47,14 @@
[(let [{:keys [name bank] {:keys [street1 street2 city state zip ]} :address} company] [(let [{:keys [name bank] {:keys [street1 street2 city state zip ]} :address} company]
[:cell {:colspan 3 } [:paragraph {:leading 14} name "\n" street1 "\n" (str city ", " state " " zip)] ]) [:cell {:colspan 3 } [:paragraph {:leading 14} name "\n" street1 "\n" (str city ", " state " " zip)] ])
(let [{{:keys [name acct]} :bank} company] (let [{{:keys [name acct]} :bank} company]
[:cell {:colspan 7 :align :center} [:paragraph {:style :bold} name] [:paragraph acct]]) [:cell {:colspan 7 :align :center} [:paragraph {:style :bold} name] [:paragraph {:size 8 :leading 8} acct]])
[:cell {:colspan 2 :size 13} [:cell {:colspan 2 :size 13}
check]] check]]
[[:cell {:colspan 9}] [[:cell {:colspan 9}]
[:cell {:colspan 3} date]] [:cell {:colspan 3 :leading -10} date]]
[[:cell {:colspan 12 :size 14}]
]
[[:cell {:size 13 :leading 13} "PAY"] [[:cell {:size 13 :leading 13} "PAY"]
[:cell {:size 8 :leading 8 } "TO THE ORDER OF"] [:cell {:size 8 :leading 8 } "TO THE ORDER OF"]
@@ -62,7 +64,12 @@
[:cell {:colspan 3} amount]] [:cell {:colspan 3} amount]]
[[:cell {}] [[:cell {}]
[:cell {:colspan 8} word-amount [:line {:line-width 0.15 :color [50 50 50]}]] [:cell {:colspan 8} (str " -- " word-amount " " (str/join "" (take (max
2
(- 100
(count word-amount)))
(repeat "-"))))
[:line {:line-width 0.15 :color [50 50 50]}]]
[:cell {:colspan 3}]] [:cell {:colspan 3}]]
[[:cell {:colspan 12 :leading 50} [:spacer]]] [[:cell {:colspan 12 :leading 50} [:spacer]]]