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

now checks get created and uploaded!

Browse Source
This commit is contained in:
Bryce Covert
2018-05-11 17:23:17 -07:00
parent 6c014a6b36
commit 88358a7f2a
10 changed files with 246 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/dev.edn
View File

@@ -6,4 +6,5 @@
:aws-region "us-east-1" :aws-region "us-east-1"
:invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging" :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging"
:invoice-email "invoices-staging@mail.app.integreatconsult.com" :invoice-email "invoices-staging@mail.app.integreatconsult.com"
:data-bucket "data.staging.app.integreatconsult.com"
} }

1
config/local.edn
View File

@@ -5,4 +5,5 @@
:aws-secret-access-key "Z+AOjQU9M4SwKVU2meYtyNxXtz1Axu/9xohvteXf" :aws-secret-access-key "Z+AOjQU9M4SwKVU2meYtyNxXtz1Axu/9xohvteXf"
:aws-region "us-east-1" :aws-region "us-east-1"
:invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging" :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging"
:data-bucket "data.staging.app.integreatconsult.com"
} }

1
config/prod.edn
View File

@@ -6,4 +6,5 @@
:aws-region "us-east-1" :aws-region "us-east-1"
:invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-prod" :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-prod"
:invoice-email "invoices@mail.app.integreatconsult.com" :invoice-email "invoices@mail.app.integreatconsult.com"
:data-bucket "data.prod.app.integreatconsult.com"
} }

1
config/staging.edn
View File

@@ -6,4 +6,5 @@
:aws-region "us-east-1" :aws-region "us-east-1"
:invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging" :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging"
:invoice-email "invoices-staging@mail.app.integreatconsult.com" :invoice-email "invoices-staging@mail.app.integreatconsult.com"
:data-bucket "data.staging.app.integreatconsult.com"
} }

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

