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

Checks now have a status that gets updated

Browse Source
This commit is contained in:
Bryce
2018-06-30 10:24:41 -07:00
parent e7515e5a00
commit 05c9fa8fd8
6 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
migrator/migrations/1530379134-DOWN-add-check-status.sql Normal file
View File

@@ -0,0 +1,2 @@
-- 1530379134 DOWN add-check-status
alter table checks drop column status;

2
migrator/migrations/1530379134-UP-add-check-status.sql Normal file
View File

@@ -0,0 +1,2 @@
-- 1530379134 UP add-check-status
alter table checks add column status varchar(255) default 'pending';

6
src/clj/auto_ap/db/checks.clj
View File

@@ -85,3 +85,9 @@
(defn count-graphql [args]
(:count (first (query
(assoc (base-graphql args) :select [:%count.*])))))
(defn update! [row]
(j/update! (get-conn)
:checks
(-> row (fields->data) (clj->db))
["id = ?" (:id row)]))

3
src/clj/auto_ap/graphql.clj
View File

@@ -69,7 +69,8 @@
:resolve :get-company-for-check}
:date {:type 'String}
:s3_url {:type 'String}
:check_number {:type 'Int}}}
:check_number {:type 'Int}
:status {:type 'String}}}
:transaction {:fields {:id {:type 'Int}
:amount {:type 'String}

9
src/clj/auto_ap/yodlee/import.clj
View File

@@ -52,7 +52,9 @@
transaction
check-number (extract-check-number transaction)
company-id (account->company account-id)
bank-account-id (yodlee-account-id->bank-account-id account-id)]]
bank-account-id (yodlee-account-id->bank-account-id account-id)
check-id (transaction->check-id transaction check-number company-id bank-account-id)
]]
(try
(transactions/upsert!
@@ -68,7 +70,10 @@
:company-id company-id
:check-number check-number
:bank-account-id (yodlee-account-id->bank-account-id account-id)
:check-id (transaction->check-id transaction check-number company-id bank-account-id)
:check-id check-id
})
(when check-id
(checks/update! {:id check-id :status "cleared"}))
(catch Exception e
(println e))))))

12
src/cljs/auto_ap/views/pages/checks.cljs
View File

@@ -36,7 +36,7 @@
:graphql {:token (-> cofx :db :user)
:query-obj {:venia/queries [[:check_page
(assoc params :company-id (:id @(re-frame/subscribe [::subs/company])))
[[:checks [:id :amount :check_number :s3_url :date [:vendor [:name :id]] [:company [:name :id]]]]
[[:checks [:id :status :amount :check_number :s3_url :date [:vendor [:name :id]] [:company [:name :id]]]]
:total
:start
:end]]]}
@@ -104,6 +104,13 @@
:sort-by sort-by
:asc asc}
"Amount"]
[sorted-column {:on-sort opc
:style {:width "8em" :cursor "pointer"}
:sort-key "status"
:sort-by sort-by
:asc asc}
"Status"]
[:th {:style {:width "10em"}} "" ]]]
@@ -112,7 +119,7 @@
[:tr
[:td {:col-span 5}
[:i.fa.fa-spin.fa-spinner]]]
(for [{:keys [company s3-url checks check-number date amount id vendor] :as i} (:checks @check-page)]
(for [{:keys [company s3-url checks check-number date amount id vendor status] :as i} (:checks @check-page)]
^{:key id}
[:tr {:class (:class i)}
@@ -121,6 +128,7 @@
[:td check-number]
[:td (date->str date) ]
[:td (gstring/format "$%.2f" amount )]
[:td status]
[:td
(if s3-url
[:a.tag {:href s3-url :target "_new"} [:i.fa.fa-money-check] [:span.icon [:i.fa.fa-money]] (str " " check-number " (" (gstring/format "$%.2f" amount ) ")")]