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