fixing vendors

This commit is contained in:
Bryce Covert
2019-05-05 01:00:30 -07:00
parent d63bb566dc
commit 3dafdd66c2
10 changed files with 56 additions and 9 deletions

View File

@@ -12,7 +12,7 @@
[clj-time.core :as time]
[clj-time.coerce :as coerce]))
(def uri "datomic:sql://invoices?jdbc:postgresql://database:5432/datomic?user=datomic&password=datomic")
(def uri "datomic:sql://invoices-backup?jdbc:postgresql://database:5432/datomic?user=datomic&password=datomic")
(defn create-database []
(d/create-database uri))

View File

@@ -120,8 +120,9 @@
:requires [:auto-ap/add-account-to-vendor]}
:auto-ap/add-credit-bank-account {:txes add-general-ledger/add-credit-bank-account
:requires [:auto-ap/add-location-to-transaction]}
:auto-ap/add-hidden-to-vendor {:txes-fn `add-general-ledger/add-hidden-to-vendor :requires [:auto-ap/add-credit-bank-account]}
:auto-ap/convert-vendors {:txes-fn `add-general-ledger/convert-vendors
:requires [:auto-ap/add-location-to-transaction]}
:requires [:auto-ap/add-hidden-to-vendor]}
:auto-ap/convert-invoices {:txes-fn `add-general-ledger/convert-invoices
:requires [:auto-ap/convert-vendors]}
@@ -129,6 +130,8 @@
:auto-ap/add-external-id-to-ledger {:txes add-general-ledger/add-external-id-to-ledger :requires [:auto-ap/add-yodlee-merchant2]}
:auto-ap/add-exclude-to-transaction {:txes add-general-ledger/add-exclude-to-transaction :requires [:auto-ap/add-external-id-to-ledger]}
:auto-ap/convert-transactions {:txes-fn `add-general-ledger/convert-transactions :requires [:auto-ap/add-external-id-to-ledger]}
#_#_:auto-ap/bulk-load-invoice-ledger3 {:txes-fn `add-general-ledger/bulk-load-invoice-ledger :requires [:auto-ap/convert-transactions]}
#_#_:auto-ap/bulk-load-transaction-ledger3 {:txes-fn `add-general-ledger/bulk-load-transaction-ledger :requires [:auto-ap/convert-transactions]}

View File

@@ -308,6 +308,21 @@
(def add-credit-bank-account
[[{:db/ident :bank-account-type/credit}]])
(defn add-hidden-to-vendor [conn]
[[{:db/ident :vendor/hidden
:db/valueType :db.type/boolean
:db/cardinality :db.cardinality/one
:db/doc "Whether or not to exclude the vendor"}]
(let [vendors (d/query {:query {:find '[?v]
:in '[$]
:where ['[?v :vendor/name]]}
:args [(d/db conn)]})]
(mapv
(fn [[v ]]
{:db/id v
:vendor/hidden false})
vendors))])
(defn reset-ledger [conn]

View File

@@ -90,6 +90,7 @@
{:fields {:id {:type :id}
:name {:type 'String}
:code {:type 'String}
:hidden {:type 'Boolean}
:print_as {:type 'String}
:primary_contact {:type :contact}
@@ -429,6 +430,7 @@
:name {:type 'String}
:code {:type 'String}
:hidden {:type 'Boolean}
:print_as {:type 'String}
:primary_contact {:type :add_contact}
:secondary_contact {:type :add_contact}

View File

@@ -8,13 +8,14 @@
[clojure.set :as set]))
(defn upsert-vendor [context {{:keys [id name code print_as primary_contact secondary_contact address default_account_id invoice_reminder_schedule] :as in} :vendor} value]
(defn upsert-vendor [context {{:keys [id name hidden code print_as primary_contact secondary_contact address default_account_id invoice_reminder_schedule] :as in} :vendor} value]
(let [_ (println default_account_id)
transaction [(remove-nils #:vendor {:db/id (if id
id
"vendor")
:name name
:code code
:hidden hidden
:print-as print_as
:default-account default_account_id
:invoice-reminder-schedule (keyword invoice_reminder_schedule)