New vendor everywhere

This commit is contained in:
Bryce Covert
2019-05-17 22:02:26 -07:00
parent 598c58a6bd
commit 9396bbb7eb
7 changed files with 27 additions and 34 deletions

View File

@@ -4,10 +4,10 @@
[reagent.core :as reagent]
[clojure.string :as str]
[auto-ap.subs :as subs]
[auto-ap.events :as main-events]
[auto-ap.events.admin.vendors :as events]
[auto-ap.entities.vendors :as entity]
[auto-ap.views.components.address :refer [address-field]]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
[auto-ap.views.components.modal :refer [modal]]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
@@ -71,12 +71,9 @@
[vendors-table]
[:div.is-pulled-right
[:a.button.is-primary.is-large {:on-click (dispatch-event [::events/new])} "New vendor"]]
[:a.button.is-primary.is-large {:on-click (dispatch-event [::main-events/modal-status :auto-ap.views.main/user-editing-vendor {:visible? true}])} "New vendor"]]
[vendor-dialog {:vendor editing-vendor
:save-event [::events/save]
:change-event ::events/change
:id ::admin-vendor}]])])
])])
{:component-did-mount (fn []
(re-frame/dispatch [::events/mounted]))})])

View File

@@ -6,7 +6,6 @@
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.components.modal :refer [action-modal]]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
[auto-ap.views.components.paginator :refer [paginator]]
[auto-ap.views.components.sorter :refer [sorted-column]]
[auto-ap.views.pages.transactions.form :as edit]
@@ -144,17 +143,10 @@
[:div
[date-range-filter
{:on-change-event [::change-selected-date-range]
:value (:date-range-filter @(re-frame/subscribe [::transaction-page]))}]]
[:div {:class " compose"}
[:a {:class "button is-primary is-outlined is-block "
:on-click (dispatch-event [::events/modal-status :auto-ap.views.main/user-editing-vendor {:visible? true}])}
[:span "New Vendor"]]]]
:value (:date-range-filter @(re-frame/subscribe [::transaction-page]))}]]]
:main [transactions-content]
: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}]
:bottom [:div
[manual/modal {:import-completed [::manual-import-completed ]}]]
:right-side-bar [appearing-side-bar
{:visible? transaction-bar-active?}

View File

@@ -12,7 +12,6 @@
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.components.modal :refer [action-modal modal]]
[auto-ap.views.components.typeahead :refer [typeahead]]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
[auto-ap.views.components.vendor-filter :refer [vendor-filter]]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.pages.invoices.common :refer [invoice-read]]
@@ -724,9 +723,8 @@
[:div
[invoice-number-filter]]]]
:main [unpaid-invoices-content {:status status}]
: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}]
:bottom [:div
[check-results-dialog]
[print-checks-modal]
[handwrite-checks-modal]