added a page to see the accounts.
This commit is contained in:
@@ -11,8 +11,7 @@
|
|||||||
(:account_set args) (merge-query {:query {:in ['?account-set]
|
(:account_set args) (merge-query {:query {:in ['?account-set]
|
||||||
:where [['?e :account/account-set '?account-set]]}
|
:where [['?e :account/account-set '?account-set]]}
|
||||||
:args [(:account_set args)]}))]
|
:args [(:account_set args)]}))]
|
||||||
(doto (->>
|
(->>
|
||||||
(d/query query)
|
(d/query query)
|
||||||
(map first)
|
(map first)
|
||||||
(->graphql ))
|
(->graphql ))))
|
||||||
println)))
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
[:address [:street1 :street2 :city :state :zip]]]]
|
[:address [:street1 :street2 :city :state :zip]]]]
|
||||||
[:vendor
|
[:vendor
|
||||||
[:id :name :default-expense-account [:primary-contact [:name :phone :email :id]] [:secondary-contact [:id :name :phone :email]] :print-as :invoice-reminder-schedule :code]]
|
[:id :name :default-expense-account [:primary-contact [:name :phone :email :id]] [:secondary-contact [:id :name :phone :email]] :print-as :invoice-reminder-schedule :code]]
|
||||||
[:accounts [:numeric-code :name :type :account_set]]]}
|
[:accounts [:numeric-code :name :type :account_set :id]]]}
|
||||||
:on-success [::received-initial]}}))))
|
:on-success [::received-initial]}}))))
|
||||||
(def vendor-query
|
(def vendor-query
|
||||||
[:id :name :default-expense-account
|
[:id :name :default-expense-account
|
||||||
@@ -68,17 +68,19 @@
|
|||||||
[:id :name :code [:address [:street1 :street2 :city :state :zip]] [:bank-accounts [:id :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id] ]]]
|
[:id :name :code [:address [:street1 :street2 :city :state :zip]] [:bank-accounts [:id :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id] ]]]
|
||||||
[:vendor
|
[:vendor
|
||||||
[:id :name :default-expense-account [:primary-contact [:name :phone :email :id]] [:secondary-contact [:id :name :phone :email]] :print-as :invoice-reminder-schedule :code]]
|
[:id :name :default-expense-account [:primary-contact [:name :phone :email :id]] [:secondary-contact [:id :name :phone :email]] :print-as :invoice-reminder-schedule :code]]
|
||||||
[:accounts [:numeric-code :name :type :account_set]]]}
|
[:accounts [:numeric-code :name :type :account_set :id]]]}
|
||||||
|
|
||||||
:on-success [::received-initial]}
|
:on-success [::received-initial]}
|
||||||
:db (assoc db :user (assoc user :token token))}))
|
:db (assoc db :user (assoc user :token token))}))
|
||||||
|
|
||||||
(re-frame/reg-event-db
|
(re-frame/reg-event-db
|
||||||
::received-initial
|
::received-initial
|
||||||
(fn [db [_ {clients :client vendors :vendor :as x}]]
|
(fn [db [_ {accounts :accounts clients :client vendors :vendor :as x}]]
|
||||||
|
|
||||||
(-> db
|
(-> db
|
||||||
(assoc :clients (by :id clients) )
|
(assoc :clients (by :id clients) )
|
||||||
(assoc :vendors (by :id vendors) )
|
(assoc :vendors (by :id vendors) )
|
||||||
|
(assoc :accounts accounts )
|
||||||
(assoc :client (when (= 1 (count clients)) (->> clients first :id ))))))
|
(assoc :client (when (= 1 (count clients)) (->> clients first :id ))))))
|
||||||
|
|
||||||
(re-frame/reg-event-db
|
(re-frame/reg-event-db
|
||||||
@@ -121,7 +123,7 @@
|
|||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::set-active-page
|
::set-active-page
|
||||||
(fn [{:keys [db]} [_ handler params]]
|
(fn [{:keys [db]} [_ handler params]]
|
||||||
(println "PARAMS" params)
|
|
||||||
(if (and (not= :login handler) (not (:user db)))
|
(if (and (not= :login handler) (not (:user db)))
|
||||||
{:redirect "/login"
|
{:redirect "/login"
|
||||||
:db (assoc db :active-page :login
|
:db (assoc db :active-page :login
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
"admin/" {"" :admin
|
"admin/" {"" :admin
|
||||||
"clients" :admin-clients
|
"clients" :admin-clients
|
||||||
"users" :admin-users
|
"users" :admin-users
|
||||||
|
"accounts" :admin-accounts
|
||||||
"reminders" :admin-reminders
|
"reminders" :admin-reminders
|
||||||
"vendors" :admin-vendors
|
"vendors" :admin-vendors
|
||||||
"excel-import" :admin-excel-import
|
"excel-import" :admin-excel-import
|
||||||
|
|||||||
@@ -15,6 +15,11 @@
|
|||||||
(when (:user db)
|
(when (:user db)
|
||||||
(sort-by :name (vals (:clients db))))))
|
(sort-by :name (vals (:clients db))))))
|
||||||
|
|
||||||
|
(re-frame/reg-sub
|
||||||
|
::accounts
|
||||||
|
(fn [db]
|
||||||
|
(:accounts db)))
|
||||||
|
|
||||||
(re-frame/reg-sub
|
(re-frame/reg-sub
|
||||||
::bank-accounts
|
::bank-accounts
|
||||||
:<- [::clients]
|
:<- [::clients]
|
||||||
|
|||||||
@@ -41,6 +41,12 @@
|
|||||||
[:i {:class "fa fa-envelope-o"}]]
|
[:i {:class "fa fa-envelope-o"}]]
|
||||||
[:span {:class "name"} "Users"]]]
|
[:span {:class "name"} "Users"]]]
|
||||||
|
|
||||||
|
[:li.menu-item
|
||||||
|
[:a {:href (bidi/path-for routes/routes :admin-accounts), :class (str "item" (active-when ap = :admin-accounts))}
|
||||||
|
[:span {:class "icon"}
|
||||||
|
[:i {:class "fa fa-envelope-o"}]]
|
||||||
|
[:span {:class "name"} "Accounts"]]]
|
||||||
|
|
||||||
|
|
||||||
[:li.menu-item
|
[:li.menu-item
|
||||||
[:a {:href (bidi/path-for routes/routes :admin-yodlee), :class (str "item" (active-when ap = :admin-yodlee))}
|
[:a {:href (bidi/path-for routes/routes :admin-yodlee), :class (str "item" (active-when ap = :admin-yodlee))}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
[auto-ap.views.pages.admin :refer [admin-page]]
|
[auto-ap.views.pages.admin :refer [admin-page]]
|
||||||
[auto-ap.views.pages.home :refer [home-page]]
|
[auto-ap.views.pages.home :refer [home-page]]
|
||||||
[auto-ap.views.pages.admin.clients :refer [admin-clients-page]]
|
[auto-ap.views.pages.admin.clients :refer [admin-clients-page]]
|
||||||
|
[auto-ap.views.pages.admin.accounts :refer [admin-accounts-page]]
|
||||||
[auto-ap.views.pages.admin.vendors :refer [admin-vendors-page]]
|
[auto-ap.views.pages.admin.vendors :refer [admin-vendors-page]]
|
||||||
[auto-ap.views.pages.admin.excel-import :refer [admin-excel-import-page]]
|
[auto-ap.views.pages.admin.excel-import :refer [admin-excel-import-page]]
|
||||||
[auto-ap.views.pages.admin.users :refer [admin-users-page]]
|
[auto-ap.views.pages.admin.users :refer [admin-users-page]]
|
||||||
@@ -60,6 +61,9 @@
|
|||||||
(defmethod page :admin-yodlee [_]
|
(defmethod page :admin-yodlee [_]
|
||||||
(admin-yodlee-page))
|
(admin-yodlee-page))
|
||||||
|
|
||||||
|
(defmethod page :admin-accounts [_]
|
||||||
|
(admin-accounts-page))
|
||||||
|
|
||||||
(defmethod page :index [_]
|
(defmethod page :index [_]
|
||||||
(home-page)
|
(home-page)
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user