From f197d936f30f3232aa9af03f95d7cbb3c6c8e3b8 Mon Sep 17 00:00:00 2001
From: Leonix <leonix@motd.ru>
Date: Thu, 19 Oct 2023 13:27:46 +0300
Subject: [PATCH] =?UTF-8?q?wa-plugins/payment/tinkoff=20v.1.0.22=20=20=20*?=
 =?UTF-8?q?=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20HTTP-?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20(=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B1=D0=B5=D0=BA=D0=BE=D0=B2)=20=D0=BE=D1=82=20?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=82=D1=91=D0=B6=D0=BD=D0=BE=D0=B9=20=D1=81?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20=D0=B7=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wa-plugins/payment/tinkoff/lib/config/plugin.php        | 2 +-
 wa-plugins/payment/tinkoff/lib/tinkoffPayment.class.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wa-plugins/payment/tinkoff/lib/config/plugin.php b/wa-plugins/payment/tinkoff/lib/config/plugin.php
index 0fe3917ef..f7efc0c38 100644
--- a/wa-plugins/payment/tinkoff/lib/config/plugin.php
+++ b/wa-plugins/payment/tinkoff/lib/config/plugin.php
@@ -5,7 +5,7 @@
     'icon'            => 'img/tinkoff16.png',
     'logo'            => 'img/tinkoff.png',
     'vendor'          => 'webasyst',
-    'version'         => '1.0.21',
+    'version'         => '1.0.22',
     'type'            => waPayment::TYPE_ONLINE,
     'partial_refund'  => true,
     'partial_capture' => true,
diff --git a/wa-plugins/payment/tinkoff/lib/tinkoffPayment.class.php b/wa-plugins/payment/tinkoff/lib/tinkoffPayment.class.php
index 43409f6ba..ec83a49d4 100644
--- a/wa-plugins/payment/tinkoff/lib/tinkoffPayment.class.php
+++ b/wa-plugins/payment/tinkoff/lib/tinkoffPayment.class.php
@@ -175,12 +175,14 @@ private function checkToken($args)
 
 
         ksort($args);
-        foreach ($args as &$arg) {
+        foreach ($args as $k => &$arg) {
             if (is_bool($arg)) {
                 $arg = $arg ? 'true' : 'false';
+            } else if (!is_scalar($arg)) {
+                unset($args[$k]);
             }
-            unset($arg);
         }
+        unset($arg);
 
         $expected_token = hash('sha256', implode('', $args));
 
@@ -789,7 +791,7 @@ protected function formalizeData($data)
                 break;
 
             case 'CONFIRMED':
-                if ($parent_transaction) {
+                if ($parent_transaction && $parent_transaction['type'] == self::OPERATION_AUTH_ONLY) {
                     $transaction_data['type'] = self::OPERATION_CAPTURE;
                 } else {
                     $transaction_data['type'] = self::OPERATION_AUTH_CAPTURE;