Skip to content

Commit 0259976

Browse files
tonchik-tmtonchik-tm
authored
Merge pull request #120 from yoomoney/release/v2.2.5
Release/2.2.5
2 parents a520751 + c5c9a24 commit 0259976

29 files changed

+758
-146
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### v2.2.5 от 14.02.2022
2+
* Отключен способ оплаты Webmoney
3+
* Обновлен SDK до версии 2.2.6
4+
15
### v2.2.4 от 27.01.2022
26
* Исправление сохранения параметров типа и предмета оплаты по умолчанию для сертификатов
37

‎src/upload/admin/controller/extension/payment/yoomoney.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class ControllerExtensionPaymentYoomoney extends Controller
1313
{
1414
const MODULE_NAME = 'yoomoney';
15-
const MODULE_VERSION = '2.2.4';
15+
const MODULE_VERSION = '2.2.5';
1616

1717
const WIDGET_INSTALL_STATUS_SUCCESS = true;
1818
const WIDGET_INSTALL_STATUS_FAIL = false;

‎src/upload/admin/model/extension/payment/yoomoney.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
55
/**
66
* string
77
*/
8-
const MODULE_VERSION = '2.2.4';
8+
const MODULE_VERSION = '2.2.5';
99
const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
1010

1111
private $kassaModel;
@@ -65,7 +65,7 @@ public function install()
6565
`product_id` INTEGER NOT NULL,
6666
`payment_subject` VARCHAR(256),
6767
`payment_mode` VARCHAR(256),
68-
68+
6969
CONSTRAINT `'.DB_PREFIX.'yoomoney_payment_pk` PRIMARY KEY (`product_id`)
7070
) ENGINE=InnoDB DEFAULT CHARSET=UTF8 COLLATE=utf8_general_ci;
7171
');

