Merge pull request #14 from yoomoney/release/v2.1.2

Release/2.1.2
yoomoney · Feb 15, 2022 · 76dda56 · 76dda56
2 parents c5a0ffd + bf08df9
commit 76dda56
Show file tree

Hide file tree

Showing 25 changed files with 802 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v2.1.2 от 14.02.2022
+* Обновлен SDK до версии 2.2.6
+* Отключен способ оплаты Webmoney
+
 ### v2.1.1 от 02.12.2021
 * Обновлен SDK до версии 2.2.2
 

diff --git a/oscommerce-yoomoney-module.zip b/oscommerce-yoomoney-module.zip
diff --git a/src/includes/modules/payment/yoomoney.php b/src/includes/modules/payment/yoomoney.php
@@ -17,7 +17,7 @@ class YooMoney
     const MODE_KASSA = 1;
     const MODE_MONEY = 2;
 
-    const MODULE_VERSION = '2.1.1';
+    const MODULE_VERSION = '2.1.2';
     const INSTALLMENTS_MIN_AMOUNT = 3000;
 
     public $code;
@@ -28,6 +28,12 @@ class YooMoney
     private $epl;
     private $mode;
 
+    public static $disabledMethods = array(
+        PaymentMethodType::B2B_SBERBANK,
+        PaymentMethodType::WECHAT,
+        PaymentMethodType::WEBMONEY,
+    );
+
     public function __construct()
     {
         $this->signature = 'YooMoney|YooMoney|'.self::MODULE_VERSION.'|'.self::MODULE_VERSION;
@@ -101,12 +107,12 @@ private function applyVersionInfo()
 </style>
 <script type="text/javascript">
 jQuery(document).ready(function () {
-    
+
     jQuery('#backup-list-window').delegate('a.restore-backup', 'click', restoreBackupHandler);
     jQuery('#backup-list-window').delegate('a.remove-backup', 'click', removeBackupHandler);
-    
+
     jQuery('#update-module').click(updateModuleHandler);
-    
+
     jQuery('#backup-list').click(function () {
         jQuery.ajax({
             url: 'ext/modules/payment/yoomoney/ajax.php',
@@ -134,7 +140,7 @@ private function applyVersionInfo()
             }
         });
     });
-    
+
     function restoreBackupHandler() {
         var row = jQuery(this).parents('tr.backup-row')[0];
         if (window.confirm('Вы действительно хотите восстановить резервную копию "' + row.dataset.id + '" из файла "' + row.dataset.name + '"?')) {
@@ -154,7 +160,7 @@ function restoreBackupHandler() {
             });
         }
     }
-    
+
     function removeBackupHandler() {
         var row = jQuery(this).parents('tr.backup-row')[0];
         if (window.confirm('Вы действительно хотите удалить резервную копию "' + row.dataset.name + '" для версии "' + row.dataset.id + '"?')) {
@@ -174,7 +180,7 @@ function removeBackupHandler() {
             });
         }
     }
