merged.
This commit is contained in:
@@ -666,7 +666,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]))
|
||||
@@ -674,7 +674,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?}])
|
||||
@@ -704,9 +704,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 ::form/form])]
|
||||
[side-bar-layout {:side-bar [invoices-side-bar {}
|
||||
^{:key "extra-filter"}
|
||||
@@ -723,9 +723,8 @@
|
||||
[:p.menu-label "Invoice #"]
|
||||
[:div
|
||||
[invoice-number-filter]]]]
|
||||
:main [unpaid-invoices-content {:status status}]
|
||||
:main [unpaid-invoices-content params]
|
||||
:bottom [:div
|
||||
|
||||
[check-results-dialog]
|
||||
[print-checks-modal]
|
||||
[handwrite-checks-modal]
|
||||
|
||||
Reference in New Issue
Block a user