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

minor positive tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2022-07-09 06:17:27 -07:00
parent f304a544fd
commit 8316f35072
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/datomic/clients.clj
View File

@@ -31,6 +31,7 @@
{:client/square-integration-status [:integration-status/message {:client/square-integration-status [:integration-status/message
:integration-status/last-attempt :integration-status/last-attempt
:integration-status/last-updated :integration-status/last-updated
:db/id
{:integration-status/state [:db/ident]}]} {:integration-status/state [:db/ident]}]}
{:client/address [*]} {:client/address [*]}
{:client/square-locations [:square-location/square-id {:client/square-locations [:square-location/square-id
@@ -42,6 +43,7 @@
:bank-account/plaid-account [:plaid-account/name :db/id :plaid-account/number :plaid-account/balance] :bank-account/plaid-account [:plaid-account/name :db/id :plaid-account/number :plaid-account/balance]
:bank-account/intuit-bank-account [:intuit-bank-account/name :intuit-bank-account/external-id :db/id] :bank-account/intuit-bank-account [:intuit-bank-account/name :intuit-bank-account/external-id :db/id]
:bank-account/integration-status [:integration-status/message :bank-account/integration-status [:integration-status/message
:db/id
:integration-status/last-attempt :integration-status/last-attempt
:integration-status/last-updated :integration-status/last-updated
{:integration-status/state [:db/ident]}]} {:integration-status/state [:db/ident]}]}

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

@@ -115,7 +115,8 @@
:accounts {:type '(list :yodlee_account)}}} :accounts {:type '(list :yodlee_account)}}}
:integration_status :integration_status
{:fields {:last_attempt {:type :iso_date} {:fields {:id {:type :id}
:last_attempt {:type :iso_date}
:last_updated {:type :iso_date} :last_updated {:type :iso_date}
:message {:type 'String} :message {:type 'String}
:state {:type :integration_state}}} :state {:type :integration_state}}}

2
src/clj/auto_ap/square/core.clj
View File

@@ -49,7 +49,7 @@
(defn fetch-catalog [client i] (defn fetch-catalog [client i]
(if i (if i
(try (try
(log/info "looking up catalog for" (str "https://connect.squareup.com/v2/catalog/object/" i)) (log/trace "looking up catalog for" (str "https://connect.squareup.com/v2/catalog/object/" i))
(->> (client/get (str "https://connect.squareup.com/v2/catalog/object/" i) (->> (client/get (str "https://connect.squareup.com/v2/catalog/object/" i)
{:headers (client-base-headers client) {:headers (client-base-headers client)
:query-params {"include_related_items" "true"} :query-params {"include_related_items" "true"}

4
src/cljs/auto_ap/events.cljs
View File

@@ -16,12 +16,12 @@
(defn client-query [token] (defn client-query [token]
(cond-> [:id :name :signature-file :code :email :matches :week-a-debits :week-a-credits :week-b-debits :week-b-credits :locations :locked-until :square-auth-token (cond-> [:id :name :signature-file :code :email :matches :week-a-debits :week-a-credits :week-b-debits :week-b-credits :locations :locked-until :square-auth-token
[:square-integration-status [:last-updated :last-attempt :message :state]] [:square-integration-status [:last-updated :last-attempt :message :state :id]]
[:square-locations [:square-id :id :name :client-location]] [:square-locations [:square-id :id :name :client-location]]
[:emails [:id :email :description]] [:emails [:id :email :description]]
[:location-matches [:id :location :match]] [:location-matches [:id :location :match]]
[:bank-accounts [:id :start-date :numeric-code :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id [:bank-accounts [:id :start-date :numeric-code :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id
[:integration-status [:last-updated :last-attempt :message :state]] [:integration-status [:last-updated :last-attempt :message :state :id]]
[:yodlee-account [:name :id :number]] [:yodlee-account [:name :id :number]]
[:plaid-account [:name :id :number]] [:plaid-account [:name :id :number]]
[:intuit-bank-account [:name :id :external-id]] [:intuit-bank-account [:name :id :external-id]]

5
src/cljs/auto_ap/views/pages/admin/clients/table.cljs
View File

@@ -100,7 +100,7 @@
[grid/cell {} name] [grid/cell {} name]
[grid/cell {} code] [grid/cell {} code]
[grid/cell {} (str/join ", " locations)] [grid/cell {} (str/join ", " locations)]
[grid/cell {} [:div.tags [grid/cell {:class "expandable"} [:div.tags
[:div.tag (or (some-> locked-until date->str (#(str "Locked " %))) "Not locked")] [:div.tag (or (some-> locked-until date->str (#(str "Locked " %))) "Not locked")]
[integration-status-badge "Square" square-integration-status] [integration-status-badge "Square" square-integration-status]
@@ -108,7 +108,8 @@
(for [bank-account bank-accounts (for [bank-account bank-accounts
:let [code (:code bank-account) :let [code (:code bank-account)
integration-status (:integration-status bank-account)] integration-status (:integration-status bank-account)]
:when integration-status] :when (:id integration-status)]
^{:key (:id integration-status)}
[integration-status-badge code integration-status])]]] [integration-status-badge code integration-status])]]]
[grid/cell {} email] [grid/cell {} email]
[grid/cell {} [:div.buttons [buttons/fa-icon {:event [::setup-sales-queries id] [grid/cell {} [:div.buttons [buttons/fa-icon {:event [::setup-sales-queries id]