Merge branch 'OY-4695-update-versions' into MERGE__OY-4459__OY-4695

src/clj/maksut/maksut/db/maksut_queries.clj

@@ -49,9 +49,9 @@
   (let [status      (:status old-ai)
         same-origin (= (:origin old-ai) (:origin new))]
     (cond
-     (= status "overdue") (maksut-error :invoice-invalidstate-overdue "Ei voi muuttaa, eräpäivä mennyt")
-     (= status "paid")    (maksut-error :invoice-invalidstate-paid "Ei voi muuttaa, lasku on jo maksettu")
-     (not same-origin)   (maksut-error :invoice-createerror-originclash "Sama lasku eri lähteestä on jo olemassa"))
+     (= status "overdue") (maksut-error :invoice-invalidstate-overdue (str "Ei voi muuttaa, eräpäivä mennyt: " new))
+     (= status "paid")    (maksut-error :invoice-invalidstate-paid (str "Ei voi muuttaa, lasku on jo maksettu: " new))
+     (not same-origin)   (maksut-error :invoice-createerror-originclash (str "Sama lasku eri lähteestä on jo olemassa: " new)))
     true))
 
 (defn get-lasku [db order-id]

src/clj/maksut/maksut/maksut_service.clj

@@ -49,7 +49,7 @@
     (log/info "Current" (maksut-queries/get-lasku db order-id))
 
     (when-not (time/before? (time/today) due-date)
-      (maksut-error :invoice-createerror-duedateinpast "Due-date needs to be in future." :status-code 422))
+      (maksut-error :invoice-createerror-duedateinpast (str "Due-date needs to be in future: " lasku) :status-code 422))
 
     (maksut-queries/create-or-update-lasku db lasku)
     ;returns created/changed fields from view (including generated fields)
@@ -107,7 +107,7 @@
       (s/validate s/Str application-key)
       (if-let [laskut (seq (maksut-queries/get-laskut-by-reference db origin application-key))]
         (map Lasku->json laskut)
-        (maksut-error :invoice-notfound "Laskuja ei löytynyt"))))
+        (maksut-error :invoice-notfound (str "Laskuja ei löytynyt hakemusavaimella " application-key)))))
 
   (check-status-tutu [this _ input]
     (let [origin (get-in this [:config :lasku-origin])

src/clj/maksut/payment/payment_service.clj

@@ -129,12 +129,12 @@
   (let [laskut (maksut-queries/get-laskut-by-secret db secret)
         lasku (first (filter (fn [x] (= (:order_id x) order-id)) laskut))]
     (cond
-      (not (some? lasku)) (maksut-error :invoice-notfound "Laskua ei löydy")
-      (= (:status lasku) "overdue") (maksut-error :invoice-invalidstate-overdue "Lasku on erääntynyt")
-      (= (:status lasku) "paid") (maksut-error :invoice-invalidstate-paid "Lasku on jo maksettu"))
+      (not (some? lasku)) (maksut-error :invoice-notfound (str "Laskua ei löydy: " secret))
+      (= (:status lasku) "overdue") (maksut-error :invoice-invalidstate-overdue (str "Lasku on erääntynyt: " secret))
+      (= (:status lasku) "paid") (maksut-error :invoice-invalidstate-paid (str "Lasku on jo maksettu: " secret)))
 
     (when (not= (:status lasku) "active")
-          (maksut-error :invoice-not-active "Maksua ei voi enää maksaa"))
+          (maksut-error :invoice-not-active (str "Maksua ei voi enää maksaa: " secret)))
 
     (let [paytrail-config (get-paytrail-config this)
           paytrail-host (:paytrail-host paytrail-config)