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

fixing checks to have company name, and invoice validation

Browse Source
This commit is contained in:
Bryce Covert
2020-09-04 21:36:20 -07:00
parent 85dec7a407
commit 4847917e6b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/graphql/checks.clj
View File

@@ -159,6 +159,7 @@
[:cell {:align :right :colspan 2} [:cell {:align :right :colspan 2}
"Check:\n" "Check:\n"
"Vendor:\n" "Vendor:\n"
"Company:\n"
"Bank Account:\n" "Bank Account:\n"
"Paid To:\n" "Paid To:\n"
"Amount:\n" "Amount:\n"
@@ -167,6 +168,7 @@
[:cell {:colspan 5} [:cell {:colspan 5}
[:paragraph check] [:paragraph check]
[:paragraph vendor-name] [:paragraph vendor-name]
[:paragraph (:client/name client)]
[:paragraph (:bank-account/bank-name bank-account)] [:paragraph (:bank-account/bank-name bank-account)]
[:paragraph paid-to] [:paragraph paid-to]
[:paragraph amount] [:paragraph amount]

7
src/clj/auto_ap/graphql/invoices.clj
View File

@@ -91,9 +91,14 @@
(defn add-invoice [context {{:keys [total invoice_number location client_id vendor_id vendor_name date] :as in} :invoice} value] (defn add-invoice [context {{:keys [total expense_accounts invoice_number location client_id vendor_id vendor_name date] :as in} :invoice} value]
(assert-no-conflicting in) (assert-no-conflicting in)
(assert-can-see-client (:id context) client_id) (assert-can-see-client (:id context) client_id)
(doseq [expense-account expense_accounts]
(when (empty? (:location expense-account))
(throw (ex-info "Expense account is missing location" {:validation-error "Expense account is missing location"})))
(when (nil? (:account_id expense-account))
(throw (ex-info "Expense account is missing account" {:validation-error "Expense account is missing account"}))))
(let [transaction-result (audit-transact [(add-invoice-transaction in)] (:id context))] (let [transaction-result (audit-transact [(add-invoice-transaction in)] (:id context))]
(-> (d-invoices/get-by-id (get-in transaction-result [:tempids "invoice"])) (-> (d-invoices/get-by-id (get-in transaction-result [:tempids "invoice"]))
(->graphql)))) (->graphql))))