sales orders and transactions better.

This commit is contained in:
Bryce Covert
2020-08-21 07:47:44 -07:00
parent a08c197159
commit 57895d9ee2
18 changed files with 719 additions and 190 deletions

View File

@@ -12,7 +12,8 @@
[goog.string :as gstring]
[re-frame.core :as re-frame]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.status :as status]))
[auto-ap.status :as status]
[auto-ap.views.pages.data-page :as data-page]))
(re-frame/reg-event-fx
::editing-matches-found
@@ -54,15 +55,13 @@
(fn [{table-params :db} [_ params :as z]]
{:db (merge table-params params)}))
(defn table [{:keys [id transaction-page status]}]
(defn table [{:keys [id data-page ]}]
(let [selected-client @(re-frame/subscribe [::subs/client])
{:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])
states @(re-frame/subscribe [::status/multi ::edits])]
[grid/grid {:on-params-change (fn [e]
(re-frame/dispatch [::params-changed e]))
:params @(re-frame/subscribe [::table-params])
:status status
[grid/grid {:data-page data-page
:column-count (if selected-client 6 7)}
[grid/controls transaction-page]
[grid/controls data]
[grid/table {:fullwidth true}
[grid/header {}
[grid/row {}
@@ -75,7 +74,7 @@
[grid/sortable-header-cell {:sort-key "status" :sort-name "Status" :style {:width "7em"}} "Status"]
[grid/header-cell {:style {:width (action-cell-width 3)}}]]]
[grid/body
(for [{:keys [client account vendor approval-status payment status bank-account description-original date amount id yodlee-merchant ] :as i} (:transactions transaction-page)]
(for [{:keys [client account vendor approval-status payment status bank-account description-original date amount id yodlee-merchant ] :as i} (:data data)]
^{:key id}
[grid/row {:class (:class i)}
(when-not selected-client