From 9e636242272d864127008097d11adec6121c06ef Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 17 May 2018 20:32:19 -0700 Subject: [PATCH] dates on checks corrected. --- src/clj/auto_ap/routes/checks.clj | 13 ++++++++++--- src/clj/auto_ap/time.clj | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/clj/auto_ap/time.clj diff --git a/src/clj/auto_ap/routes/checks.clj b/src/clj/auto_ap/routes/checks.clj index 10b013d2..78125b4f 100644 --- a/src/clj/auto_ap/routes/checks.clj +++ b/src/clj/auto_ap/routes/checks.clj @@ -11,16 +11,23 @@ [amazonica.aws.s3 :as s3] [hiccup.core :refer [html]] [auto-ap.routes.utils :refer [wrap-secure]] + [auto-ap.time :refer [local-now]] [config.core :refer [env]] [compojure.core :refer [GET POST context defroutes wrap-routes]] [clojure.string :as str] [clj-pdf.core :as pdf] + [clj-time.format :as f] + [clj-time.core :as time] [clojure.java.io :as io]) (:import [java.text DecimalFormat] [java.util UUID] [java.io ByteArrayOutputStream])) +(def parser (f/formatter "MM/dd/YYYY")) +(defn date->str [t] + (f/unparse parser t)) + (defn make-check-pdf [check] (let [output-stream (ByteArrayOutputStream.)] (pdf/pdf @@ -178,11 +185,11 @@ :amount (reduce + 0 (map :total invoices)) :check (str (+ index (:check-number bank-account))) :memo memo - :date "5/10/2018" + :date (date->str (local-now)) :company {:name (:name company) :address (:address company) - :bank {:name "Bank of America, NA" - :acct "11-35/2010" + :bank {:name (:bank-name bank-account) + :acct (:bank-code bank-account) :acct-number (:number bank-account)}}} :invoices (map :id invoices)})) diff --git a/src/clj/auto_ap/time.clj b/src/clj/auto_ap/time.clj new file mode 100644 index 00000000..e2de7dfc --- /dev/null +++ b/src/clj/auto_ap/time.clj @@ -0,0 +1,5 @@ +(ns auto-ap.time + (:require [clj-time.core :as time])) + +(defn local-now [] + (time/to-time-zone (time/now) (time/time-zone-for-id "America/Los_Angeles")))