payments use new grid. Still need to update void button

This commit is contained in:
Bryce Covert
2020-08-08 08:00:15 -07:00
parent e0222bac48
commit 32152ea924
2 changed files with 75 additions and 125 deletions

View File

@@ -18,7 +18,9 @@
[auto-ap.views.pages.payments.side-bar :as side-bar]
[auto-ap.views.pages.payments.table :as table]
[auto-ap.views.pages.check :as check]
[auto-ap.subs :as subs]))
[auto-ap.subs :as subs]
[auto-ap.status :as status]
[vimsical.re-frame.fx.track :as track]))
@@ -28,48 +30,35 @@
(fn [db]
(-> db ::payment-page)))
(re-frame/reg-sub
::last-params
(fn [db]
(-> db ::last-params)))
(re-frame/reg-sub
::params
:<- [::last-params]
:<- [::subs/client]
:<- [::side-bar/filter-params]
:<- [::table/table-params]
(fn [[last-params client filter-params table-params]]
(let [params (cond-> {}
client (assoc :client-id (:id client))
(seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))]
(when (not= last-params params)
(re-frame/dispatch [::params-change]))
params)))
(fn [[ client filter-params table-params]]
(cond-> {}
client (assoc :client-id (:id client))
(seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))))
(re-frame/reg-event-fx
::params-change
[with-user (re-frame/inject-cofx ::inject/sub [::params])]
(fn [{:keys [user db ::params]}[_ ]]
(when (not= (::last-params db) params)
{:db (-> db
(assoc-in [:status :loading] true)
(assoc-in [::last-params] params))
:graphql {:token user
:query-obj {:venia/queries [[:payment_page
params
[[:payments [:id :status :amount :type :check_number :s3_url
[:bank-account [:name]]
:date [:vendor [:name :id]] [:client [:name :id]]
[:invoices [:invoice-id [:invoice [:invoice-number]]]]]]
:total
:start
:end]]]}
:on-success [::received]
:on-error [::events/page-failed]}
:set-uri-params (dissoc params
:client-id)})))
[with-user]
(fn [{:keys [user db ]}[_ params]]
{:graphql {:token user
:owns-state {:single ::page}
:query-obj {:venia/queries [[:payment_page
params
[[:payments [:id :status :amount :type :check_number :s3_url
[:bank-account [:name]]
:date [:vendor [:name :id]] [:client [:name :id]]
[:invoices [:invoice-id [:invoice [:invoice-number]]]]]]
:total
:start
:end]]]}
:on-success [::received]}
:set-uri-params (dissoc params :client-id)}))
(re-frame/reg-event-fx
::void-check
@@ -105,21 +94,30 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
{:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::side-bar/settled-filters ::payment-page)}))
{:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::side-bar/settled-filters ::payment-page)
::track/dispose {:id ::params} }))
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]} _]
{::track/register {:id ::params
:subscription [::params]
:event-fn (fn [params] [::params-change params])}}))
(defn content []
(let [params @(re-frame/subscribe [::params])]
[:div
[:h1.title "Payments"]
[table/table {:id :payments
:payment-page (re-frame/subscribe [::payment-page])
:status (re-frame/subscribe [::subs/status])
:payment-page @(re-frame/subscribe [::payment-page])
:status @(re-frame/subscribe [::status/single ::page])
:void-event [::void-check]}]]))
(defn payments-page []
(reagent/create-class
{:display-name "payments-page"
:component-will-unmount #(re-frame/dispatch [::unmounted])
:component-did-mount #(re-frame/dispatch [::mounted])
:reagent-render
(fn []
[side-bar-layout {:side-bar [side-bar/side-bar]