-    
+
     function updateModuleHandler() {
         if (window.confirm('Вы действительно хотите обновить модуль до последней версии?')) {
             jQuery.ajax({
@@ -241,7 +247,7 @@ public function selection()
             $additional_fields = array();
             $payment_types     = array();
             foreach (PaymentMethodType::getEnabledValues() as $value) {
-                if (!in_array($value, array(PaymentMethodType::B2B_SBERBANK, PaymentMethodType::WECHAT))) {
+                if (!in_array($value, self::$disabledMethods)) {
                     $const = 'MODULE_PAYMENT_YOOMONEY_PAYMENT_METHOD_'.strtoupper($value);
                     if (defined($const) && constant($const) == MODULE_PAYMENT_YOOMONEY_TRUE) {
                         $const .= '_TEXT';
@@ -307,13 +313,13 @@ public function selection()
 <script>
 jQuery(document).ready(function () {
     var form = document.forms.checkout_payment;
-    
+
     var qiwiBlock = jQuery("#yoomoney-qiwi-phone").parent().parent();
     var alfaBlock = jQuery("#yoomoney-alfa-login").parent().parent();
-    
+
     qiwiBlock.css("display", "none");
     alfaBlock.css("display", "none");
-    
+
     jQuery(form.yoomoney_payment_type).change(function () {
         qiwiBlock.css("display", "none");
         alfaBlock.css("display", "none");
@@ -554,7 +560,7 @@ public function keys()
                 'MODULE_PAYMENT_YOOMONEY_PAYMENT_DESCRIPTION',
             );
             foreach (PaymentMethodType::getEnabledValues() as $value) {
-                if (!in_array($value, array(PaymentMethodType::B2B_SBERBANK, PaymentMethodType::WECHAT))) {
+                if (!in_array($value, self::$disabledMethods)) {
                     $array[] = 'MODULE_PAYMENT_YOOMONEY_PAYMENT_METHOD_'.strtoupper($value);
                 }
             }
@@ -625,61 +631,61 @@ public function install()
         }
 
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_TEST_LANG."', 
-            'MODULE_PAYMENT_YOOMONEY_TEST', 
-            '".MODULE_PAYMENT_YOOMONEY_TRUE."', 
-            '', 
+            '".MODULE_PAYMENT_YOOMONEY_TEST_LANG."',
+            'MODULE_PAYMENT_YOOMONEY_TEST',
+            '".MODULE_PAYMENT_YOOMONEY_TRUE."',
+            '',
             '6', '0', 'tep_cfg_select_option(array(\'".MODULE_PAYMENT_YOOMONEY_TRUE."\', \'".MODULE_PAYMENT_YOOMONEY_FALSE."\'), ', now())"
         );
 
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_STATUS_LNG."', 
-            'MODULE_PAYMENT_YOOMONEY_STATUS', 
-            '".MODULE_PAYMENT_YOOMONEY_TRUE."', 
-            '', 
+            '".MODULE_PAYMENT_YOOMONEY_STATUS_LNG."',
+            'MODULE_PAYMENT_YOOMONEY_STATUS',
+            '".MODULE_PAYMENT_YOOMONEY_TRUE."',
+            '',
             '6', '0', 'tep_cfg_select_option(array(\'".MODULE_PAYMENT_YOOMONEY_TRUE."\', \'".MODULE_PAYMENT_YOOMONEY_FALSE."\'), ', now())"
         );
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_ACCEPT_YOOMONEY_LNG."', 
-            'MODULE_PAYMENT_YOOMONEY_ACCEPT_YOOMONEY', 
-           '".MODULE_PAYMENT_YOOMONEY_TRUE."', 
-            '', 
+            '".MODULE_PAYMENT_YOOMONEY_ACCEPT_YOOMONEY_LNG."',
+            'MODULE_PAYMENT_YOOMONEY_ACCEPT_YOOMONEY',
+           '".MODULE_PAYMENT_YOOMONEY_TRUE."',
+            '',
             '6', '0', 'tep_cfg_select_option(array(\'".MODULE_PAYMENT_YOOMONEY_TRUE."\', \'".MODULE_PAYMENT_YOOMONEY_FALSE."\'),', now())"
         );
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_ACCEPT_CARDS_LNG."', 
-            'MODULE_PAYMENT_YOOMONEY_ACCEPT_CARDS', 
-            '".MODULE_PAYMENT_YOOMONEY_TRUE."', 
-            '', 
+            '".MODULE_PAYMENT_YOOMONEY_ACCEPT_CARDS_LNG."',
+            'MODULE_PAYMENT_YOOMONEY_ACCEPT_CARDS',
+            '".MODULE_PAYMENT_YOOMONEY_TRUE."',
+            '',
             '6', '0', 'tep_cfg_select_option(array(\'".MODULE_PAYMENT_YOOMONEY_TRUE."\', \'".MODULE_PAYMENT_YOOMONEY_FALSE."\'),', now())"
         );
 
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values (
         '".MODULE_PAYMENT_YOOMONEY_ACCOUNT_LNG."',
-        'MODULE_PAYMENT_YOOMONEY_ACCOUNT', 
-        '', 
-         '".MODULE_PAYMENT_YOOMONEY_ONLY_IND_LNG."', 
+        'MODULE_PAYMENT_YOOMONEY_ACCOUNT',
+        '',
+         '".MODULE_PAYMENT_YOOMONEY_ONLY_IND_LNG."',
         '6', '0', now())");
 
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_PASSWORD_LNG."', 
-            'MODULE_PAYMENT_YOOMONEY_PASSWORD', 
-            '', 
-            '', 
+            '".MODULE_PAYMENT_YOOMONEY_PASSWORD_LNG."',
+            'MODULE_PAYMENT_YOOMONEY_PASSWORD',
+            '',
+            '',
             '6', '0', now())");
 
 
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_SORT_LNG."', 
-            'MODULE_PAYMENT_YOOMONEY_SORT_ORDER', 
-            '0', 
-            '".MODULE_PAYMENT_YOOMONEY_SORT2_LNG."', 
+            '".MODULE_PAYMENT_YOOMONEY_SORT_LNG."',
+            'MODULE_PAYMENT_YOOMONEY_SORT_ORDER',
+            '0',
+            '".MODULE_PAYMENT_YOOMONEY_SORT2_LNG."',
             '6', '0', now())");
         tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, use_function, date_added) values (
-            '".MODULE_PAYMENT_YOOMONEY_ORDER_STATUS_LNG."', 
-            'MODULE_PAYMENT_YOOMONEY_ORDER_STATUS_ID', 
-            '', 
-            '', 
+            '".MODULE_PAYMENT_YOOMONEY_ORDER_STATUS_LNG."',
+            'MODULE_PAYMENT_YOOMONEY_ORDER_STATUS_ID',
+            '',
+            '',
             '6', '0', 'tep_cfg_pull_down_order_statuses(', 'tep_get_order_status_name', now())");
 
     }