@@ -4,168 +4,119 @@
[auto-ap.db.invoices :as invoices] [auto-ap.db.invoices :as invoices]
[auto-ap.db.utils :refer [query]] [auto-ap.db.utils :refer [query]]
[auto-ap.parse :as parse] [auto-ap.parse :as parse]
[amazonica.aws.s3 :as s3]
[hiccup.core :refer [html]] [hiccup.core :refer [html]]
[auto-ap.routes.utils :refer [wrap-secure]] [auto-ap.routes.utils :refer [wrap-secure]]
[config.core :refer [env]]
[compojure.core :refer [GET POST context defroutes [compojure.core :refer [GET POST context defroutes
wrap-routes]] wrap-routes]]
[clojure.string :as str])) [clojure.string :as str]
[clj-pdf.core :as pdf])
(:import [java.text DecimalFormat]
[java.util UUID]))
(defn check-page [checks] (defn check-page [checks uuid]
(html (pdf/pdf
[:html [{:left-margin 10 :right-margin 0 :top-margin 0 :bottom-margin 0}
[:head (for [{:keys [paid-to company check date amount memo] {vendor-name :name :as vendor} :vendor} checks
[:link {:rel "stylesheet" :let [df (DecimalFormat. "#,###.00")
:href "resources/public/css/bulma.min.css"}] amount (str "--" (.format df amount) "--")]]
[:link {:rel "stylesheet" [:table {:num-cols 12 :border false :leading 11}
:href "resources/public/css/check.css"}]] [(let [{:keys [name address1 city state zip bank]} company]
[:body [:cell {:colspan 4 } [:paragraph {:leading 14} name "\n" address1 "\n" (str city ", " state zip)] ])
(let [{{:keys [name acct]} :bank} company]
[:div [:cell {:colspan 6 :align :center} [:paragraph {:style :bold} name] [:paragraph acct]])
(for [{:keys [vendor-name paid-to company check date amount memo]} checks [:cell {:colspan 2 :size 13}
check]]
:let [amount (str "--%.2f--" amount)]]
[:div
[:div.columns
(let [{:keys [name address1 city state zip bank]} company]
(list
[:div.column.is-4
[:p name]
[:p address1]
[:p city ", " state zip]]
[:div.column.is-7
[:p.has-text-centered (:name bank)] [[:cell {:colspan 9}]
[:p.has-text-centered (:acct bank)] [:cell {:colspan 3} date]]
]))
[:div.column [[:cell {:size 16 :leading 16} "PAY"]
check] [:cell {:size 6 :leading 6 } "TO THE ORDER OF"]
] [:cell {:colspan 7} vendor-name]
[:div.columns [:cell {:colspan 3} amount]]
[:div.column.is-11]
[:div.column date]
]
[:div.columns
[:div.column
"PAY"
]
[:div.column
"TO THE ORDER OF"]
[:div.column.is-9
vendor-name]
[:div.column
amount]]
[:div.columns [[:cell {}]
[:div.column] [:cell {:colspan 8} "One thousand two hundred thirty four and fifty six cents" [:line]]
[:div.column.is-8 {:style {"border-bottom" "1px solid black"}} "One thousand two hundred thirty four and fifty six cents"] [:cell {:colspan 3}]]
[:div.column.is-3]]
[:div.columns [[:cell {:colspan 12} [:spacer]]]
[:div.column ""]] [[:cell {:colspan 12} [:spacer]]]
[:div.columns [[:cell {:colspan 12} [:spacer]]]
[:div.column " "]]
[:div.columns [[:cell "MEMO"]
[:div.column [:cell {:colspan 7} memo [:line]]
"MEMO"] [:cell {:colspan 4}]]
[:div.column.is-7 {:style {"border-bottom" "1px solid black"}}
memo]
[:div.column.is-4]]
[:div.columns [[:cell {:colspan 2}]
[:div.column.is-2 ] [:cell {:colspan 10 :leading 30}
[:div.column.is-10 {:style {"font-family" "MICR" "font-size" "20pt"}} [:phrase {:size 18 :ttf-name "public/micrenc.ttf"} (str "c" check "c a" (:acct-number (:bank company)) "a 10302c")]]]
(str "c" check "c a" (:acct-number (:bank company)) "a 10302c")]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell]
(into
[:cell {:colspan 9}]
(let [{:keys [name address1 city state zip bank]} company]
(list
[:paragraph name]
[:paragraph address1]
[:paragraph city ", " state zip]
)))
[:cell {:colspan 2 :size 13}
check]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[:div.columns [[:cell]
[:div.column " "]] [:cell {:colspan 5} [:paragraph
vendor-name "\n"
(:address1 vendor) "\n"
(:city vendor) ", " (:state vendor) " " (:zip vendor)]]
[:cell {:align :right}
"Paid to:\n"
"Amount:\n"
"Date:\n"]
[:div.columns [:cell {:colspan 5}
[:div.column " "]] [:paragraph paid-to]
[:paragraph amount]
[:paragraph date]]]
[:div.columns [[:cell {:colspan 3} "Memo:"]
[:div.column " "]] [:cell {:colspan 9} memo]]
[:div.columns [[:cell {:colspan 12} [:spacer]]]
[:div.column " "]] [[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[[:cell {:colspan 12} [:spacer]]]
[:div.columns [[:cell {:colspan 5}]
[:div.column] [:cell {:align :right :colspan 2}
[:div.column.is-10 "Check:\n"
(let [{:keys [name address1 city state zip bank]} company] "Vendor:\n"
(list "Bank Account:\n"
[:p name] "Paid To:\n"
[:p address1] "Amount:\n"
[:p city ", " state zip] "Date:\n"]
))
]
[:div.column
check]]
[:div.columns [:cell {:colspan 5}
[:div.column " "]] [:paragraph check]
[:div.columns [:paragraph vendor-name]
[:div.column " "]] [:paragraph (:name (:bank company))]
[:div.columns [:paragraph paid-to]
[:div.column " "]] [:paragraph amount]
[:div.columns [:paragraph date]]]
[:div.column " "]] [[:cell {:colspan 3} "Memo:"]
[:div.columns [:cell {:colspan 9} memo]]
[:div.column " "]] ])]
(doto (str "/tmp/" uuid ".pdf") println)))
[:div.columns
[:div.column]
[:div.column.is-5
vendor-name]
[:div.column
[:p.has-text-right "Paid to:"]
[:p.has-text-right "Amount:"]
[:p.has-text-right "Date:"]]
[:div.column.is-5
[:p paid-to]
[:p amount]
[:p date]]]
[:div.columns
[:div.column "MEMO"]
[:div.column.is-11
memo
]]
[:div.columns
[:div.column " "]]
[:div.columns
[:div.column.is-6]
[:div.column
[:p.has-text-right "Check:"]
[:p.has-text-right "Vendor:"]
[:p.has-text-right "Bank Account:"]
[:p.has-text-right "Paid To:"]
[:p.has-text-right "Amount:"]
[:p.has-text-right "Date:"]]
[:div.column.is-5
[:p check]
[:p vendor-name]
[:p (:name (:bank company))]
[:p paid-to]
[:p amount]
[:p date]]]
[:div.columns
[:div.column "MEMO"]
[:div.column.is-11
memo]]
[:footer]])]]]))
(defroutes routes (defroutes routes
(wrap-routes (wrap-routes
@@ -178,7 +129,10 @@
vendors (into {} vendors (into {}
(map (fn [v] [(:id v) v]) (map (fn [v] [(:id v) v])
(vendors/get-all))) (vendors/get-all)))
invoices-grouped-by-vendor (group-by :vendor-id invoices)] invoices-grouped-by-vendor (group-by :vendor-id invoices)
uuid (str (UUID/randomUUID))]
(check-page (for [[vendor-id invoices] invoices-grouped-by-vendor (check-page (for [[vendor-id invoices] invoices-grouped-by-vendor
:let [vendor (vendors vendor-id) :let [vendor (vendors vendor-id)
company (companies (:company-id (first invoices))) company (companies (:company-id (first invoices)))
@@ -188,8 +142,8 @@
(str (:invoice-number i) "(" (:total i) ")")) (str (:invoice-number i) "(" (:total i) ")"))
invoices) invoices)
))]] ))]]
{:vendor-name (:name vendor) {:vendor vendor
:paid-to (:name company) :paid-to (:name vendor)
:amount (reduce + 0 (map :total invoices)) :amount (reduce + 0 (map :total invoices))
:check "1234" :check "1234"
:memo memo :memo memo
@@ -201,10 +155,14 @@
:zip "95008" :zip "95008"
:bank {:name "Bank of America, NA" :bank {:name "Bank of America, NA"
:acct "11-35/2010" :acct "11-35/2010"
:acct-number "123456789"}}})) :acct-number "123456789"}}})
uuid)
(s3/put-object :bucket-name (:data-bucket env)
:key (str "checks/" uuid ".pdf")
:file (str "/tmp/" uuid ".pdf"))
{:status 200 {:status 200
:body "{}" :body (pr-str {:url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/checks/" uuid ".pdf")})
#_(pr-str )
:headers {"Content-Type" "application/edn"}}))) :headers {"Content-Type" "application/edn"}})))
wrap-secure)) wrap-secure))

