sales orders and transactions better.
This commit is contained in:
Bryce Covert
@@ -1,81 +1,66 @@
|
||||
(ns auto-ap.views.pages.transactions
|
||||
(:require [auto-ap.events :as events]
|
||||
(:require [auto-ap.effects.forward :as forward]
|
||||
[auto-ap.forms :as forms]
|
||||
[auto-ap.subs :as subs]
|
||||
[bidi.bidi :as bidi]
|
||||
[auto-ap.routes :as routes]
|
||||
[vimsical.re-frame.cofx.inject :as inject]
|
||||
[auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
|
||||
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
|
||||
[auto-ap.views.components.number-filter :refer [number-filter]]
|
||||
[auto-ap.views.components.vendor-filter :refer [vendor-filter]]
|
||||
[auto-ap.views.components.typeahead :refer [typeahead-entity]]
|
||||
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
|
||||
[auto-ap.views.components.modal :refer [action-modal]]
|
||||
[auto-ap.views.components.paginator :refer [paginator]]
|
||||
[auto-ap.views.components.sort-by-list :refer [sort-by-list]]
|
||||
[auto-ap.views.components.sorter :refer [sorted-column]]
|
||||
[auto-ap.views.pages.transactions.form :as edit]
|
||||
[auto-ap.views.pages.transactions.table :as table]
|
||||
[auto-ap.views.pages.transactions.common :refer [transaction-read]]
|
||||
[auto-ap.utils :refer [replace-by]]
|
||||
[auto-ap.views.components.layouts
|
||||
:refer
|
||||
[appearing-side-bar side-bar-layout]]
|
||||
[auto-ap.views.pages.data-page :as data-page]
|
||||
[auto-ap.views.pages.transactions.common :refer [transaction-read]]
|
||||
[auto-ap.views.pages.transactions.form :as edit]
|
||||
[auto-ap.views.pages.transactions.manual :as manual]
|
||||
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf date-picker active-when with-user]]
|
||||
[goog.string :as gstring]
|
||||
[re-frame.core :as re-frame]
|
||||
[auto-ap.views.pages.transactions.side-bar :as side-bar]
|
||||
[auto-ap.views.pages.transactions.table :as table]
|
||||
[auto-ap.views.utils :refer [dispatch-event with-user]]
|
||||
[clojure.set :as set]
|
||||
[re-frame.core :as re-frame]
|
||||
[reagent.core :as reagent]
|
||||
[auto-ap.status :as status]
|
||||
[vimsical.re-frame.fx.track :as track]))
|
||||
[vimsical.re-frame.fx.track :as track]
|
||||
[auto-ap.status :as status]))
|
||||
|
||||
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::edit-completed
|
||||
(fn [db [_ edit-transaction]]
|
||||
(-> db
|
||||
(update-in [::transaction-page :transactions]
|
||||
replace-by :id (assoc edit-transaction :class "live-added")))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::manual-import-completed
|
||||
(fn [{:keys [db]} [_ {:keys [imported errors]}]]
|
||||
{:dispatch [::params-change (::params db)]
|
||||
{:dispatch [::params-change @(re-frame/subscribe [::data-page/params ::page])]
|
||||
:db (-> db
|
||||
(assoc-in [::notification :message] (str "Successfully imported " imported " transactions"))
|
||||
(assoc-in [::notification :errors] errors))}))
|
||||
|
||||
(re-frame/reg-sub
|
||||
::transaction-page
|
||||
(fn [db]
|
||||
(-> db ::transaction-page)))
|
||||
|
||||
|
||||
(re-frame/reg-sub
|
||||
::params
|
||||
:<- [::subs/client]
|
||||
:<- [::side-bar/filter-params]
|
||||
:<- [::table/table-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))))
|
||||
(defn data-params->query-params [params]
|
||||
{:start (:start params 0)
|
||||
:sort (:sort params)
|
||||
:client-id (:id @(re-frame/subscribe [::subs/client]))
|
||||
:vendor-id (:id (:vendor params))
|
||||
:date-range (:date-range params)
|
||||
:bank-account-id (:id (:bank-account params))
|
||||
:amount-gte (:amount-gte (:amount-range params))
|
||||
:amount-lte (:amount-lte (:amount-range params))
|
||||
:description (:description params)
|
||||
:approval-status (condp = @(re-frame/subscribe [::subs/active-page])
|
||||
:transactions nil
|
||||
:unapproved-transactions :unapproved
|
||||
:requires-feedback-transactions :requires-feedback
|
||||
:excluded-transactions :excluded
|
||||
:approved-transactions :approved)})
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::params-change
|
||||
[with-user]
|
||||
(fn [{:keys [user db ]} [_ params]]
|
||||
{:graphql {:token user
|
||||
:owns-state {:single ::page}
|
||||
:owns-state {:single [::data-page/page ::page]}
|
||||
:query-obj {:venia/queries [[:transaction_page
|
||||
params
|
||||
(data-params->query-params params)
|
||||
[[:transactions transaction-read]
|
||||
:total
|
||||
:start
|
||||
:end]]]}
|
||||
:on-success [::received]}
|
||||
:set-uri-params (dissoc params :status :client-id)}))
|
||||
:on-success (fn [result]
|
||||
[::data-page/received ::page (set/rename-keys (first (:transaction-page result))
|
||||
{:transactions :data})])}}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::unapprove-all
|
||||
@@ -84,38 +69,41 @@
|
||||
{:db (-> (:db cofx)
|
||||
(assoc-in [:status :loading] true))
|
||||
:graphql {:token (-> cofx :db :user)
|
||||
:owns-state {:single ::unapprove-all}
|
||||
:query-obj
|
||||
{:venia/operation {:operation/type :mutation
|
||||
:operation/name "UnapproveTransactions"}
|
||||
:venia/queries [{:query/data
|
||||
[:unapprove-transactions
|
||||
@(re-frame/subscribe [::params])
|
||||
(data-params->query-params params)
|
||||
[[:transactions transaction-read]
|
||||
:total
|
||||
:start
|
||||
:end]]}]}
|
||||
:on-success [::received]}}))
|
||||
:on-success (fn [result]
|
||||
[::data-page/received ::page (set/rename-keys (first (:unapprove-transactions result))
|
||||
{:transactions :data})])}}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::unmounted
|
||||
(fn [{:keys [db]} _]
|
||||
{:db (dissoc db ::table/table-params ::side-bar/filters ::side-bar/settled-filters ::transaction-page)
|
||||
::track/dispose {:id ::params}}))
|
||||
{:dispatch [::data-page/dispose ::page]
|
||||
::track/dispose {:id ::params}
|
||||
::forward/dispose {:id ::updated}}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::mounted
|
||||
(fn [{:keys [db]} _]
|
||||
{::track/register {:id ::params
|
||||
:subscription [::params]
|
||||
:event-fn (fn [params] [::params-change params])}}))
|
||||
:subscription [::data-page/params ::page]
|
||||
:event-fn (fn [params]
|
||||
[::params-change params])}
|
||||
::forward/register {:id ::updated
|
||||
:events #{::edit/edited}
|
||||
:event-fn (fn [[_ edited-transaction]]
|
||||
[::data-page/updated-entity ::page edited-transaction])}}))
|
||||
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::received
|
||||
(fn [db [_ data]]
|
||||
(-> db
|
||||
(update ::transaction-page merge (or (first (:transaction-page data))
|
||||
(first (:unapprove-transactions data))))
|
||||
(assoc-in [:status :loading] false))))
|
||||
|
||||
|
||||
(re-frame/reg-sub
|
||||
@@ -125,10 +113,11 @@
|
||||
|
||||
(defn content []
|
||||
(let [notification (re-frame/subscribe [::notification])
|
||||
current-client @(re-frame/subscribe [::subs/client])
|
||||
user @(re-frame/subscribe [::subs/user])]
|
||||
user @(re-frame/subscribe [::subs/user])
|
||||
params @(re-frame/subscribe [::data-page/params ::page])]
|
||||
[:div
|
||||
[:h1.title "Transactions"]
|
||||
[status/status-notification {:statuses [[::status/single ::unapprove-all]]}]
|
||||
(when (= "admin" (:user/role user))
|
||||
[:div
|
||||
(when (:message @notification)
|
||||
@@ -146,11 +135,12 @@
|
||||
[:div.buttons
|
||||
[:button.button.is-outlined.is-primary {:on-click (dispatch-event [::manual/opening])}
|
||||
"Manual Yodlee Import"]
|
||||
[:button.button.is-outlined.is-danger {:on-click (dispatch-event [::unapprove-all])}
|
||||
[:button.button.is-outlined.is-danger {:on-click (dispatch-event [::unapprove-all params])
|
||||
:class (status/class-for @(re-frame/subscribe [::status/single ::unapprove-all]))
|
||||
:disabled (status/disabled-for @(re-frame/subscribe [::status/single ::unapprove-all]))}
|
||||
"Unapprove all"]]]])
|
||||
[table/table {:id :transactions
|
||||
:transaction-page @(re-frame/subscribe [::transaction-page])
|
||||
:status @(re-frame/subscribe [::status/single ::page])}]]))
|
||||
:data-page ::page}]]))
|
||||
|
||||
|
||||
(defn transactions-page [{:keys [approval-status]}]
|
||||
@@ -160,17 +150,14 @@
|
||||
:component-did-mount #(re-frame/dispatch [::mounted])
|
||||
:reagent-render
|
||||
(fn []
|
||||
(let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])
|
||||
params @(re-frame/subscribe [::params]) ;; Keep to make sure it doens'nt get disposed
|
||||
ap @(re-frame/subscribe [::subs/active-page])
|
||||
user (re-frame/subscribe [::subs/user])]
|
||||
(let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])]
|
||||
[side-bar-layout
|
||||
{:side-bar [side-bar/side-bar]
|
||||
{:side-bar [side-bar/side-bar {:data-page ::page}]
|
||||
:main [:div ^{:key approval-status}
|
||||
[content]]
|
||||
:bottom [:div
|
||||
[manual/modal {:import-completed [::manual-import-completed ]}]]
|
||||
:right-side-bar [appearing-side-bar
|
||||
{:visible? transaction-bar-active?}
|
||||
[edit/form {:edit-completed [::edit-completed]}]]}]))}))
|
||||
[edit/form]]}]))}))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user