Merge branch 'master' of bitbucket.org:brycecovertoperations/integreat

src/cljc/auto_ap/entities/companies.cljc

@@ -10,6 +10,9 @@
 (s/def ::name ::shared/required-identifier)
 (s/def ::address ::address/address)
 
+(s/def ::location string?)
+(s/def ::locations (s/coll-of ::location))
+
 (s/def ::email (s/nilable (s/and string? (s/or :is-email #(re-matches email-regex %)
                                                :is-empty #(= % "")))))
 
@@ -17,6 +20,7 @@
 (s/def ::company (s/keys :req-un [::name]
                          :opt-un [::email
                                   ::address
+                                  ::locations
                                   ::id]))
 
 

src/cljc/auto_ap/entities/invoices_expense_accounts.cljc

@@ -6,5 +6,6 @@
 (s/def ::vendor-id int?)
 (s/def ::expense-account-id int?)
 (s/def ::amount ::shared/money)
+(s/def ::location string?)
 
-(s/def ::invoices-expense-account (s/keys :opt-un [::vendor-id ::expense-account-id ::amount]))
+(s/def ::invoices-expense-account (s/keys :opt-un [::vendor-id ::expense-account-id ::amount ::location]))