git pushMerge branch 'master' of codecommit://integreat
This commit is contained in:
@@ -412,9 +412,13 @@
|
||||
(let [result (audit-transact (map #(if (map? %)
|
||||
(dissoc % :payment/pdf-data)
|
||||
%) checks) id)]
|
||||
|
||||
(doseq [[_ i] (:tempids result)]
|
||||
(solr/touch-with-ledger i)))
|
||||
|
||||
(try
|
||||
(doseq [[_ i] (:tempids result)]
|
||||
(solr/touch-with-ledger i))
|
||||
(catch Exception e
|
||||
(alog/error ::cant-save-solr
|
||||
:error e))))
|
||||
{:invoices (d-invoices/get-multi (map :invoice-id invoice-payments))
|
||||
:pdf-url (if (= type :payment-type/check)
|
||||
(mu/trace ::merge-pdfs
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
s3-location)
|
||||
:import-status :import-status/imported)))]
|
||||
(alog/info ::found-imports :imports imports)
|
||||
(invoices/import-uploaded-invoice {:user/role "admin"} imports))))
|
||||
(invoices/import-uploaded-invoice {:user/role "admin" :user/name "Email Invoice Importer"} imports))))
|
||||
(catch Exception e
|
||||
(alog/warn ::cant-import :error e)
|
||||
(send-email-about-failed-message (-> r :s3 :bucket :name) (-> r :s3 :object :key) (str e)))
|
||||
|
||||
@@ -1086,8 +1086,12 @@
|
||||
:payment/date (coerce/to-date (:handwritten-date snapshot)))]
|
||||
(invoice-payments invoices invoice-payment-lookup))
|
||||
(:identity request))]
|
||||
(doseq [[_ i] (:tempids result)]
|
||||
(solr/touch-with-ledger i)))))
|
||||
(try
|
||||
(doseq [[_ i] (:tempids result)]
|
||||
(solr/touch-with-ledger i))
|
||||
(catch Exception e
|
||||
(alog/error ::cant-save-solr
|
||||
:error e))))))
|
||||
|
||||
;; TODO support crediting from balance
|
||||
(defrecord PayWizard [form-params current-step invoice-by-id]
|
||||
|
||||
Reference in New Issue
Block a user