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

added ability to schedule payment on DOM

Browse Source
This commit is contained in:
Bryce Covert
2020-09-24 11:15:46 -07:00
parent c5ed61b2e1
commit 99e09b1181
8 changed files with 104 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/clj/auto_ap/datomic/migrate.clj
View File

@@ -316,7 +316,21 @@
:auto-ap/add-scheduled-payment {:txes [[{:db/ident :invoice/scheduled-payment
:db/doc "When an invoice gets marked as paid"
:db/valueType :db.type/instant
:db/cardinality :db.cardinality/one}]]}}
:db/cardinality :db.cardinality/one}]]}
:auto-ap/add-scheduled-payment-dom {:txes [[{:db/ident :vendor/schedule-payment-dom
:db/doc "When an invoice gets marked as paid"
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/many
:db/isComponent true}
{:db/ident :vendor-schedule-payment-dom/client
:db/doc "Which client the override is for"
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/one}
{:db/ident :vendor-schedule-payment-dom/dom
:db/doc "What day of the month"
:db/valueType :db.type/long
:db/cardinality :db.cardinality/one}]]}}
sales/norms-map
clients/norms-map
ledger/norms-map
@@ -331,8 +345,7 @@
(defn -main [& args]
(mount/start (mount/only #{#'conn}))
(migrate conn)
(mount/stop)
)
(mount/stop))
(mount/defstate migrate-start

5
src/clj/auto_ap/datomic/vendors.clj
View File

@@ -10,13 +10,15 @@
(if clients
(-> vendor
(update :vendor/account-overrides (fn [ao] (filter #(clients (:db/id (:vendor-account-override/client %))) ao)))
(update :vendor/terms-overrides (fn [to] (filter #(clients (:db/id (:vendor-terms-override/client %))) to))))
(update :vendor/terms-overrides (fn [to] (filter #(clients (:db/id (:vendor-terms-override/client %))) to)))
(update :vendor/schedule-payment-dom (fn [to] (filter #(clients (:db/id (:vendor-schedule-payment-dom/client %))) to))))
vendor)))
(def default-read
'[* {:vendor/account-overrides [* {:vendor-account-override/client [:client/name :db/id]
:vendor-account-override/account [:account/name :account/numeric-code :db/id]}]
:vendor/terms-overrides [* {:vendor-terms-override/client [:client/name :client/code :db/id]}]
:vendor/schedule-payment-dom [* {:vendor-schedule-payment-dom/client [:client/name :client/code :db/id]}]
:vendor/automatically-paid-when-due [:db/id :client/name]}])
(defn get-usages [args]
@@ -63,6 +65,7 @@
:vendor/account-overrides [* {:vendor-account-override/client [:client/name :db/id]
:vendor-account-override/account [:account/name :account/numeric-code :db/id]}]
:vendor/terms-overrides [* {:vendor-terms-override/client [:client/name :db/id]}]
:vendor/schedule-payment-dom [* {:vendor-schedule-payment-dom/client [:client/name :db/id]}]
:vendor/automatically-paid-when-due [:db/id :client/name]}])
:in $ ?e
:where [?e]]

12
src/clj/auto_ap/graphql.clj
View File

@@ -136,6 +136,11 @@
:terms {:type 'Int}
}}
:schedule_payment_dom
{:fields {:id {:type :id}
:client {:type :client}
:dom {:type 'Int}}}
:vendor_account_override
{:fields {:id {:type :id}
:client {:type :client}
@@ -152,6 +157,7 @@
:hidden {:type 'Boolean}
:automatically_paid_when_due {:type '(list :client)}
:terms_overrides {:type '(list :terms_override)}
:schedule_payment_dom {:type '(list :schedule_payment_dom)}
:account_overrides {:type '(list :vendor_account_override)}
:usage {:type '(list :usage)}
@@ -689,6 +695,11 @@
:client_id {:type :id}
:account_id {:type :id}}}
:add_schedule_payment_dom
{:fields {:id {:type :id}
:client_id {:type :id}
:dom {:type 'Int}}}
:add_vendor
{:fields {:id {:type :id}
:name {:type 'String}
@@ -705,6 +716,7 @@
:default_account_id {:type :id}
:account_overrides {:type '(list :add_account_override)}
:schedule_payment_dom {:type '(list :add_schedule_payment_dom)}
:invoice_reminder_schedule {:type 'String}}}
:edit_expense_account

10
src/clj/auto_ap/graphql/vendors.clj
View File

@@ -8,7 +8,7 @@
[clojure.set :as set]))
(defn upsert-vendor [context {{:keys [id name hidden terms code print_as primary_contact secondary_contact address default_account_id invoice_reminder_schedule terms_overrides account_overrides] :as in} :vendor} value]
(defn upsert-vendor [context {{:keys [id name hidden terms code print_as primary_contact secondary_contact address default_account_id invoice_reminder_schedule schedule_payment_dom terms_overrides account_overrides] :as in} :vendor} value]
(when id
(assert-admin (:id context)))
#_(Thread/sleep 3000)
@@ -31,6 +31,13 @@
:account (:account_id ao)}
(:id ao) (assoc :db/id (:id ao))))
account_overrides)
schedule-payment-dom (mapv
(fn [ao]
(cond->
#:vendor-schedule-payment-dom {:client (:client_id ao)
:dom (:dom ao)}
(:id ao) (assoc :db/id (:id ao))))
schedule_payment_dom)
transaction (cond->
[(remove-nils #:vendor {:db/id (if id
id
@@ -73,6 +80,7 @@
)})]
(is-admin? (:id context)) (conj [:reset (if id id "vendor") :vendor/account-overrides account-overrides])
(is-admin? (:id context)) (conj [:reset (if id id "vendor") :vendor/terms-overrides terms-overrides])
(is-admin? (:id context)) (conj [:reset (if id id "vendor") :vendor/schedule-payment-dom schedule-payment-dom])
(is-admin? (:id context)) (conj [:reset (if id id "vendor") :vendor/automatically-paid-when-due
(mapv
(fn [apwd]