$params */
diff --git a/catalog/controller/payment/payanyway.php b/catalog/controller/payment/payanyway.php
index f417540..43ab3da 100755
--- a/catalog/controller/payment/payanyway.php
+++ b/catalog/controller/payment/payanyway.php
@@ -4,8 +4,38 @@ declare(strict_types=1);
namespace Opencart\Catalog\Controller\Extension\PayAnyWay\Payment;
+use Opencart\Catalog\Model\Account\Customer as ModelAccountCustomer;
+use Opencart\Catalog\Model\Account\Order as ModelAccountOrder;
+use Opencart\Catalog\Model\Checkout\Order as ModelCheckoutOrder;
+use Opencart\System\Engine\Config;
+use Opencart\System\Engine\Loader;
+use Opencart\System\Library\Cart\Currency;
+use Opencart\System\Library\Cart\Customer;
+use Opencart\System\Library\Document;
+use Opencart\System\Library\Language;
+use Opencart\System\Library\Request;
+use Opencart\System\Library\Response;
+use Opencart\System\Library\Session;
+use Opencart\System\Library\Url;
+
require_once DIR_EXTENSION . '/payanyway/catalog/library/payanyway/traits/payanyway.php';
+/**
+ * @property Config $config
+ * @property Loader $load
+ * @property Request $request
+ * @property Response $response
+ * @property Document $document
+ * @property Session $session
+ * @property Language $language
+ * @property Url $url
+ * @property Currency $currency
+ * @property ModelCheckoutOrder $model_checkout_order
+ * @property ModelAccountOrder $model_account_order
+ * @property ModelAccountCustomer $model_account_customer
+ * @property Customer $customer
+ */
+
class PayAnyWay extends \Opencart\System\Engine\Controller
{
use \Opencart\Catalog\Library\Extension\PayAnyWay\Traits\PayAnyWay;
@@ -13,7 +43,8 @@ class PayAnyWay extends \Opencart\System\Engine\Controller
private const PAYMENT_SERVER_PROD = 'prod';
private const PAYMENT_URL_PROD = 'https://www.payanyway.ru/assistant.htm';
private const PAYMENT_URL_DEMO = 'https://demo.moneta.ru/assistant.htm';
- private const DESCRIPTION_MAX_LENGTH = 500;
+
+ public const DESCRIPTION_MAX_LENGTH = 500;
private int $mntId;
private string $integrityCode;
@@ -71,14 +102,16 @@ class PayAnyWay extends \Opencart\System\Engine\Controller
$this->integrityCode,
);
$data['MNT_SIGNATURE'] = $signature;
- $data['MNT_SUCCESS_URL'] = $this->url->link('extension/payanyway/payment/payanyway.success', 'language=' . $this->config->get('config_language'), true,);
- $data['MNT_FAIL_URL'] = $this->url->link('extension/payanyway/payment/payanyway.fail', 'language=' . $this->config->get('config_language'), true,);
- $data['MNT_RETURN_URL'] = $this->url->link('checkout/checkout', 'language=' . $this->config->get('config_language'), true,);
+ $customerToken = $this->session->data['customer_token'];
+ $data['MNT_SUCCESS_URL'] = $this->url->link('extension/payanyway/payment/payanyway.success', 'customer_token=' . $customerToken, true);
+ $data['MNT_FAIL_URL'] = $this->url->link('extension/payanyway/payment/payanyway.fail', 'customer_token=' . $customerToken, true);
+ $data['MNT_RETURN_URL'] = $this->url->link('checkout/checkout', 'customer_token=' . $customerToken, true);
+ $data['moneta_locale'] = $this->language->get('text_locale');
$data['MNT_CMS'] = $this->cmsModuleVersion;
$data['btn_confirm'] = $this->language->get('text_paw_pay');
- $data['confirm_url'] = $this->url->link('extension/payanyway/payment/payanyway.confirm', 'language=' . $this->config->get('config_language'), true,);
+ $data['confirm_url'] = $this->url->link('extension/payanyway/payment/payanyway.confirm', 'customer_token=' . $customerToken, true,);
return $this->load->view('extension/payanyway/payment/payanyway', $data);
}
@@ -86,7 +119,11 @@ class PayAnyWay extends \Opencart\System\Engine\Controller
public function confirm(): void
{
$this->load->language('extension/payanyway/payment/payanyway');
- $this->addOrderHistory($this->orderId, $this->pendingOrderStatusId, $this->language->get('text_order_confirmed'),);
+
+ $orderStatusId = isset($this->orderInfo['order_status_id']) ? (int)$this->orderInfo['order_status_id'] : null;
+ if ((null !== $orderStatusId) && ($orderStatusId !== $this->successOrderStatusId)) {
+ $this->addOrderHistory($this->orderId, $this->pendingOrderStatusId, $this->language->get('text_order_confirmed'),);
+ }
$json['success'] = true;
@@ -97,30 +134,41 @@ class PayAnyWay extends \Opencart\System\Engine\Controller
public function success(): void
{
$this->load->language('extension/payanyway/payment/payanyway');
- $this->addOrderHistory($this->orderId, $this->pendingOrderStatusId, $this->language->get('text_payment_processing'),);
- $this->response->redirect($this->url->link('checkout/success', '', true));
+
+ $orderStatusId = isset($this->orderInfo['order_status_id']) ? (int)$this->orderInfo['order_status_id'] : null;
+ if ((null !== $orderStatusId) && ($orderStatusId !== $this->successOrderStatusId)) {
+ $this->addOrderHistory($this->orderId, $this->pendingOrderStatusId, $this->language->get('text_payment_processing'));
+ }
+
+ $customerToken = $this->request->get['customer_token'] ?? '';
+
+ $this->response->redirect($this->url->link('checkout/success', 'customer_token=' . $customerToken, true));
}
public function fail(): void
{
$this->load->language('extension/payanyway/payment/payanyway');
- $this->addOrderHistory($this->orderId, $this->errorOrderStatusId, $this->language->get('text_payment_error'),);
+
+ $orderStatusId = isset($this->orderInfo['order_status_id']) ? (int)$this->orderInfo['order_status_id'] : null;
+ if ((null !== $orderStatusId) && ($orderStatusId !== $this->successOrderStatusId)) {
+ $this->addOrderHistory($this->orderId, $this->errorOrderStatusId, $this->language->get('text_payment_error'));
+ }
+
$this->response->redirect($this->url->link('checkout/failure', '', true));
}
private function getDescription(): string
{
- $clientName = trim(($this->orderInfo['firstname'] ?? '') . ' ' . ($this->orderInfo['lastname'] ?? ''));
-
$orderId = $this->orderInfo['order_id'] ?? null;
$description = "Оплата заказа" . (!empty($orderId) ? " №{$orderId}" : '');
- if ('' !== $clientName) {
- $description .= " от {$clientName}";
+ $name = $this->getClientName();
+ if (null !== $name) {
+ $description .= " от {$name}";
}
$comment = $this->orderInfo['comment'] ?? '';
- if ($comment !== '') {
+ if ('' !== $comment) {
$description .= ': ' . htmlspecialchars($comment, ENT_QUOTES, 'UTF-8');
}
@@ -129,13 +177,6 @@ class PayAnyWay extends \Opencart\System\Engine\Controller
private function getSubscriberId(): string
{
- $email = filter_var($this->orderInfo['email'] ?? '', FILTER_SANITIZE_EMAIL);
- if ('' !== $email) {
- return $email;
- }
-
- $phoneNumber = preg_replace('/[^0-9+]/', '', $this->orderInfo['telephone'] ?? '');
-
- return $phoneNumber ?: '';
+ return $this->getClientEmail() ?? $this->getClientPhone() ?? '';
}
}
diff --git a/catalog/language/en-gb/payment/payanyway.php b/catalog/language/en-gb/payment/payanyway.php
index b48dddf..beede39 100755
--- a/catalog/language/en-gb/payment/payanyway.php
+++ b/catalog/language/en-gb/payment/payanyway.php
@@ -1,5 +1,6 @@
load->model('checkout/order');
$this->model_checkout_order->addHistory($orderId, $orderStatusId, $comment);
}
+
+ /** @return non-empty-string|null */
+ private function getClientName(): ?string
+ {
+ $name = trim(($this->orderInfo['firstname'] ?? '') . ' ' . ($this->orderInfo['lastname'] ?? ''));
+ return ('' !== $name) ? $name : null;
+ }
+
+ /** @return non-empty-string|null */
+ private function getClientEmail(): ?string
+ {
+ $email = trim((string)($this->orderInfo['email'] ?? ''));
+ return ('' !== $email) ? filter_var($email, FILTER_SANITIZE_EMAIL) : null;
+ }
+
+ /** @return non-empty-string|null */
+ private function getClientPhone(): ?string
+ {
+ $digits = preg_replace('/\D/', '', trim((string)($this->orderInfo['telephone'] ?? '')));
+ return ('' !== $digits) ? '+' . $digits : null;
+ }
}
diff --git a/catalog/view/template/payment/payanyway.twig b/catalog/view/template/payment/payanyway.twig
index d406ee1..d7be749 100755
--- a/catalog/view/template/payment/payanyway.twig
+++ b/catalog/view/template/payment/payanyway.twig
@@ -10,6 +10,7 @@
+
+