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

Merge branch 'master' into add-general-ledger

Browse Source
This commit is contained in:
Bryce Covert
2019-04-11 19:48:09 -07:00
parent 9549afb3ef 27e9456891
commit effbff04c6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cljs/auto_ap/subs.cljs
View File

@@ -38,6 +38,13 @@
[] []
clients)))) clients))))
(re-frame/reg-sub
::real-bank-accounts
:<- [::client]
(fn [client]
(->> client :bank-accounts (filter #(= (:type %) :check)) (sort-by :sort-order))))
(re-frame/reg-sub (re-frame/reg-sub
::clients-by-id ::clients-by-id
(fn [db] (fn [db]

4
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -147,7 +147,7 @@
:db (-> db :db (-> db
(forms/stop-form ::new-invoice) (forms/stop-form ::new-invoice)
(update-in [::invoice-page :print-checks-shown?] #(not %) ) (update-in [::invoice-page :print-checks-shown?] #(not %) )
(assoc-in [::handwrite-checks] {:bank-account-id (:id (first @(re-frame/subscribe [::subs/bank-accounts]))) (assoc-in [::handwrite-checks] {:bank-account-id (:id (first @(re-frame/subscribe [::subs/real-bank-accounts])))
:invoices invoices } ))}))) :invoices invoices } ))})))
(re-frame/reg-event-db (re-frame/reg-event-db
@@ -630,7 +630,7 @@
:field :bank-account-id :field :bank-account-id
:event change-event :event change-event
:subscription handwrite-checks} :subscription handwrite-checks}
(for [{:keys [id number name]} (->> current-client :bank-accounts (filter #(= (:type %) :check)) (sort-by :sort-order))] (for [{:keys [id number name]} @(re-frame/subscribe [::subs/real-bank-accounts])]
^{:key id} [:option {:value id} name])]]]] ^{:key id} [:option {:value id} name])]]]]