notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

simplified vendor form.

Browse Source
This commit is contained in:
Bryce Covert
2022-07-15 07:38:15 -07:00
parent 586978823e
commit d16b9c9a5e
2 changed files with 359 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cljs/auto_ap/forms/builder.cljs
View File

@@ -73,6 +73,23 @@
[:label.label label])) [:label.label label]))
[:div.control [raw-field {} child]]]))])) [:div.control [raw-field {} child]]]))]))
(defn horizontal-control []
(let [[label & children] (r/children (r/current-component))]
[:div.field.is-horizontal
(when label
[:div.field-label [:label.label label]])
[:div.field-body
(for [[i child] (map vector (range) children)]
^{:key i}
[:div.field
child])]]))
(defn horizontal-field []
(let [[label child] (r/children (r/current-component))]
[horizontal-control
label
[raw-field {} child]]))
(defn section [{:keys [title]}] (defn section [{:keys [title]}]
[:<> [:<>
[:h4.is-4.title title] [:h4.is-4.title title]

404
src/cljs/auto_ap/views/components/vendor_dialog.cljs
View File

@@ -5,7 +5,7 @@
[auto-ap.forms :as forms] [auto-ap.forms :as forms]
[auto-ap.status :as status] [auto-ap.status :as status]
[auto-ap.subs :as subs] [auto-ap.subs :as subs]
[auto-ap.views.components.address :refer [address-field]] [auto-ap.views.components.address :refer [address2-field]]
[auto-ap.views.components.typeahead.vendor [auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]] :refer [search-backed-typeahead]]
[auto-ap.views.components.modal :as modal] [auto-ap.views.components.modal :as modal]
@@ -18,7 +18,8 @@
with-is-admin? with-is-admin?
with-user]] with-user]]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[re-frame.core :as re-frame])) [re-frame.core :as re-frame]
[auto-ap.forms.builder :as form-builder]))
(re-frame/reg-sub (re-frame/reg-sub
::can-submit ::can-submit
@@ -26,13 +27,6 @@
(fn [form] (fn [form]
(s/valid? ::entity/vendor (:data form)))) (s/valid? ::entity/vendor (:data form))))
(re-frame/reg-event-db
::settled
[(forms/in-form ::vendor-form)]
(fn [form _]
form))
(re-frame/reg-event-db (re-frame/reg-event-db
::removed-override ::removed-override
[(forms/in-form ::vendor-form)] [(forms/in-form ::vendor-form)]
@@ -76,17 +70,14 @@
[with-user with-is-admin? (forms/triggers-loading ::vendor-form) (forms/in-form ::vendor-form)] [with-user with-is-admin? (forms/triggers-loading ::vendor-form) (forms/in-form ::vendor-form)]
(fn [{:keys [user is-admin?] {{:keys [name hidden print-as terms invoice-reminder-schedule primary-contact automatically-paid-when-due schedule-payment-dom secondary-contact address default-account terms-overrides account-overrides id legal-entity-tin legal-entity-tin-type legal-entity-first-name legal-entity-last-name legal-entity-middle-name legal-entity-1099-type] :as data} :data} :db} _] (fn [{:keys [user is-admin?] {{:keys [name hidden print-as terms invoice-reminder-schedule primary-contact automatically-paid-when-due schedule-payment-dom secondary-contact address default-account terms-overrides account-overrides id legal-entity-tin legal-entity-tin-type legal-entity-first-name legal-entity-last-name legal-entity-middle-name legal-entity-1099-type] :as data} :data} :db} _]
(when (s/valid? ::entity/vendor data) (when (s/valid? ::entity/vendor data)
{ :graphql (let [query [:upsert-vendor
{:token user
:owns-state {:single ::vendor-form}
:query-obj {:venia/operation {:operation/type :mutation
:operation/name "UpsertVendor"} :venia/queries [{:query/data [:upsert-vendor
{:vendor (cond-> {:id id {:vendor (cond-> {:id id
:name name :name name
:print-as print-as :print-as print-as
:terms terms :terms terms
:default-account-id (:id default-account) :default-account-id (:id default-account)
:address address :primary-contact primary-contact :address address
:primary-contact primary-contact
:secondary-contact secondary-contact :secondary-contact secondary-contact
:invoice-reminder-schedule invoice-reminder-schedule} :invoice-reminder-schedule invoice-reminder-schedule}
is-admin? (assoc :hidden hidden is-admin? (assoc :hidden hidden
@@ -118,345 +109,303 @@
:legal-entity-tin-type (some-> legal-entity-tin-type clojure.core/name not-empty keyword) :legal-entity-tin-type (some-> legal-entity-tin-type clojure.core/name not-empty keyword)
:legal-entity-1099-type (some-> legal-entity-1099-type clojure.core/name not-empty keyword) :legal-entity-1099-type (some-> legal-entity-1099-type clojure.core/name not-empty keyword)
))} ))}
common/default-read]}]} common/default-read]]
:on-success [::save-complete]}}))) { :graphql
{:token user
:owns-state {:single ::vendor-form}
:query-obj {:venia/operation
{:operation/type :mutation
:operation/name "UpsertVendor"} :venia/queries [{:query/data query}]}
:on-success [::save-complete]}}))))
(defn client-list [{:keys [override-key change-event data]}] (defn client-list [{:keys [override-key data]}]
(let [clients @(re-frame/subscribe [::subs/clients]) (let [clients @(re-frame/subscribe [::subs/clients])]
is-admin? @(re-frame/subscribe [::subs/is-admin?])] [form-builder/horizontal-control
(when is-admin? "Client"
[horizontal-field
[:label.label "Client"]
(doall (doall
(for [[i override] (map vector (range) (conj (override-key data) {:key (random-uuid)}))] (for [[i override] (map vector (range) (conj (override-key data) {:key (random-uuid)}))]
^{:key (or ^{:key (or (:id override)
(:id override)
(:key override))} (:key override))}
[:div.columns [:div.level
[:div.column [:div.level-left
[bind-field [:div.level-item
[form-builder/raw-field
[typeahead-v3 {:entities clients [typeahead-v3 {:entities clients
:entity->text :name :entity->text :name
:style {:width "13em"}
:type "typeahead-v3" :type "typeahead-v3"
:field [override-key i] :field [override-key i]}]]]
:event change-event
:subscription data}]]]
[:div.column.is-1 [:div.level-item
[:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]))]))) [:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]]))]))
(defn default-with-overrides [{:keys [override-key change-event default-key data mandatory?]} template] (defn default-with-overrides [{:keys [override-key default-key data mandatory?]} template]
(let [clients @(re-frame/subscribe [::subs/clients]) (let [clients @(re-frame/subscribe [::subs/clients])]
is-admin? @(re-frame/subscribe [::subs/is-admin?])]
[:div [:div
[horizontal-field [form-builder/horizontal-control
[:label.label [:span "Default" [:span "Default"
(when mandatory? (when mandatory?
[:span.has-text-danger " *"])]] [:span.has-text-danger " *"])]
[bind-field (template default-key nil)]
(template default-key nil) [form-builder/horizontal-control
#_(assoc-in template [1 :field ] default-key)]] "Overrides"
(when is-admin? (doall
[horizontal-field (for [[i override] (map vector (range) (conj (override-key data) {:key (random-uuid)}))]
[:label.label "Overrides"] ^{:key (or
(:id override)
(:key override)
)}
[:div.level
[:div.level-left
[:div.level-item
[form-builder/raw-field
[typeahead-v3 {:entities clients
:entity->text :name
:style {:width "13em"}
:type "typeahead-v3"
:field [override-key i :client]}]]]
[:div.level-item
(template
[override-key i :override]
(get-in data [override-key i :client]))]
[:div.level-item
[:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]]))]]))
(defn client-overrides [{:keys [override-key data]} template]
(let [clients @(re-frame/subscribe [::subs/clients])]
[form-builder/horizontal-control
"Overrides"
(doall (doall
(for [[i override] (map vector (range) (conj (override-key data) {:key (random-uuid)}))] (for [[i override] (map vector (range) (conj (override-key data) {:key (random-uuid)}))]
^{:key (or ^{:key (or
(:id override) (:id override)
(:key override))} (:key override))}
[:div.columns [:div.level
[:div.column [:div.level-left
[bind-field [:div.level-item
[form-builder/raw-field
[typeahead-v3 {:entities clients [typeahead-v3 {:entities clients
:entity->text :name :entity->text :name
:style {:width "13em"}
:type "typeahead-v3" :type "typeahead-v3"
:field [override-key i :client] :field [override-key i :client]}]]]
:event change-event [:div.level-item
:subscription data}]]]
[:div.column
[bind-field
(template (template
[override-key i :override] [override-key i :override]
(get-in data [override-key i :client]) (get-in data [override-key i :client]))]
)]] [:div.level-item
[:div.column.is-1 [:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]]))]))
[:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]))])]))
(defn client-overrides [{:keys [override-key change-event data]} template] (defn form-content [{:keys [data]}]
(let [clients @(re-frame/subscribe [::subs/clients])
is-admin? @(re-frame/subscribe [::subs/is-admin?])]
(when is-admin?
[horizontal-field
[:label.label "Overrides"]
(doall
(for [[i override] (map vector (range) (conj (override-key data) {:key (random-uuid)}))]
^{:key (or
(:id override)
(:key override))}
[:div.columns
[:div.column
[bind-field
[typeahead-v3 {:entities clients
:entity->text :name
:type "typeahead-v3"
:field [override-key i :client]
:event change-event
:subscription data}]]]
[:div.column
[bind-field
(template
[override-key i :override]
(get-in data [override-key i :client])
)]]
[:div.column.is-1
[:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]))])))
(defn form-content [{:keys [data change-event]}]
(let [is-admin? @(re-frame/subscribe [::subs/is-admin?])] (let [is-admin? @(re-frame/subscribe [::subs/is-admin?])]
[form-builder/builder {:submit-event [::save]
:can-submit [::can-submit]
:change-event [::changed]
:id ::vendor-form}
[:div [:div
[horizontal-field [form-builder/horizontal-field
[:label.label [:span "Name " [:span "Name " [:span.has-text-danger "*"]]
[:span.has-text-danger "*"]]]
[:div.control
[bind-field
[:input.input {:type "text" [:input.input {:type "text"
:auto-focus true :auto-focus true
:field :name :field :name
:spec ::entity/name :spec ::entity/name}]]
:event change-event
:subscription data}]]]]
[horizontal-field [form-builder/horizontal-field
[:label.label "Print Checks As"] "Print Checks As"
[:div.control
[bind-field
[:input.input {:type "text" [:input.input {:type "text"
:field :print-as :field :print-as
:spec ::entity/print-as :spec ::entity/print-as}]]
:event change-event
:subscription data}]]]]
(when is-admin? (when is-admin?
[horizontal-field [form-builder/horizontal-field
[:label.label "Hidden"] "Hidden"
[:div.control
[bind-field
[:input {:type "checkbox" [:input {:type "checkbox"
:field :hidden :field :hidden
:spec ::entity/hidden :spec ::entity/hidden}]])
:event change-event
:subscription data}]]]]) (if is-admin?
[:h2.subtitle "Terms"] [:<>
[default-with-overrides {:data data :change-event change-event [form-builder/section {:title "Terms"}
[default-with-overrides {:data data
:default-key :terms :default-key :terms
:override-key :terms-overrides} :override-key :terms-overrides}
(fn [field _] (fn [field _]
[form-builder/raw-field
[:input.input {:type "number" [:input.input {:type "number"
:step "1" :step "1"
:style {:width "4em"} :style {:width "4em"}
:field field :field field
:size 3 :size 3
:spec ::entity/terms :spec ::entity/terms}]])]]]
:event change-event
:subscription data}])] [form-builder/horizontal-field
[:span "Terms"]
[:input.input {:type "number"
:step "1"
:style {:width "4em"}
:field :terms
:size 3
:spec ::entity/terms}]])
(when is-admin? (when is-admin?
[:h2.subtitle "Schedule payment when due"]) [form-builder/section {:title "Schedule payment when due"}
[client-list {:data data :change-event change-event [client-list {:data data
:override-key :automatically-paid-when-due}] :override-key :automatically-paid-when-due}]])
(when is-admin? (when is-admin?
[:h2.subtitle "Schedule payment on day of month"]) [form-builder/section {:title "Schedule payment on day of month"}
[client-overrides {:data data :change-event change-event [client-overrides {:data data
:mandatory? true :mandatory? true
:override-key :schedule-payment-dom} :override-key :schedule-payment-dom}
(fn [field _] (fn [field _]
[form-builder/raw-field
[:input.input {:type "number" [:input.input {:type "number"
:step "1" :step "1"
:style {:width "5em"} :style {:width "5em"}
:field field :field field
:size 3 :size 3
:spec ::entity/dom :spec ::entity/dom}]])]])
:event change-event
:subscription data}])]
[:h2.subtitle "Expense Accounts"] (if is-admin?
[default-with-overrides {:data data :change-event change-event [form-builder/section {:title "Expense Accounts"}
[default-with-overrides {:data data
:mandatory? true :mandatory? true
:default-key :default-account :default-key :default-account
:override-key :account-overrides} :override-key :account-overrides}
(fn [field client] (fn [field client]
[form-builder/raw-field
[search-backed-typeahead {:search-query (fn [i] [search-backed-typeahead {:search-query (fn [i]
[:search_account [:search_account
{:query i {:query i
:client-id (:id client)} :client-id (:id client)}
[:name :id]]) [:name :id]])
:type "typeahead-v3" :type "typeahead-v3"
:field field :style {:width "15em"}
:event change-event :field field}]])]]
:subscription data}])]
[:h2.subtitle "Address"] [form-builder/horizontal-field
[address-field {:field [:address] "Expense Account"
:event change-event [search-backed-typeahead {:search-query (fn [i]
:subscription data}] [:search_account
[:h2.subtitle "Contact"] {:query i}
[horizontal-field [:name :id]])
[:label.label "Primary"] :type "typeahead-v3"
:field :default-account}]])
[form-builder/with-scope {:scope [:address ]}
[form-builder/section {:title "Address"}
[address2-field]]]
[form-builder/section {:title "Contact"}
[form-builder/horizontal-control
"Primary"
[:div.control.has-icons-left [:div.control.has-icons-left
[bind-field [form-builder/raw-field
[:input.input.is-expanded {:type "text" [:input.input.is-expanded {:type "text"
:field [:primary-contact :name] :field [:primary-contact :name]
:spec ::contact/name :spec ::contact/name}]]
:event change-event
:subscription data}]]
[:span.icon.is-small.is-left [:span.icon.is-small.is-left
[:i.fa.fa-user]]] [:i.fa.fa-user]]]
[:div.control.has-icons-left [:div.control.has-icons-left
[:span.icon.is-small.is-left [:span.icon.is-small.is-left
[:i.fa.fa-envelope]] [:i.fa.fa-envelope]]
[bind-field [form-builder/raw-field
[:input.input {:type "email" [:input.input {:type "email"
:field [:primary-contact :email] :field [:primary-contact :email]
:spec ::contact/email :spec ::contact/email}]]]
:event change-event
:subscription data}]]]
[:div.control.has-icons-left [:div.control.has-icons-left
[bind-field [form-builder/raw-field
[:input.input {:type "phone" [:input.input {:type "phone"
:field [:primary-contact :phone] :field [:primary-contact :phone]
:spec ::contact/phone :spec ::contact/phone}]]
:event change-event
:subscription data}]]
[:span.icon.is-small.is-left [:span.icon.is-small.is-left
[:i.fa.fa-phone]]]] [:i.fa.fa-phone]]]]
[horizontal-field [form-builder/horizontal-control
[:label.label "Secondary"] "Secondary"
[:div.control.has-icons-left [:div.control.has-icons-left
[bind-field [form-builder/raw-field
[:input.input.is-expanded {:type "text" [:input.input.is-expanded {:type "text"
:field [:secondary-contact :name] :field [:secondary-contact :name]
:spec ::contact/name :spec ::contact/name}]]
:event change-event
:subscription data}]]
[:span.icon.is-small.is-left [:span.icon.is-small.is-left
[:i.fa.fa-user]]] [:i.fa.fa-user]]]
[:div.control.has-icons-left [:div.control.has-icons-left
[:span.icon.is-small.is-left [:span.icon.is-small.is-left
[:i.fa.fa-envelope]] [:i.fa.fa-envelope]]
[bind-field [form-builder/raw-field
[:input.input {:type "email" [:input.input {:type "email"
:field [:secondary-contact :email] :field [:secondary-contact :email]
:spec ::contact/email :spec ::contact/email}]]]
:event change-event
:subscription data}]]]
[:div.control.has-icons-left [:div.control.has-icons-left
[bind-field [form-builder/raw-field
[:input.input {:type "phone" [:input.input {:type "phone"
:field [:secondary-contact :phone] :field [:secondary-contact :phone]
:spec ::contact/phone :spec ::contact/phone}]]
:event change-event
:subscription data}]]
[:span.icon.is-small.is-left [:span.icon.is-small.is-left
[:i.fa.fa-phone]]]] [:i.fa.fa-phone]]]]]
[horizontal-field
[:label.label "Invoice Reminders"]
[:div.control
[:label.radio
[bind-field
[:input {:type "radio"
:name "schedule"
:value "Weekly"
:field :invoice-reminder-schedule
:spec ::entity/invoice-reminder-schedule
:event change-event
:subscription data}]]
" Send weekly"]
[:label.radio
[bind-field
[:input {:type "radio"
:name "schedule"
:value "Never"
:field :invoice-reminder-schedule
:spec ::entity/invoice-reminder-schedule
:event change-event
:subscription data}]]
" Never"]]]
[:h2.subtitle "Legal Entity"] (when is-admin?
[horizontal-field [form-builder/section {:title "Legal Entity"}
[:label.label "Name"] [form-builder/horizontal-control
"Name"
[:div.control [:div.control
[bind-field [form-builder/raw-field
[:input.input {:type "text" [:input.input {:type "text"
:placeholder "First Name" :placeholder "First Name"
:field [:legal-entity-first-name] :field [:legal-entity-first-name]
:spec ::contact/name :spec ::contact/name}]]]
:event change-event
:subscription data}]]]
[:div.control [:div.control
[bind-field [form-builder/raw-field
[:input.input {:type "text" [:input.input {:type "text"
:placeholder "Middle Name" :placeholder "Middle Name"
:field [:legal-entity-middle-name] :field [:legal-entity-middle-name]
:spec ::contact/name :spec ::contact/name}]]]
:event change-event
:subscription data}]]]
[:div.control [:div.control
[bind-field [form-builder/raw-field
[:input.input {:type "text" [:input.input {:type "text"
:placeholder "Last Name" :placeholder "Last Name"
:field [:legal-entity-last-name] :field [:legal-entity-last-name]
:spec ::contact/name :spec ::contact/name}]]]]
:event change-event [form-builder/horizontal-control
:subscription data}]]]] "TIN"
[horizontal-field
[:label.label "TIN"]
[:div.control [:div.control
[bind-field [form-builder/raw-field
[:input.input {:type "text" [:input.input {:type "text"
:placeholder "SSN or EIN" :placeholder "SSN or EIN"
:field [:legal-entity-tin] :field [:legal-entity-tin]
:size "12" :size "12"
:spec ::contact/name :spec ::contact/name}]]]
:event change-event
:subscription data}]]]
[:div.control [:div.control
[:div.select [:div.select
[bind-field [form-builder/raw-field
[:select {:type "select" [:select {:type "select"
:field [:legal-entity-tin-type] :field [:legal-entity-tin-type]}
:event change-event
:subscription data}
[:option {:value nil} ""] [:option {:value nil} ""]
[:option {:value "ein"} "EIN"] [:option {:value "ein"} "EIN"]
[:option {:value "ssn"} "SSN"]]]]]] [:option {:value "ssn"} "SSN"]]]]]]
[horizontal-field [form-builder/horizontal-control
[:label.label "1099 Type"] "1099 Type"
[:div.control [:div.control
[:div.select [:div.select
[bind-field [form-builder/raw-field
[:select {:type "select" [:select {:type "select"
:field [:legal-entity-1099-type] :field [:legal-entity-1099-type]}
:event change-event
:subscription data}
[:option {:value nil} ""] [:option {:value nil} ""]
[:option {:value "none"} "Don't 1099"] [:option {:value "none"} "Don't 1099"]
[:option {:value "misc"} "Misc"] [:option {:value "misc"} "Misc"]
[:option {:value "landlord"} "Landlord"]]]]]]])) [:option {:value "landlord"} "Landlord"]]]]]]])]]))
(defn vendor-dialog [ ] (defn vendor-dialog [ ]
(let [{:keys [data]} @(re-frame/subscribe [::forms/form ::vendor-form]) (let [{:keys [data]} @(re-frame/subscribe [::forms/form ::vendor-form])]
change-event [::changed]]
[:div [:div
[form-content {:data data :change-event change-event}]])) [form-content {:data data}]]))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::vendor-selected ::vendor-selected
@@ -479,24 +428,21 @@
true true
false))) false)))
(def select-vendor-form (forms/vertical-form {:submit-event [::vendor-selected]
:change-event [::forms/change ::select-vendor-form]
:can-submit [::can-submit-select-vendor-form]
:id ::select-vendor-form}))
(defn select-vendor-form-content [] (defn select-vendor-form-content []
(let [_ @(re-frame/subscribe [::forms/form ::select-vendor-form]) [form-builder/builder {:submit-event [::vendor-selected]
{:keys [form-inline field]} select-vendor-form] :can-submit [::can-submit-select-vendor-form]
(form-inline {} :id ::select-vendor-form}
[:<> [form-builder/field
(field "Vendor to edit" "Vendor to edit"
[search-backed-typeahead {:search-query (fn [i] [search-backed-typeahead {:search-query (fn [i]
[:search_vendor [:search_vendor
{:query i} {:query i}
[:name :id]]) [:name :id]])
:type "typeahead-v3" :type "typeahead-v3"
:auto-focus true :auto-focus true
:field [:vendor]}])]))) :field [:vendor]}]]
#_[form-builder/submit-button "Save"]])