diff --git a/src/clj/auto_ap/datomic/migrate/vendors.clj b/src/clj/auto_ap/datomic/migrate/vendors.clj index 49a0e45e..a7fa5394 100644 --- a/src/clj/auto_ap/datomic/migrate/vendors.clj +++ b/src/clj/auto_ap/datomic/migrate/vendors.clj @@ -72,7 +72,11 @@ :db/fulltext true}]] :requires [:auto-ap/base-schema]} ::add-vendor-search-terms {:txes-fn `add-vendor-search-terms - :requires [::make-fulltext-search]}}) + :requires [::make-fulltext-search]} + ::add-legal-entity-name {:txes [[{:db/ident :vendor/legal-entity-name + :db/doc "If not a person, the legal entity naame" + :db/valueType :db.type/string + :db/cardinality :db.cardinality/one}]]}}) diff --git a/src/clj/auto_ap/ssr/company/company_1099.clj b/src/clj/auto_ap/ssr/company/company_1099.clj index a587253e..8d1a555b 100644 --- a/src/clj/auto_ap/ssr/company/company_1099.clj +++ b/src/clj/auto_ap/ssr/company/company_1099.clj @@ -11,7 +11,8 @@ [hiccup2.core :as hiccup])) (defn cannot-overwrite? [vendor] - (some? (or (:vendor/legal-entity-1099-type vendor) + false + #_(some? (or (:vendor/legal-entity-1099-type vendor) (:vendor/legal-entity-tin vendor) (:vendor/legal-entity-tin-type vendor)))) @@ -34,7 +35,8 @@ :address/city :address/state :address/zip]} - :vendor/legal-entity-first-ein + :vendor/legal-entity-tin + :vendor/legal-entity-name :vendor/legal-entity-first-name :vendor/legal-entity-middle-name :vendor/legal-entity-last-name]) @@ -60,7 +62,8 @@ :address/city :address/state :address/zip]} - :vendor/legal-entity-first-ein + :vendor/legal-entity-tin + :vendor/legal-entity-name :vendor/legal-entity-first-name :vendor/legal-entity-middle-name :vendor/legal-entity-last-name]) @@ -116,12 +119,13 @@ {:class "live-added"}) [:td (:client/code client)] [:td (:vendor/name vendor)] - [:td (-> vendor :vendor/legal-entity-first-name) " " - (-> vendor :vendor/legal-entity-middle-name) " " - (-> vendor :vendor/legal-entity-last-name)] + [:td (or (-> vendor :vendor/legal-entity-name not-empty) + (str (-> vendor :vendor/legal-entity-first-name) " " + (-> vendor :vendor/legal-entity-middle-name) " " + (-> vendor :vendor/legal-entity-last-name)))] [:td (some-> vendor :vendor/legal-entity-1099-type :db/ident name)] " " [:td - (some-> vendor :vendor/legal-entity-tin-type :db/ident name) + (some-> vendor :vendor/legal-entity-tin-type :db/ident name) " " (-> vendor :vendor/legal-entity-tin)] [:td (-> vendor :vendor/address :address/street1) " " @@ -129,7 +133,7 @@ (-> vendor :vendor/address :address/city) " " (-> vendor :vendor/address :address/state) " " (-> vendor :vendor/address :address/zip) - [:td amount] + [:td "$" (Math/round amount)] [:td (if (cannot-overwrite? vendor) [:a {:href "mailto:ben@integreatconsult.com"} "Contact Integreat"] @@ -144,7 +148,8 @@ (reduce-kv (fn [acc k v] (assoc-in acc (->> (str/split k #"_") - (mapv #(apply keyword (str/split % #"/")))) v)) + (mapv #(apply keyword (str/split % #"/")))) + v)) {} form-data)) @@ -229,6 +234,14 @@ :value (-> vendor :vendor/address :address/zip)}]]]]]] [:h4.is-4.title "Legal Entity"] [:hr] + [:div.field + [:p.help "First Name"] + [:div.control + [:input.input.is-expanded {:type "text" + :placeholder "Josh" + :name (path->name [:vendor/legal-entity-name]) + :value (-> vendor :vendor/legal-entity-name)}]]] + "OR" [:div.level [:div.level-left [:div.level-item