From 14d95dab8dd6f1e13fcf3f4c06ba2637de1fde99 Mon Sep 17 00:00:00 2001 From: BC Date: Fri, 13 Jul 2018 00:24:11 -0700 Subject: [PATCH] supports new check layout, added bank account for campbell --- ...31452173-DOWN-change-yodlee-transaction-id.sql | 3 ++- .../1531464885-DOWN-add-campbell-bank-account.sql | 1 + .../1531464885-UP-add-campbell-bank-account.sql | 2 ++ src/clj/auto_ap/routes/checks.clj | 15 +++++++++++---- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 migrator/migrations/1531464885-DOWN-add-campbell-bank-account.sql create mode 100644 migrator/migrations/1531464885-UP-add-campbell-bank-account.sql diff --git a/migrator/migrations/1531452173-DOWN-change-yodlee-transaction-id.sql b/migrator/migrations/1531452173-DOWN-change-yodlee-transaction-id.sql index ab20a585..2bac1b71 100644 --- a/migrator/migrations/1531452173-DOWN-change-yodlee-transaction-id.sql +++ b/migrator/migrations/1531452173-DOWN-change-yodlee-transaction-id.sql @@ -1 +1,2 @@ --- 1531452173 DOWN change-yodlee-transaction-id \ No newline at end of file +-- 1531452173 DOWN change-yodlee-transaction-id +alter table transactions alter column id type int; diff --git a/migrator/migrations/1531464885-DOWN-add-campbell-bank-account.sql b/migrator/migrations/1531464885-DOWN-add-campbell-bank-account.sql new file mode 100644 index 00000000..c247a857 --- /dev/null +++ b/migrator/migrations/1531464885-DOWN-add-campbell-bank-account.sql @@ -0,0 +1 @@ +-- 1531464885 DOWN add-campbell-bank-account \ No newline at end of file diff --git a/migrator/migrations/1531464885-UP-add-campbell-bank-account.sql b/migrator/migrations/1531464885-UP-add-campbell-bank-account.sql new file mode 100644 index 00000000..aba0529d --- /dev/null +++ b/migrator/migrations/1531464885-UP-add-campbell-bank-account.sql @@ -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'; diff --git a/src/clj/auto_ap/routes/checks.clj b/src/clj/auto_ap/routes/checks.clj index e6688721..5a220d28 100644 --- a/src/clj/auto_ap/routes/checks.clj +++ b/src/clj/auto_ap/routes/checks.clj @@ -36,7 +36,7 @@ (defn make-check-pdf [check] (let [output-stream (ByteArrayOutputStream.)] (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 df (DecimalFormat. "#,###.00") word-amount (num->words amount) @@ -47,12 +47,14 @@ [(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)] ]) (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} check]] [[: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 8 :leading 8 } "TO THE ORDER OF"] @@ -62,7 +64,12 @@ [:cell {:colspan 3} amount]] [[: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 12 :leading 50} [:spacer]]]