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

test.

Browse Source
This commit is contained in:
Bryce Covert
2022-11-16 08:12:18 -08:00
parent 86532d2f74
commit 1e9d58c6d2
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/clj/auto_ap/graphql/ledger.clj
View File

@@ -512,7 +512,8 @@
c (d/pull (d/db conn) '[:client/locations] client-id) ] c (d/pull (d/db conn) '[:client/locations] client-id) ]
location (:client/locations c) location (:client/locations c)
category (:categories input) category (:categories input)
:let [all-journal-entries (->> (get-ledger-page context :let [category (<-graphql category)
all-journal-entries (->> (get-ledger-page context
{:filters {:client_id client-id {:filters {:client_id client-id
:location location :location location
:date_range (:date_range input) :date_range (:date_range input)
@@ -550,7 +551,7 @@
[(conj acc next-je) next-je])) [(conj acc next-je) next-je]))
[] []
(sort-by :date journal-entries)))]] (sort-by :date journal-entries)))]]
{:category category {:category (->graphql category)
:client_id client-id :client_id client-id
:location location :location location
:account (or account :account (or account
@@ -753,7 +754,10 @@
(def enums (def enums
{:ledger_category {:values [{:enum-value :sales} {:ledger_category {:values [{:enum-value :sales}
{:enum-value :cogs} {:enum-value :cogs}
{:enum-value :payroll}]}}) {:enum-value :payroll}
{:enum-value :controllable}
{:enum-value :fixed_overhead}
{:enum-value :ownership_controllable}]}})
(def resolvers (def resolvers

10
src/cljs/auto_ap/views/pages/ledger/profit_and_loss_detail.cljs
View File

@@ -48,7 +48,10 @@
:end (date->str (:end (:date-range (:data db))) standard)} :end (date->str (:end (:date-range (:data db))) standard)}
:categories [:sales :categories [:sales
:cogs :cogs
:payroll]} :payroll
:controllable
:fixed-overhead
:ownership-controllable]}
[[:categories [[:journal-entries [:description [[:categories [[:journal-entries [:description
:date :date
:debit :credit :location :running-balance :debit :credit :location :running-balance
@@ -110,7 +113,10 @@ NOTE: Please review the transactions we may have question for you here: https://
:end (date->str (:end (:date-range (:data db))) standard)} :end (date->str (:end (:date-range (:data db))) standard)}
:categories [:sales :categories [:sales
:cogs :cogs
:payroll]} :payroll
:controllable
:fixed-overhead
:ownership-controllable]}
[:url :name]]]} [:url :name]]]}
:on-success [::received-pdf]} :on-success [::received-pdf]}
:set-uri-params {:date-range (:date-range (:data db)) :set-uri-params {:date-range (:date-range (:data db))