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

minor tweak for parsing.

Browse Source
This commit is contained in:
Bryce Covert
2022-12-12 13:02:23 -08:00
parent 387a153be5
commit 89c32a95fa
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/clj/auto_ap/jobs/register_invoice_import.clj
View File

@@ -99,6 +99,12 @@
{:db/id invoice-id {:db/id invoice-id
:invoice/total target-total}) :invoice/total target-total})
(when (and (not (dollars= 0.0 target-total))
(= :invoice-status/voided (:db/ident (:invoice/status invoice))))
{:db/id invoice-id
:invoice/total target-total
:invoice/status :invoice-status/paid})
(when new-account? (when new-account?
{:db/id invoice-id {:db/id invoice-id
:invoice/expense-accounts invoice-expense-account-id}) :invoice/expense-accounts invoice-expense-account-id})

22
src/cljs/auto_ap/views/pages/ledger/external_import.cljs
View File

@@ -170,11 +170,23 @@
[:button.button.is-medium {:on-click (fn [e] [:button.button.is-medium {:on-click (fn [e]
(.preventDefault e) (.preventDefault e)
(on-change (on-change
(cond->> (str/split @text-form #"\n") (persistent!
@include-headers (drop 1) (reduce
true (mapv #(->> (str/split % "\t") (fn [acc row]
(map (fn [[_ k] v] [k v]) headings) (let [values (str/split row "\t")]
(into {}))))))} (conj! acc
(loop [row (transient {})
[[_ heading] & headings] headings
[v & values] values]
(if heading
(recur
(assoc! row heading v)
headings
values)
(persistent! row))))))
(transient [])
(cond->> (str/split @text-form #"\n")
@include-headers (drop 1))))))}
"Parse"] "Parse"]
])]]))) ])]])))