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

fixing issue with accounts getting reset.

Browse Source
This commit is contained in:
BC
2019-02-19 07:52:42 -08:00
parent 9852db4627
commit b90d470664
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@
existing-ids (->> current-expense-accounts existing-ids (->> current-expense-accounts
(map :db/id) (map :db/id)
set) set)
deleted (set/difference existing-ids specified-ids) deleted (set/difference existing-ids specified-ids)
updated (map updated (map
(fn [{:keys [id expense_account_id amount location]}] (fn [{:keys [id expense_account_id amount location]}]

7
src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs
View File

@@ -83,7 +83,10 @@
:venia/queries [{:query/data [:edit-expense-accounts :venia/queries [{:query/data [:edit-expense-accounts
{:invoice-id id {:invoice-id id
:expense-accounts (map (fn [ea] {:id (when-not (string? (:id ea)) (:id ea)) :expense-accounts (map (fn [ea] {:id (if (clojure.string/includes? (:id ea) "new-")
nil
(:id ea)
)
:amount (:new-amount ea) :amount (:new-amount ea)
:location (:location ea) :location (:location ea)
:expense-account-id (:expense-account-id ea)}) :expense-account-id (:expense-account-id ea)})
@@ -101,7 +104,7 @@
(fn [db _] (fn [db _]
(let [{{{:keys [locations]} :client} :invoice} @(re-frame/subscribe [::change-expense-accounts])] (let [{{{:keys [locations]} :client} :invoice} @(re-frame/subscribe [::change-expense-accounts])]
(update-in db [::change-expense-accounts :invoice :expense-accounts] (update-in db [::change-expense-accounts :invoice :expense-accounts]
conj {:amount "0.0" :id (str (random-uuid)) :expense-account-id {} :location (first locations)})))) conj {:amount "0.0" :id (str "new-" (random-uuid)) :expense-account-id {} :location (first locations)}))))
(re-frame/reg-event-db (re-frame/reg-event-db
::remove-expense-account-split ::remove-expense-account-split