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

simple tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2020-04-17 21:50:31 -07:00
parent a90a60f210
commit 46809abaf9
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cljs/auto_ap/views/components/invoice_table.cljs
View File

@@ -32,7 +32,6 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::toggle-expense-accounts ::toggle-expense-accounts
(fn [{:keys [db] } [_ invoice-id]] (fn [{:keys [db] } [_ invoice-id]]
(println "toggling")
{:db {:db
(update-in db [::visible-expense-accounts] (fn [i] (if (= i invoice-id) nil invoice-id) ))})) (update-in db [::visible-expense-accounts] (fn [i] (if (= i invoice-id) nil invoice-id) ))}))

5
src/cljs/auto_ap/views/components/invoices/side_bar.cljs
View File

@@ -17,6 +17,11 @@
[:div [:div
[:div [:p.menu-label "Type"] [:div [:p.menu-label "Type"]
[:ul.menu-list [:ul.menu-list
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :invoices)
:class [(active-when ap = :invoices)]}
[:span {:class "icon icon-accounting-invoice-mail" :style {:font-size "25px"}}]
[:span {:class "name"} "All Invoices"]]]
[:li.menu-item [:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :unpaid-invoices) [:a.item {:href (bidi/path-for routes/routes :unpaid-invoices)
:class [(active-when ap = :unpaid-invoices)]} :class [(active-when ap = :unpaid-invoices)]}

2
src/cljs/auto_ap/views/main.cljs
View File

@@ -38,6 +38,8 @@
(defmethod page :voided-invoices [_] (defmethod page :voided-invoices [_]
(unpaid-invoices-page {:status "voided"})) (unpaid-invoices-page {:status "voided"}))
(defmethod page :invoices [_]
(unpaid-invoices-page {}))
(defmethod page :checks [_] (defmethod page :checks [_]
(checks-page)) (checks-page))

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

@@ -990,7 +990,7 @@
[:div [:em "Your payment was created."]] [:div [:em "Your payment was created."]]
])))) ]))))
(defn unpaid-invoices-content [{:keys [status]}] (defn unpaid-invoices-content [{:keys [status] :as params}]
(r/create-class {:display-name "unpaid-invoices-content" (r/create-class {:display-name "unpaid-invoices-content"
:component-will-unmount (fn [this] :component-will-unmount (fn [this]
(re-frame/dispatch [::unmount-invoices])) (re-frame/dispatch [::unmount-invoices]))
@@ -998,7 +998,7 @@
(let [{:keys [checked print-checks-shown? print-checks-loading? advanced-print-shown? vendor-filter]} @(re-frame/subscribe [::invoice-page]) (let [{:keys [checked print-checks-shown? print-checks-loading? advanced-print-shown? vendor-filter]} @(re-frame/subscribe [::invoice-page])
current-client @(re-frame/subscribe [::subs/client])] current-client @(re-frame/subscribe [::subs/client])]
[:div [:div
[:h1.title (str (str/capitalize status) " invoices")] [:h1.title (str (str/capitalize (or status "all")) " invoices")]
(when (= status "unpaid") (when (= status "unpaid")
[pay-button {:print-checks-shown? print-checks-shown? :checked-invoices checked :print-checks-loading? print-checks-loading?}]) [pay-button {:print-checks-shown? print-checks-shown? :checked-invoices checked :print-checks-loading? print-checks-loading?}])
@@ -1028,9 +1028,9 @@
])) ]))
:component-will-mount #(re-frame/dispatch-sync [::params-change {:status status}]) })) :component-will-mount #(re-frame/dispatch-sync [::params-change params]) }))
(defn unpaid-invoices-page [{:keys [status]}] (defn unpaid-invoices-page [params]
(let [{invoice-bar-active? :active?} @(re-frame/subscribe [::forms/form ::new-invoice])] (let [{invoice-bar-active? :active?} @(re-frame/subscribe [::forms/form ::new-invoice])]
[side-bar-layout {:side-bar [invoices-side-bar {} [side-bar-layout {:side-bar [invoices-side-bar {}
^{:key "extra-filter"} ^{:key "extra-filter"}
@@ -1042,7 +1042,7 @@
[:p.menu-label "Invoice #"] [:p.menu-label "Invoice #"]
[:div [:div
[invoice-number-filter]]]] [invoice-number-filter]]]]
:main [unpaid-invoices-content {:status status}] :main [unpaid-invoices-content params]
:bottom [:div [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor]) :bottom [:div [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor])
:save-event [::events/save-vendor] :save-event [::events/save-vendor]
:change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}] :change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]