Merge pull request #120 from yoomoney/release/v2.2.5

Release/2.2.5
yoomoney · Feb 15, 2022 · 0259976 · 0259976
2 parents a520751 + c5c9a24
commit 0259976
Show file tree

Hide file tree

Showing 29 changed files with 758 additions and 146 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v2.2.5 от 14.02.2022
+* Отключен способ оплаты Webmoney
+* Обновлен SDK до версии 2.2.6
+
 ### v2.2.4 от 27.01.2022
 * Исправление сохранения параметров типа и предмета оплаты по умолчанию для сертификатов
 

diff --git a/src/upload/admin/controller/extension/payment/yoomoney.php b/src/upload/admin/controller/extension/payment/yoomoney.php
@@ -12,7 +12,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.2.4';
+    const MODULE_VERSION = '2.2.5';
 
     const WIDGET_INSTALL_STATUS_SUCCESS = true;
     const WIDGET_INSTALL_STATUS_FAIL    = false;

diff --git a/src/upload/admin/model/extension/payment/yoomoney.php b/src/upload/admin/model/extension/payment/yoomoney.php
@@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
     /**
      * string
      */
-    const MODULE_VERSION = '2.2.4';
+    const MODULE_VERSION = '2.2.5';
     const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
 
     private $kassaModel;
@@ -65,7 +65,7 @@ public function install()
                 `product_id`        INTEGER  NOT NULL,
                 `payment_subject`   VARCHAR(256),
                 `payment_mode`      VARCHAR(256),
-                                
+
                 CONSTRAINT `'.DB_PREFIX.'yoomoney_payment_pk` PRIMARY KEY (`product_id`)
             ) ENGINE=InnoDB DEFAULT CHARSET=UTF8 COLLATE=utf8_general_ci;
         ');

