From 46809abaf910b72859176a3548edff1a2d2de918 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 17 Apr 2020 21:50:31 -0700 Subject: [PATCH] simple tweaks. --- src/cljs/auto_ap/views/components/invoice_table.cljs | 1 - .../auto_ap/views/components/invoices/side_bar.cljs | 5 +++++ src/cljs/auto_ap/views/main.cljs | 2 ++ src/cljs/auto_ap/views/pages/unpaid_invoices.cljs | 10 +++++----- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/cljs/auto_ap/views/components/invoice_table.cljs b/src/cljs/auto_ap/views/components/invoice_table.cljs index 99e997f9..8477ce34 100644 --- a/src/cljs/auto_ap/views/components/invoice_table.cljs +++ b/src/cljs/auto_ap/views/components/invoice_table.cljs @@ -32,7 +32,6 @@ (re-frame/reg-event-fx ::toggle-expense-accounts (fn [{:keys [db] } [_ invoice-id]] - (println "toggling") {:db (update-in db [::visible-expense-accounts] (fn [i] (if (= i invoice-id) nil invoice-id) ))})) diff --git a/src/cljs/auto_ap/views/components/invoices/side_bar.cljs b/src/cljs/auto_ap/views/components/invoices/side_bar.cljs index 382093ad..4632af3f 100644 --- a/src/cljs/auto_ap/views/components/invoices/side_bar.cljs +++ b/src/cljs/auto_ap/views/components/invoices/side_bar.cljs @@ -17,6 +17,11 @@ [:div [:div [:p.menu-label "Type"] [: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 [:a.item {:href (bidi/path-for routes/routes :unpaid-invoices) :class [(active-when ap = :unpaid-invoices)]} diff --git a/src/cljs/auto_ap/views/main.cljs b/src/cljs/auto_ap/views/main.cljs index a4163e3f..9c87dd5f 100644 --- a/src/cljs/auto_ap/views/main.cljs +++ b/src/cljs/auto_ap/views/main.cljs @@ -38,6 +38,8 @@ (defmethod page :voided-invoices [_] (unpaid-invoices-page {:status "voided"})) +(defmethod page :invoices [_] + (unpaid-invoices-page {})) (defmethod page :checks [_] (checks-page)) diff --git a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs index 6f8774a3..12aa92cf 100644 --- a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs +++ b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs @@ -990,7 +990,7 @@ [: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" :component-will-unmount (fn [this] (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]) current-client @(re-frame/subscribe [::subs/client])] [:div - [:h1.title (str (str/capitalize status) " invoices")] + [:h1.title (str (str/capitalize (or status "all")) " invoices")] (when (= status "unpaid") [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])] [side-bar-layout {:side-bar [invoices-side-bar {} ^{:key "extra-filter"} @@ -1042,7 +1042,7 @@ [:p.menu-label "Invoice #"] [:div [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]) :save-event [::events/save-vendor] :change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]