‎src/upload/catalog/controller/extension/payment/yoomoney.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
class ControllerExtensionPaymentYoomoney extends Controller
2323
{
2424
const MODULE_NAME = 'yoomoney';
25-
const MODULE_VERSION = '2.2.4';
25+
const MODULE_VERSION = '2.2.5';
2626

2727
/**
2828
* @var ModelExtensionPaymentYoomoney

‎src/upload/catalog/model/extension/payment/yoomoney.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class ModelExtensionPaymentYoomoney extends Model
2222
{
23-
const MODULE_VERSION = '2.2.4';
23+
const MODULE_VERSION = '2.2.5';
2424

2525
private $kassaModel;
2626
private $walletModel;

‎src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class KassaModel extends AbstractPaymentModel
2828
private static $_disabledPaymentMethods = array(
2929
PaymentMethodType::B2B_SBERBANK,
3030
PaymentMethodType::WECHAT,
31+
PaymentMethodType::WEBMONEY,
3132
);
3233

3334
protected $shopId;

‎src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -52,32 +52,32 @@
5252
},
5353
{
5454
"name": "yoomoney/yookassa-sdk-php",
55-
"version": "2.2.2",
56-
"version_normalized": "2.2.2.0",
55+
"version": "2.2.6",
56+
"version_normalized": "2.2.6.0",
5757
"source": {
5858
"type": "git",
5959
"url": "https://github.com/yoomoney/yookassa-sdk-php.git",
60-
"reference": "cc9cddb807d93e4549af7f298f9780a3ebd3561a"
60+
"reference": "0bbd87d76310b3239b6e6de6534c9fab9e7db847"
6161
},
6262
"dist": {
6363
"type": "zip",
64-
"url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/cc9cddb807d93e4549af7f298f9780a3ebd3561a",
65-
"reference": "cc9cddb807d93e4549af7f298f9780a3ebd3561a",
64+
"url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/0bbd87d76310b3239b6e6de6534c9fab9e7db847",
65+
"reference": "0bbd87d76310b3239b6e6de6534c9fab9e7db847",
6666
"shasum": ""
6767
},
6868
"require": {
6969
"ext-curl": "*",
7070
"ext-json": "*",
7171
"ext-mbstring": "*",
7272
"php": ">=5.3.0",
73-
"psr/log": "^1.0 || ^2.0 || ^3.0"
73+
"psr/log": "^1.0"
7474
},
7575
"require-dev": {
7676
"ext-xml": "*",
7777
"mockery/mockery": "^0.9.9",
7878
"phpunit/phpunit": "^4.8.35 || ^5.7"
7979
},
80-
"time": "2021-11-16T11:21:19+00:00",
80+
"time": "2022-01-21T13:31:53+00:00",
8181
"type": "library",
8282
"installation-source": "dist",
8383
"autoload": {
@@ -106,7 +106,7 @@
106106
],
107107
"support": {
108108
"issues": "https://github.com/yoomoney/yookassa-sdk-php/issues",
109-
"source": "https://github.com/yoomoney/yookassa-sdk-php/tree/2.2.2"
109+
"source": "https://github.com/yoomoney/yookassa-sdk-php/tree/2.2.6"
110110
},
111111
"install-path": "../yoomoney/yookassa-sdk-php"
112112
}

‎src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'type' => 'library',
66
'install_path' => __DIR__ . '/../../',
77
'aliases' => array(),
8-
'reference' => 'd2718ca30f64c0f7edd4fc28b89806b7498f1890',
8+
'reference' => 'caa0100705c3f1d5280ae67fa7aae693b5ca7382',
99
'name' => '__root__',
1010
'dev' => true,
1111
),
@@ -16,7 +16,7 @@
1616
'type' => 'library',
1717
'install_path' => __DIR__ . '/../../',
1818
'aliases' => array(),
19-
'reference' => 'd2718ca30f64c0f7edd4fc28b89806b7498f1890',
19+
'reference' => 'caa0100705c3f1d5280ae67fa7aae693b5ca7382',
2020
'dev_requirement' => false,
2121
),
2222
'psr/log' => array(
@@ -29,12 +29,12 @@
2929
'dev_requirement' => false,
3030
),
3131
'yoomoney/yookassa-sdk-php' => array(
32-
'pretty_version' => '2.2.2',
33-
'version' => '2.2.2.0',
32+
'pretty_version' => '2.2.6',
33+
'version' => '2.2.6.0',
3434
'type' => 'library',
3535
'install_path' => __DIR__ . '/../yoomoney/yookassa-sdk-php',
3636
'aliases' => array(),
37-
'reference' => 'cc9cddb807d93e4549af7f298f9780a3ebd3561a',
37+
'reference' => '0bbd87d76310b3239b6e6de6534c9fab9e7db847',
3838
'dev_requirement' => false,
3939
),
4040
),

‎src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ matrix:
1313
include:
1414
- php: 5.5
1515
dist: trusty
16-
# - php: 5.4
17-
# dist: precise
16+
- php: 5.4
17+
dist: trusty
1818
# - php: 5.3
1919
# dist: precise
2020

‎src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
### v2.2.6 от 21.01.2022
2+
* Откат поддержки psr/log версий 2 и 3
3+
4+
### v2.2.5 от 28.12.2021
5+
* Добавлен метод проверки IP адреса уведомления от Юkassa среди известных адресов Юkassa
6+
* Добавлены тесты
7+
* Добавлен пример в документацию
8+
9+
### v2.2.4 от 09.12.2021
10+
* Фикс метода jsonSerialize() для ReceiptResponseItem
11+
* Добавлена проверка на параметр platform_fee_amount при создании запроса для двухстадийного платежа
12+
* Обновлены тесты
13+
* Обновлен readme
14+
15+
### v2.2.3 от 07.12.2021
16+
* Добавлена обработка параметра authorization_details.three_d_secure.applied в объекте платежа
17+
118
### v2.2.2 от 16.11.2021
219
* Добавлены уведомления по Сделкам и Выплатам
320

‎src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.en.md

+30-30
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Monthly Downloads](https://poser.pugx.org/yoomoney/yookassa-sdk-php/d/monthly)](https://packagist.org/packages/yoomoney/yookassa-sdk-php)
77
[![License](https://poser.pugx.org/yoomoney/yookassa-sdk-php/license)](https://packagist.org/packages/yoomoney/yookassa-sdk-php)
88

9-
[Russian](https://github.com/yoomoney/yookassa-sdk-php/blob/master/README.md) | English
9+
[Russian](README.md) | English
1010

1111
This product is used for managing payments under [The YooKassa API](https://yookassa.ru/en/developers/api)
1212
For usage by those who implemented YooKassa using the API method.
@@ -64,38 +64,38 @@ $client->setAuth('shopId', 'secretKey');
6464

6565
[More details in our documentation for the YooKassa API](https://yookassa.ru/en/developers/api#create_payment).
6666

67-
[More details in our documentation for the YooKassa SDK](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/readme.md).
67+
[More details in our documentation for the YooKassa SDK](docs/readme.md).
6868

6969
## Examples of using the API SDK
7070

71-
#### [YooKassa SDK Settings](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md)
72-
* [Authentication](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Аутентификация)
73-
* [Statistics about the environment used](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Статистические-данные-об-используемом-окружении)
74-
* [Getting information about the store](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Получение-информации-о-магазине)
75-
* [Working with Webhook](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Работа-с-Webhook)
76-
* [Notifications](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/01-configuration.md#Входящие-уведомления)
77-
78-
#### [Working with payments](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md)
79-
* [Request to create a payment](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-создание-платежа)
80-
* [Request to create a payment via the builder](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-создание-платежа-через-билдер)
81-
* [Request for partial payment confirmation](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-частичное-подтверждение-платежа)
82-
* [Request to cancel an incomplete payment](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Запрос-на-отмену-незавершенного-платежа)
83-
* [Get payment information](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Получить-информацию-о-платеже)
84-
* [Get a list of payments with filtering](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/02-payments.md#Получить-список-платежей-с-фильтрацией)
85-
86-
#### [Working with refunds](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md)
87-
* [Request to create a refund](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Запрос-на-создание-возврата)
88-
* [Request to create a refund via the builder](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Запрос-на-создание-возврата-через-билдер)
89-
* [Get refund information](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Получить-информацию-о-возврате)
90-
* [Get a list of returns with filtering](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/03-refunds.md#Получить-список-возвратов-с-фильтрацией)
91-
92-
#### [Working with receipts](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md)
93-
* [Request to create a receipt](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Запрос-на-создание-чека)
94-
* [Request to create a receipt via the builder](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Запрос-на-создание-чека-через-билдер)
95-
* [Get information about the receipt](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Получить-информацию-о-чеке)
96-
* [Get a list of receipts with filtering](https://github.com/yoomoney/yookassa-sdk-php/blob/master/docs/examples/04-receipts.md#Получить-список-чеков-с-фильтрацией)
97-
98-
#### [Working with deals](docs/examples/05-deals.md)
71+
#### [YooKassa SDK Settings](docs/examples/01-configuration.md)
72+
* [Authentication](docs/examples/01-configuration.md#Аутентификация)
73+
* [Statistics about the environment used](docs/examples/01-configuration.md#Статистические-данные-об-используемом-окружении)
74+
* [Getting information about the store](docs/examples/01-configuration.md#Получение-информации-о-магазине)
75+
* [Working with Webhook](docs/examples/01-configuration.md#Работа-с-Webhook)
76+
* [Notifications](docs/examples/01-configuration.md#Входящие-уведомления)
77+
78+
#### [Working with payments](docs/examples/02-payments.md)
79+
* [Request to create a payment](docs/examples/02-payments.md#Запрос-на-создание-платежа)
80+
* [Request to create a payment via the builder](docs/examples/02-payments.md#Запрос-на-создание-платежа-через-билдер)
81+
* [Request for partial payment confirmation](docs/examples/02-payments.md#Запрос-на-частичное-подтверждение-платежа)
82+
* [Request to cancel an incomplete payment](docs/examples/02-payments.md#Запрос-на-отмену-незавершенного-платежа)
83+
* [Get payment information](docs/examples/02-payments.md#Получить-информацию-о-платеже)
84+
* [Get a list of payments with filtering](docs/examples/02-payments.md#Получить-список-платежей-с-фильтрацией)
85+
86+
#### [Working with refunds](docs/examples/03-refunds.md)
87+
* [Request to create a refund](docs/examples/03-refunds.md#Запрос-на-создание-возврата)
88+
* [Request to create a refund via the builder](docs/examples/03-refunds.md#Запрос-на-создание-возврата-через-билдер)
89+
* [Get refund information](docs/examples/03-refunds.md#Получить-информацию-о-возврате)
90+
* [Get a list of returns with filtering](docs/examples/03-refunds.md#Получить-список-возвратов-с-фильтрацией)
91+
92+
#### [Working with receipts](docs/examples/04-receipts.md)
93+
* [Request to create a receipt](docs/examples/04-receipts.md#Запрос-на-создание-чека)
94+
* [Request to create a receipt via the builder](docs/examples/04-receipts.md#Запрос-на-создание-чека-через-билдер)
95+
* [Get information about the receipt](docs/examples/04-receipts.md#Получить-информацию-о-чеке)
96+
* [Get a list of receipts with filtering](docs/examples/04-receipts.md#Получить-список-чеков-с-фильтрацией)
97+
98+
#### [Working with safe deals](docs/examples/05-deals.md)
9999
* [Request to create a deal](docs/examples/05-deals.md#Запрос-на-создание-сделки)
100100
* [Request to create a deal via the builder](docs/examples/05-deals.md#Запрос-на-создание-сделки-через-билдер)
101101
* [Request to create a payment with info about deal](docs/examples/05-deals.md#Запрос-на-создание-платежа-с-привязкой-к-сделке)

0 commit comments

Comments
 (0)