outstanding balance and addresses.

src/clj/auto_ap/routes/checks.clj

@@ -3,6 +3,7 @@
             [auto-ap.db.vendors :as vendors]
             [auto-ap.db.invoices :as invoices]
             [auto-ap.utils :refer [by]]
+            [auto-ap.numeric :refer [num->words]]
             [auto-ap.db.checks :as checks]
             [auto-ap.db.invoices-checks :as invoices-checks]
             [auto-ap.db.utils :refer [query]]
@@ -26,12 +27,13 @@
      [{:left-margin 10 :right-margin 0 :top-margin 0 :bottom-margin 0}
       (let [{:keys [paid-to company check date amount memo] {vendor-name :name :as vendor} :vendor} check
             df (DecimalFormat. "#,###.00") 
-            _ (println amount (class amount))
+            word-amount (num->words amount)
+            
             amount (str "--" (.format df  amount) "--")]
             
         [:table {:num-cols 12 :border false :leading 11}
-         [(let [{:keys [name address1 city state zip bank]} company]
-            [:cell {:colspan 4 } [:paragraph {:leading 14} name "\n" address1 "\n" (str city ", " state zip)] ])
+         [(let [{:keys [name bank] {:keys [street1 street2 city state zip ]} :address} company]
+            [:cell {:colspan 4 } [:paragraph {:leading 14} name "\n" street1 "\n" (str city ", " state " " zip)] ])
           (let [{{:keys [name acct]} :bank} company]
             [:cell {:colspan 6 :align :center} [:paragraph {:style :bold} name] [:paragraph acct]])
           [:cell {:colspan 2 :size 13}
@@ -46,7 +48,7 @@
           [:cell {:colspan 3} amount]]
 
          [[:cell {}]
-          [:cell {:colspan 8} "One thousand two hundred thirty four and fifty six cents" [:line]]
+          [:cell {:colspan 8} word-amount [:line]]
           [:cell {:colspan 3}]]
 
          [[:cell {:colspan 12} [:spacer]]]
@@ -67,11 +69,12 @@
          [[:cell]
           (into
            [:cell {:colspan 9}]
-           (let [{:keys [name address1 city state zip bank]} company]
+           (let [{:keys [name]
+                  {:keys [street1 city state zip bank]} :address} company]
              (list
               [:paragraph name]
-              [:paragraph address1]
-              [:paragraph city ", " state zip]
+              [:paragraph street1]
+              [:paragraph city ", " state " " zip]
               )))
           [:cell {:colspan 2 :size 13}
            check]]
@@ -177,10 +180,7 @@
                 :memo  memo
                 :date "5/10/2018"
                 :company {:name (:name company)
-                          :address1 "123 main st"
-                          :city "Campbell"
-                          :state "CA"
-                          :zip "95008"
+                          :address (:address company)
                           :bank {:name "Bank of America, NA"
                                  :acct "11-35/2010"
                                  :acct-number (:number bank-account)}}}
@@ -216,9 +216,9 @@
 
     (make-pdfs (map second checks))
     (companies/upsert company-id updated-company)
-    (doseq [{:keys [invoice-id]} invoice-payments]
-      (invoices/mark-finished-if-complete invoice-id))
-    {:invoices (mapcat first checks)
+    (doseq [{:keys [invoice-id amount]} invoice-payments]
+      (invoices/apply-payment invoice-id amount))
+    {:invoices (invoices/get-multi (map :id (doto (mapcat first checks) println)))
      :pdf-url (merge-pdfs (map (comp :s3-key second) checks))}))
 
 

src/clj/auto_ap/routes/invoices.clj

@@ -134,6 +134,7 @@
                                                      {:vendor-id vendor-id
                                                       :company-id company-id
                                                       :total total 
+                                                      :outstanding-balance total
                                                       :imported true
                                                       :status "unpaid"
                                                       :invoice-number invoice-number