From 3c4c98953c2135b4c541972fb75e91ac1ba66fa3 Mon Sep 17 00:00:00 2001
From: Erik Uus <erik.uus@gmail.com>
Date: Tue, 14 Jan 2025 13:51:01 +0200
Subject: [PATCH] Improves EveryPay failure handling

---
 components/everypay/XEveryPay.php              | 3 +--
 components/everypay/XEveryPayWebhookAction.php | 5 ++---
 components/everypay/messages/et/everypay.php   | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 components/everypay/messages/et/everypay.php

diff --git a/components/everypay/XEveryPay.php b/components/everypay/XEveryPay.php
index 1cdccc3..242a899 100644
--- a/components/everypay/XEveryPay.php
+++ b/components/everypay/XEveryPay.php
@@ -270,8 +270,7 @@ public function validatePayment()
 				return true;
 			else
 			{
-				$this->errorMessage='EveryPay Payment State: ' . $this->paymentState;
-				$this->log($this->errorMessage);
+				$this->errorMessage=Yii::t('XEveryPay.everypay', 'Payment not completed!');
 				return false;
 			}
 
diff --git a/components/everypay/XEveryPayWebhookAction.php b/components/everypay/XEveryPayWebhookAction.php
index 19b4e88..7f23873 100644
--- a/components/everypay/XEveryPayWebhookAction.php
+++ b/components/everypay/XEveryPayWebhookAction.php
@@ -108,11 +108,10 @@ public function run()
 		{
 			// Payment validation failed or not settled
 			$logMessage=
-				"EveryPay payment validation with EveryPay component failed: ".PHP_EOL.
-				"errorMessage: ".$everyPay->errorMessage.$rawBody.PHP_EOL.
+				"EveryPay payment validation failed: ".PHP_EOL.
+				"errorMessage: ".$everyPay->errorMessage.PHP_EOL.
 				"rawBody: ".$rawBody;
 
-			$this->log($logMessage);
 			$this->handleFailure($logMessage, $webhookUid);
 			http_response_code(200);
 		}
diff --git a/components/everypay/messages/et/everypay.php b/components/everypay/messages/et/everypay.php
new file mode 100644
index 0000000..8cc3b97
--- /dev/null
+++ b/components/everypay/messages/et/everypay.php
@@ -0,0 +1,4 @@
+<?php
+return array(
+  'Payment not completed!' => 'Makse ei ole lõpule viidud!',
+);