@@ -817,4 +823,4 @@ function get_setted_taxes_yoomoney($id)
     if (isset($taxes[$id])) {
         return $taxes[$id];
     }
-}
+}
diff --git a/src/includes/modules/payment/yoomoney/vendor/composer/installed.json b/src/includes/modules/payment/yoomoney/vendor/composer/installed.json
@@ -55,32 +55,32 @@
         },
         {
             "name": "yoomoney/yookassa-sdk-php",
-            "version": "2.2.2",
-            "version_normalized": "2.2.2.0",
+            "version": "2.2.6",
+            "version_normalized": "2.2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yoomoney/yookassa-sdk-php.git",
-                "reference": "cc9cddb807d93e4549af7f298f9780a3ebd3561a"
+                "reference": "0bbd87d76310b3239b6e6de6534c9fab9e7db847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/cc9cddb807d93e4549af7f298f9780a3ebd3561a",
-                "reference": "cc9cddb807d93e4549af7f298f9780a3ebd3561a",
+                "url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/0bbd87d76310b3239b6e6de6534c9fab9e7db847",
+                "reference": "0bbd87d76310b3239b6e6de6534c9fab9e7db847",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "php": ">=5.3.0",
-                "psr/log": "^1.0 || ^2.0 || ^3.0"
+                "psr/log": "^1.0"
             },
             "require-dev": {
                 "ext-xml": "*",
                 "mockery/mockery": "^0.9.9",
                 "phpunit/phpunit": "^4.8.35 || ^5.7"
             },
-            "time": "2021-11-16T11:21:19+00:00",
+            "time": "2022-01-21T13:31:53+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/yoomoney/yookassa-sdk-php/issues",
-                "source": "https://github.com/yoomoney/yookassa-sdk-php/tree/2.2.2"
+                "source": "https://github.com/yoomoney/yookassa-sdk-php/tree/2.2.6"
             },
             "install-path": "../yoomoney/yookassa-sdk-php"
         }

diff --git a/src/includes/modules/payment/yoomoney/vendor/composer/installed.php b/src/includes/modules/payment/yoomoney/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '7a28e63227d23b922296b00538defc5ba696b8fa',
+        'reference' => '32d1b57bd98202b5ad85b5d41a87a4037778b617',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '7a28e63227d23b922296b00538defc5ba696b8fa',
+            'reference' => '32d1b57bd98202b5ad85b5d41a87a4037778b617',
             'dev_requirement' => false,
         ),
         'psr/log' => array(
@@ -29,12 +29,12 @@
             'dev_requirement' => false,
         ),
         'yoomoney/yookassa-sdk-php' => array(
-            'pretty_version' => '2.2.2',
-            'version' => '2.2.2.0',
+            'pretty_version' => '2.2.6',
+            'version' => '2.2.6.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../yoomoney/yookassa-sdk-php',
             'aliases' => array(),
-            'reference' => 'cc9cddb807d93e4549af7f298f9780a3ebd3561a',
+            'reference' => '0bbd87d76310b3239b6e6de6534c9fab9e7db847',
             'dev_requirement' => false,
         ),
     ),

diff --git a/src/includes/modules/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/.travis.yml b/src/includes/modules/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/.travis.yml
@@ -13,8 +13,8 @@ matrix:
   include:
     - php: 5.5
       dist: trusty
-#    - php: 5.4
-#      dist: precise
+    - php: 5.4
+      dist: trusty
 #    - php: 5.3
 #      dist: precise
 

diff --git a/...includes/modules/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md b/...includes/modules/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md
@@ -1,3 +1,20 @@
+### v2.2.6 от 21.01.2022
+* Откат поддержки psr/log версий 2 и 3
+
+### v2.2.5 от 28.12.2021
+* Добавлен метод проверки IP адреса уведомления от Юkassa среди известных адресов Юkassa
+* Добавлены тесты
+* Добавлен пример в документацию
+
+### v2.2.4 от 09.12.2021
+* Фикс метода jsonSerialize() для ReceiptResponseItem
+* Добавлена проверка на параметр platform_fee_amount при создании запроса для двухстадийного платежа 
+* Обновлены тесты
+* Обновлен readme
+
+### v2.2.3 от 07.12.2021
+* Добавлена обработка параметра authorization_details.three_d_secure.applied в объекте платежа
+
 ### v2.2.2 от 16.11.2021
 * Добавлены уведомления по Сделкам и Выплатам