From 41b12617faa39015f72bfb012a94654d6499e892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=9D=2E=20=D0=9D=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2?= <nikolaevanym@yoomoney.ru>
Date: Wed, 3 Mar 2021 09:33:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  3 +++
 composer.json                     |  2 +-
 lib/Client.php                    |  2 +-
 lib/Helpers/ProductCode.php       |  4 ++--
 tests/Helpers/ProductCodeTest.php | 12 ++++++------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65d90734..aed1f5b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v2.0.7 от 03.03.2021
+* Исправлена ошибка в обработчике кода товара
+
 ### v2.0.6 от 25.02.2021
 * Фильтр номера телефона
 * Формат даты с миллисекундами
diff --git a/composer.json b/composer.json
index dc25aadb..69e08e8b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
       "email": "cms@yoomoney.ru"
     }
   ],
-  "version": "2.0.6",
+  "version": "2.0.7",
   "require": {
     "php": ">=5.3.0",
     "ext-curl": "*",
diff --git a/lib/Client.php b/lib/Client.php
index abc136b0..805b9aff 100644
--- a/lib/Client.php
+++ b/lib/Client.php
@@ -91,7 +91,7 @@ class Client extends BaseClient
     /**
      * Текущая версия библиотеки
      */
-    const SDK_VERSION = '2.0.6';
+    const SDK_VERSION = '2.0.7';
 
     /**
      * Получить список платежей магазина.
diff --git a/lib/Helpers/ProductCode.php b/lib/Helpers/ProductCode.php
index db57ec94..c4dba477 100644
--- a/lib/Helpers/ProductCode.php
+++ b/lib/Helpers/ProductCode.php
@@ -269,13 +269,13 @@ class ProductCode
     }
 
     /**
-     * Переводит десятичное число в шестнадцатеричный вид и дополняет нулями до 14 символов слева
+     * Переводит десятичное число в шестнадцатеричный вид и дополняет нулями до 12 символов слева
      * @param string $string Входящее число (Глобальный номер товарной продукции)
      * @return string
      */
     private function numToHex($string)
     {
-        return str_pad($this->base_convert($string), 14, '0', STR_PAD_LEFT);
+        return str_pad($this->base_convert($string), 12, '0', STR_PAD_LEFT);
     }
 
     /**
diff --git a/tests/Helpers/ProductCodeTest.php b/tests/Helpers/ProductCodeTest.php
index 3c7641e6..f40bbc9a 100644
--- a/tests/Helpers/ProductCodeTest.php
+++ b/tests/Helpers/ProductCodeTest.php
@@ -206,7 +206,7 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
                     'gtin' => '04630037591316',
                     'serial' => 'sgEKKPPcS25y5',
                     'dataMatrix' => '010463003407001221SxMGorvNuq6Wk91fgr92sdfsdfghfgjh',
-                    'result' => '00 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
+                    'result' => '04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
                 ),
             ),
             array(
@@ -216,7 +216,7 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
                     'gtin' => '4630037591316',
                     'serial' => 'sgEKKPPcS25y5',
                     'dataMatrix' => '010463003407001221SxMGorvNuq6Wk91fgr92sdfsdfghfgjh',
-                    'result' => '44 4D 00 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
+                    'result' => '44 4D 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
                 ),
             ),
             array(
@@ -226,7 +226,7 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
                     'gtin' => '04630037591316',
                     'serial' => 'sgEKKPPcS25y5',
                     'dataMatrix' => '010463003407001221SxMGorvNuq6Wk91fgr92sdfsdfghfgjh',
-                    'result' => '00 05 00 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
+                    'result' => '00 05 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
                 ),
             ),
             array(
@@ -236,7 +236,7 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
                     'gtin' => '04630037591316',
                     'serial' => 'sgEKKPPcS25y5',
                     'dataMatrix' => '010463003407001221SxMGorvNuq6Wk91fgr92sdfsdfghfgjh',
-                    'result' => '01 F9 00 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
+                    'result' => '01 F9 04 36 03 89 39 FC 53 78 4D 47 6F 72 76 4E 75 71 36 57 6B',
                 ),
             ),
             array(
@@ -246,7 +246,7 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
                     'gtin' => '98765432101234',
                     'serial' => 'ABC1234',
                     'dataMatrix' => '019876543210123421ABC123491DmUO92sdfJSf/"fgjh',
-                    'result' => '00 59 D3 9E 7F 19 72 41 42 43 31 32 33 34',
+                    'result' => '59 D3 9E 7F 19 72 41 42 43 31 32 33 34',
                 ),
             ),
             array(
@@ -256,7 +256,7 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
                     'gtin' => '98765432101234',
                     'serial' => 'ABC1234',
                     'dataMatrix' => '019876543210123421ABC1234',
-                    'result' => '00 59 D3 9E 7F 19 72 41 42 43 31 32 33 34',
+                    'result' => '59 D3 9E 7F 19 72 41 42 43 31 32 33 34',
                 ),
             ),
             array(