diff --git a/src/clj/auto_ap/graphql/ledger.clj b/src/clj/auto_ap/graphql/ledger.clj index 63309729..1a0ba961 100644 --- a/src/clj/auto_ap/graphql/ledger.clj +++ b/src/clj/auto_ap/graphql/ledger.clj @@ -3,7 +3,6 @@ [auto-ap.datomic :refer [audit-transact-batch conn pull-many remove-nils]] [auto-ap.datomic.accounts :as a] - [auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.ledger :as l] [auto-ap.graphql.utils :refer [->graphql @@ -11,15 +10,18 @@ assert-admin assert-can-see-client attach-tracing-resolvers + extract-client-ids result->page]] [auto-ap.ledger :refer [build-account-lookup]] [auto-ap.ledger.reports :as l-reports] + [auto-ap.logging :as alog] [auto-ap.parse.util :as parse] [auto-ap.pdf.ledger :refer [print-balance-sheet print-cash-flows print-journal-detail-report print-pnl]] + [auto-ap.solr :as solr] [auto-ap.time :as atime] [auto-ap.utils :refer [by dollars=]] [clj-time.coerce :as coerce] @@ -28,9 +30,7 @@ [clojure.tools.logging :as log] [com.brunobonacci.mulog :as mu] [datomic.api :as dc] - [iol-ion.tx :refer [random-tempid]] - [auto-ap.solr :as solr] - [auto-ap.logging :as alog]) + [iol-ion.tx :refer [random-tempid]]) (:import (org.apache.commons.codec.binary Base64))) @@ -310,7 +310,9 @@ (->graphql result))) (defn balance-sheet-pdf [context args value] - (let [data (get-balance-sheet context args value) + (let [valid-clients (extract-client-ids (:clients context) + (:client_ids args)) + data (get-balance-sheet context args value) result (print-balance-sheet (:id context) args data)] (->graphql result))) diff --git a/src/clj/auto_ap/graphql/utils.clj b/src/clj/auto_ap/graphql/utils.clj index 56a4497c..fec4e274 100644 --- a/src/clj/auto_ap/graphql/utils.clj +++ b/src/clj/auto_ap/graphql/utils.clj @@ -182,7 +182,7 @@ (sequential? x) - (map x coerce-client-ids) + (mapcat coerce-client-ids x) :else [])) diff --git a/src/clj/auto_ap/pdf/ledger.clj b/src/clj/auto_ap/pdf/ledger.clj index b651d75f..a4070730 100644 --- a/src/clj/auto_ap/pdf/ledger.clj +++ b/src/clj/auto_ap/pdf/ledger.clj @@ -153,7 +153,7 @@ args (assoc args :periods (filter identity (cond-> [(:date args)] (:include-comparison args) (conj (:comparison-date args))))) - clients (pull-many (dc/db conn) [:client/code :client/name :db/id] [(:client-id args)]) + clients (pull-many (dc/db conn) [:client/code :client/name :db/id] (:client-ids args)) data (concat (->> (:balance-sheet-accounts data) (map (fn [b] (assoc b @@ -167,7 +167,6 @@ report (l-reports/summarize-balance-sheet pnl-data) output-stream (ByteArrayOutputStream.)] - (log/info report) (pdf/pdf (-> [{:left-margin 10 :right-margin 10 :top-margin 15 :bottom-margin 15 :size :letter diff --git a/src/clj/auto_ap/routes/graphql.clj b/src/clj/auto_ap/routes/graphql.clj index 441fe6d7..048d36df 100644 --- a/src/clj/auto_ap/routes/graphql.clj +++ b/src/clj/auto_ap/routes/graphql.clj @@ -23,7 +23,6 @@ (let [variables (some-> (query-params "variables") edn/read-string) body (some-> r :body slurp)] - (println "CLIENTS" clients) {:status 200 :body (pr-str (ql/query (:identity r) (if (= request-method :get) (query-params "query") body) (assoc variables diff --git a/src/cljs/auto_ap/views/pages/ledger/balance_sheet.cljs b/src/cljs/auto_ap/views/pages/ledger/balance_sheet.cljs index 86fc526a..532ed631 100644 --- a/src/cljs/auto_ap/views/pages/ledger/balance_sheet.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/balance_sheet.cljs @@ -97,7 +97,7 @@ NOTE: Please review the transactions we may have question for you here: https:// :body [:div [:div "Click " [:a {:href (-> result :balance-sheet-pdf :url) :target "_new"} "here"] " to view it."] - (when (seq (:emails client)) + (when (and (seq (:emails client)) @(re-frame/subscribe [::subs/is-admin?])) [:div "Once you've confirmed you're happy with it, click " [:a {:href (str "mailto:" (str/join ";" (map :email (:emails client))) "?body=" (email-body (-> result :balance-sheet-pdf :url)) "&subject=" (-> result :balance-sheet-pdf :name) " is ready")} @@ -235,9 +235,7 @@ NOTE: Please review the transactions we may have question for you here: https:// [date-picker {:output :cljs-date}]])]] [:div.level-right [:div.buttons - - (when @(re-frame/subscribe [::subs/is-admin?]) - [:button.button.is-secondary {:on-click (dispatch-event [::export-pdf])} "Export"]) + [:button.button.is-secondary {:on-click (dispatch-event [::export-pdf])} "Export"] [:button.button.is-primary "Run"]]]] [:div.report-control-detail {:ref (fn [el] (when (not= @!box el) diff --git a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs index c4ecc351..6b584ece 100644 --- a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs @@ -112,7 +112,7 @@ NOTE: Please review the transactions we may have question for you here: https:// :body [:div [:div "Click " [:a {:href (-> result :profit-and-loss-pdf :url) :target "_new"} "here"] " to view it."] - (when (and single-client? (seq client-emails)) + (when (and single-client? (seq client-emails) @(re-frame/subscribe [::subs/is-admin?])) [:div "Once you've confirmed you're happy with it, click " [:a {:href (str "mailto:" (str/join ";" (map :email client-emails)) "?body=" (email-body (-> result :profit-and-loss-pdf :url)) "&subject=" (-> result :profit-and-loss-pdf :name) " is ready")} @@ -402,8 +402,7 @@ NOTE: Please review the transactions we may have question for you here: https:// [:div.level-right [:div.buttons - (when @(re-frame/subscribe [::subs/is-admin?]) - [:button.button.is-secondary {:on-click (dispatch-event [::export-pdf])} "Export"]) + [:button.button.is-secondary {:on-click (dispatch-event [::export-pdf])} "Export"] [:button.button.is-primary "Run"]] ]] diff --git a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs index 559f2882..44bf90ad 100644 --- a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs @@ -94,7 +94,7 @@ NOTE: Please review the transactions we may have question for you here: https:// :body [:div [:div "Click " [:a {:href (-> result :journal-detail-report-pdf :url) :target "_new"} "here"] " to view it."] - (when (and single-client? (seq client-emails)) + (when (and single-client? (seq client-emails) @(re-frame/subscribe [::subs/is-admin?])) [:div "Once you've confirmed you're happy with it, click " [:a {:href (str "mailto:" (str/join ";" (map :email client-emails)) "?body=" (email-body (-> result :journal-detail-report-pdf :url)) "&subject=" (-> result :journal-detail-report-pdf :name) " is ready")} @@ -181,8 +181,7 @@ NOTE: Please review the transactions we may have question for you here: https:// [date-picker {:output :cljs-date}]]] [:div.level-right [:div.buttons - (when @(re-frame/subscribe [::subs/is-admin?]) - [:button.button.is-secondary {:on-click (dispatch-event [::export-pdf])} "Export"]) + [:button.button.is-secondary {:on-click (dispatch-event [::export-pdf])} "Export"] [:button.button.is-primary "Run"]]]]] [:div.report-control-detail {:ref (fn [el] (when (not= @!box el)