5
src/cljs/auto_ap/effects.cljs
View File

@@ -17,6 +17,11 @@
(fn [uri] (fn [uri]
(pushy/set-token! p/history uri))) (pushy/set-token! p/history uri)))
(re-frame/reg-fx
:new-window
(fn [url]
(.open js/window url)))
(re-frame/reg-fx (re-frame/reg-fx
:set-local-storage :set-local-storage
(fn [[name value]] (fn [[name value]]

5
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -61,9 +61,8 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::checks-created ::checks-created
(fn [{:keys [db]} [_ data]] (fn [{:keys [db]} [_ data]]
{:dispatch [:auto-ap.events/set-active-page :check] {:new-window (:url data)
:db (-> db }))
(assoc ::check/checks data))}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::invalidated ::invalidated

26
terraform/main.tf
View File

@@ -56,6 +56,32 @@ resource "aws_s3_bucket" "invoices" {
} }
EOF EOF
} }
resource "aws_s3_bucket" "data" {
bucket = "data.${var.stage}.app.integreatconsult.com"
acl = "private"
policy = <<POLICY
{
"Id": "Policy1526084187222",
"Version": "2012-10-17",
"Statement": [
{
"Sid": "Stmt1526084185514",
"Action": [
"s3:GetObject"
],
"Effect": "Allow",
"Resource": "arn:aws:s3:::data.${var.stage}.app.integreatconsult.com/*",
"Principal": "*"
}
]
}
POLICY
website {
index_document = "index.html"
}
}
resource "aws_sqs_queue" "integreat-mail" { resource "aws_sqs_queue" "integreat-mail" {
name = "integreat-mail-${var.stage}" name = "integreat-mail-${var.stage}"

44
terraform/terraform.tfstate.d/staging/terraform.tfstate
View File

@@ -1,7 +1,7 @@
{ {
"version": 3, "version": 3,
"terraform_version": "0.11.5", "terraform_version": "0.11.5",
"serial": 6, "serial": 10,
"lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8",
"modules": [ "modules": [
{ {
@@ -172,6 +172,44 @@
"deposed": [], "deposed": [],
"provider": "provider.aws" "provider": "provider.aws"
}, },
"aws_s3_bucket.data": {
"type": "aws_s3_bucket",
"depends_on": [],
"primary": {
"id": "data.staging.app.integreatconsult.com",
"attributes": {
"acceleration_status": "",
"acl": "private",
"arn": "arn:aws:s3:::data.staging.app.integreatconsult.com",
"bucket": "data.staging.app.integreatconsult.com",
"bucket_domain_name": "data.staging.app.integreatconsult.com.s3.amazonaws.com",
"force_destroy": "false",
"hosted_zone_id": "Z3AQBSTGFYJSTF",
"id": "data.staging.app.integreatconsult.com",
"logging.#": "0",
"policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.staging.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"}],\"Version\":\"2012-10-17\"}",
"region": "us-east-1",
"replication_configuration.#": "0",
"request_payer": "BucketOwner",
"server_side_encryption_configuration.#": "0",
"tags.%": "0",
"versioning.#": "1",
"versioning.0.enabled": "false",
"versioning.0.mfa_delete": "false",
"website.#": "1",
"website.0.error_document": "",
"website.0.index_document": "index.html",
"website.0.redirect_all_requests_to": "",
"website.0.routing_rules": "",
"website_domain": "s3-website-us-east-1.amazonaws.com",
"website_endpoint": "data.staging.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com"
},
"meta": {},
"tainted": false
},
"deposed": [],
"provider": "provider.aws"
},
"aws_s3_bucket.invoices": { "aws_s3_bucket.invoices": {
"type": "aws_s3_bucket", "type": "aws_s3_bucket",
"depends_on": [ "depends_on": [
@@ -369,11 +407,11 @@
"type": "aws_caller_identity", "type": "aws_caller_identity",
"depends_on": [], "depends_on": [],
"primary": { "primary": {
"id": "2018-04-10 06:20:31.972433424 +0000 UTC", "id": "2018-05-12 00:18:13.939881377 +0000 UTC",
"attributes": { "attributes": {
"account_id": "679918342773", "account_id": "679918342773",
"arn": "arn:aws:iam::679918342773:user/bryce", "arn": "arn:aws:iam::679918342773:user/bryce",
"id": "2018-04-10 06:20:31.972433424 +0000 UTC", "id": "2018-05-12 00:18:13.939881377 +0000 UTC",
"user_id": "AIDAJPUJFTOKO4IRADMV4" "user_id": "AIDAJPUJFTOKO4IRADMV4"
}, },
"meta": {}, "meta": {},

63
terraform/terraform.tfstate.d/staging/terraform.tfstate.backup
View File

@@ -1,7 +1,7 @@
{ {
"version": 3, "version": 3,
"terraform_version": "0.11.5", "terraform_version": "0.11.5",
"serial": 6, "serial": 10,
"lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8",
"modules": [ "modules": [
{ {
@@ -172,6 +172,40 @@
"deposed": [], "deposed": [],
"provider": "provider.aws" "provider": "provider.aws"
}, },
"aws_s3_bucket.data": {
"type": "aws_s3_bucket",
"depends_on": [
"data.aws_caller_identity.current"
],
"primary": {
"id": "data.staging.app.integreatconsult.com",
"attributes": {
"acceleration_status": "",
"acl": "private",
"arn": "arn:aws:s3:::data.staging.app.integreatconsult.com",
"bucket": "data.staging.app.integreatconsult.com",
"bucket_domain_name": "data.staging.app.integreatconsult.com.s3.amazonaws.com",
"force_destroy": "false",
"hosted_zone_id": "Z3AQBSTGFYJSTF",
"id": "data.staging.app.integreatconsult.com",
"logging.#": "0",
"policy": "",
"region": "us-east-1",
"replication_configuration.#": "0",
"request_payer": "BucketOwner",
"server_side_encryption_configuration.#": "0",
"tags.%": "0",
"versioning.#": "1",
"versioning.0.enabled": "false",
"versioning.0.mfa_delete": "false",
"website.#": "0"
},
"meta": {},
"tainted": false
},
"deposed": [],
"provider": "provider.aws"
},
"aws_s3_bucket.invoices": { "aws_s3_bucket.invoices": {
"type": "aws_s3_bucket", "type": "aws_s3_bucket",
"depends_on": [ "depends_on": [
@@ -315,6 +349,29 @@
"deposed": [], "deposed": [],
"provider": "provider.aws" "provider": "provider.aws"
}, },
"aws_sns_topic_subscription.send_reminders_to_service": {
"type": "aws_sns_topic_subscription",
"depends_on": [
"aws_sns_topic.reminder_topic"
],
"primary": {
"id": "arn:aws:sns:us-east-1:679918342773:reminders-staging:f21bb21a-f5e9-4bce-afa5-7fa5b1ec8581",
"attributes": {
"arn": "arn:aws:sns:us-east-1:679918342773:reminders-staging:f21bb21a-f5e9-4bce-afa5-7fa5b1ec8581",
"confirmation_timeout_in_minutes": "1",
"endpoint": "https://staging.app.integreatconsult.com:8443/api/reminders/send",
"endpoint_auto_confirms": "true",
"id": "arn:aws:sns:us-east-1:679918342773:reminders-staging:f21bb21a-f5e9-4bce-afa5-7fa5b1ec8581",
"protocol": "https",
"raw_message_delivery": "false",
"topic_arn": "arn:aws:sns:us-east-1:679918342773:reminders-staging"
},
"meta": {},
"tainted": false
},
"deposed": [],
"provider": "provider.aws"
},
"aws_sqs_queue.integreat-mail": { "aws_sqs_queue.integreat-mail": {
"type": "aws_sqs_queue", "type": "aws_sqs_queue",
"depends_on": [ "depends_on": [
@@ -346,11 +403,11 @@
"type": "aws_caller_identity", "type": "aws_caller_identity",
"depends_on": [], "depends_on": [],
"primary": { "primary": {
"id": "2018-04-10 05:26:29.468970177 +0000 UTC", "id": "2018-05-12 00:10:04.257096257 +0000 UTC",
"attributes": { "attributes": {
"account_id": "679918342773", "account_id": "679918342773",
"arn": "arn:aws:iam::679918342773:user/bryce", "arn": "arn:aws:iam::679918342773:user/bryce",
"id": "2018-04-10 05:26:29.468970177 +0000 UTC", "id": "2018-05-12 00:10:04.257096257 +0000 UTC",
"user_id": "AIDAJPUJFTOKO4IRADMV4" "user_id": "AIDAJPUJFTOKO4IRADMV4"
}, },
"meta": {}, "meta": {},