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

progress on linkage

Browse Source
This commit is contained in:
Bryce Covert
2021-01-23 17:27:41 -08:00
parent 2d8483f2e3
commit 88b0dcde3b
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cljs/auto_ap/views/pages/transactions/common.cljs
View File

@@ -14,6 +14,6 @@
[:forecast-match [:id :identifier]] [:forecast-match [:id :identifier]]
:status :status
:description_original :description_original
[:payment [:check_number :s3_url]] [:payment [:check_number :s3_url :id]]
[:client [:name :id]] [:client [:name :id]]
[:bank-account [:name :yodlee-account-id]]]) [:bank-account [:name :yodlee-account-id]]])

25
src/cljs/auto_ap/views/pages/transactions/table.cljs
View File

@@ -13,7 +13,10 @@
[re-frame.core :as re-frame] [re-frame.core :as re-frame]
[auto-ap.views.components.buttons :as buttons] [auto-ap.views.components.buttons :as buttons]
[auto-ap.status :as status] [auto-ap.status :as status]
[auto-ap.views.pages.data-page :as data-page])) [auto-ap.views.pages.data-page :as data-page]
[bidi.bidi :as bidi]
[cemerick.url :as url]
[auto-ap.routes :as routes]))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::editing-matches-found ::editing-matches-found
@@ -111,6 +114,24 @@
:class (status/class-for (get states id)) :class (status/class-for (get states id))
:icon "fa-pencil"}] :icon "fa-pencil"}]
(when payment (when payment
[:a.tag {:href (:s3-url payment) :target "_new"} [:a.button {:href (str (bidi/path-for routes/routes :payments )
"?"
(url/map->query {:exact-match-id (:id payment)}))}
[:span.icon
[:i.fa.fa-money]]
#_(if (:check-number (:payment payment))
(str "Check " (:check-number (:payment payment))
" (" (gstring/format "$%.2f" (:amount payment) ) ")"
(when (= :cleared (:status (:payment payment)))
(str " - " (:post-date (:transaction (:payment payment))))))
(str "Debit (" (gstring/format "$%.2f" (:amount payment) ) ") "
(when (= :cleared (:status (:payment payment)))
(str " - " (:post-date (:transaction (:payment payment)))))
(when (= :cleared (:status (:payment payment)))
(str " - " (:post-date (:transaction (:payment payment))))))) ]
#_[:a.tag {:href (:s3-url payment) :target "_new"}
[:span.icon [:i.fa.fa-money]] [:span.icon [:i.fa.fa-money]]
(str " " (:check-number payment) " (" (gstring/format "$%.2f" amount ) ")")])]]])]]])) (str " " (:check-number payment) " (" (gstring/format "$%.2f" amount ) ")")])]]])]]]))