diff --git a/src/upload/catalog/controller/extension/payment/yoomoney.php b/src/upload/catalog/controller/extension/payment/yoomoney.php
@@ -22,7 +22,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.2.4';
+    const MODULE_VERSION = '2.2.5';
 
     /**
      * @var ModelExtensionPaymentYoomoney

diff --git a/src/upload/catalog/model/extension/payment/yoomoney.php b/src/upload/catalog/model/extension/payment/yoomoney.php
@@ -20,7 +20,7 @@
  */
 class ModelExtensionPaymentYoomoney extends Model
 {
-    const MODULE_VERSION = '2.2.4';
+    const MODULE_VERSION = '2.2.5';
 
     private $kassaModel;
     private $walletModel;

diff --git a/src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php b/src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php
@@ -28,6 +28,7 @@ class KassaModel extends AbstractPaymentModel
     private static $_disabledPaymentMethods = array(
         PaymentMethodType::B2B_SBERBANK,
         PaymentMethodType::WECHAT,
+        PaymentMethodType::WEBMONEY,
     );
 
     protected $shopId;

diff --git a/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.json b/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.json
@@ -52,32 +52,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": {
@@ -106,7 +106,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/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.php b/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'd2718ca30f64c0f7edd4fc28b89806b7498f1890',
+        'reference' => 'caa0100705c3f1d5280ae67fa7aae693b5ca7382',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'd2718ca30f64c0f7edd4fc28b89806b7498f1890',
+            'reference' => 'caa0100705c3f1d5280ae67fa7aae693b5ca7382',
             '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/...oad/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/.travis.yml b/...oad/catalog/model/extension/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/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md b/.../model/extension/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
 * Добавлены уведомления по Сделкам и Выплатам
 

diff --git a/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.en.md b/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.en.md
@@ -6,7 +6,7 @@
 [![Monthly Downloads](https://poser.pugx.org/yoomoney/yookassa-sdk-php/d/monthly)](https://packagist.org/packages/yoomoney/yookassa-sdk-php)
 [![License](https://poser.pugx.org/yoomoney/yookassa-sdk-php/license)](https://packagist.org/packages/yoomoney/yookassa-sdk-php)
 
-[Russian](https://github.com/yoomoney/yookassa-sdk-php/blob/master/README.md) | English
+[Russian](README.md) | English
 
 This product is used for managing payments under [The YooKassa API](https://yookassa.ru/en/developers/api)
 For usage by those who implemented YooKassa using the API method.
@@ -64,38 +64,38 @@ $client->setAuth('shopId', 'secretKey');
 
    [More details in our documentation for the YooKassa API](https://yookassa.ru/en/developers/api#create_payment).
 
-   [More details in our documentation for the YooKassa SDK](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/readme.md).
+   [More details in our documentation for the YooKassa SDK](docs/readme.md).
 
 ## Examples of using the API SDK
 
-#### [YooKassa SDK Settings](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md)
-* [Authentication](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Аутентификация)
-* [Statistics about the environment used](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Статистические-данные-об-используемом-окружении)
-* [Getting information about the store](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Получение-информации-о-магазине)
-* [Working with Webhook](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Работа-с-Webhook)
-* [Notifications](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Входящие-уведомления)
-
-#### [Working with payments](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md)
-* [Request to create a payment](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-создание-платежа)
-* [Request to create a payment via the builder](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-создание-платежа-через-билдер)
-* [Request for partial payment confirmation](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-частичное-подтверждение-платежа)
-* [Request to cancel an incomplete payment](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-отмену-незавершенного-платежа)
-* [Get payment information](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Получить-информацию-о-платеже)
-* [Get a list of payments with filtering](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Получить-список-платежей-с-фильтрацией)
-
-#### [Working with refunds](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md)
-* [Request to create a refund](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Запрос-на-создание-возврата)
-* [Request to create a refund via the builder](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Запрос-на-создание-возврата-через-билдер)
-* [Get refund information](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Получить-информацию-о-возврате)
-* [Get a list of returns with filtering](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Получить-список-возвратов-с-фильтрацией)
-
-#### [Working with receipts](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md)
-* [Request to create a receipt](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Запрос-на-создание-чека)
-* [Request to create a receipt via the builder](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Запрос-на-создание-чека-через-билдер)
-* [Get information about the receipt](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Получить-информацию-о-чеке)
-* [Get a list of receipts with filtering](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Получить-список-чеков-с-фильтрацией)
-
-#### [Working with deals](docs/examples/05-deals.md)
+#### [YooKassa SDK Settings](docs/examples/01-configuration.md)
+* [Authentication](docs/examples/01-configuration.md#Аутентификация)
+* [Statistics about the environment used](docs/examples/01-configuration.md#Статистические-данные-об-используемом-окружении)
+* [Getting information about the store](docs/examples/01-configuration.md#Получение-информации-о-магазине)
+* [Working with Webhook](docs/examples/01-configuration.md#Работа-с-Webhook)
+* [Notifications](docs/examples/01-configuration.md#Входящие-уведомления)
+
+#### [Working with payments](docs/examples/02-payments.md)
+* [Request to create a payment](docs/examples/02-payments.md#Запрос-на-создание-платежа)
+* [Request to create a payment via the builder](docs/examples/02-payments.md#Запрос-на-создание-платежа-через-билдер)
+* [Request for partial payment confirmation](docs/examples/02-payments.md#Запрос-на-частичное-подтверждение-платежа)
+* [Request to cancel an incomplete payment](docs/examples/02-payments.md#Запрос-на-отмену-незавершенного-платежа)
+* [Get payment information](docs/examples/02-payments.md#Получить-информацию-о-платеже)
+* [Get a list of payments with filtering](docs/examples/02-payments.md#Получить-список-платежей-с-фильтрацией)
+
+#### [Working with refunds](docs/examples/03-refunds.md)
+* [Request to create a refund](docs/examples/03-refunds.md#Запрос-на-создание-возврата)
+* [Request to create a refund via the builder](docs/examples/03-refunds.md#Запрос-на-создание-возврата-через-билдер)
+* [Get refund information](docs/examples/03-refunds.md#Получить-информацию-о-возврате)
+* [Get a list of returns with filtering](docs/examples/03-refunds.md#Получить-список-возвратов-с-фильтрацией)
+
+#### [Working with receipts](docs/examples/04-receipts.md)
+* [Request to create a receipt](docs/examples/04-receipts.md#Запрос-на-создание-чека)
+* [Request to create a receipt via the builder](docs/examples/04-receipts.md#Запрос-на-создание-чека-через-билдер)
+* [Get information about the receipt](docs/examples/04-receipts.md#Получить-информацию-о-чеке)
+* [Get a list of receipts with filtering](docs/examples/04-receipts.md#Получить-список-чеков-с-фильтрацией)
+
+#### [Working with safe deals](docs/examples/05-deals.md)
 * [Request to create a deal](docs/examples/05-deals.md#Запрос-на-создание-сделки)
 * [Request to create a deal via the builder](docs/examples/05-deals.md#Запрос-на-создание-сделки-через-билдер)
 * [Request to create a payment with info about deal](docs/examples/05-deals.md#Запрос-на-создание-платежа-с-привязкой-к-сделке)