diff --git a/CHANGELOG.md b/CHANGELOG.md
index c121b6d..86485fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v2.2.4 от 27.01.2022
+* Исправление сохранения параметров типа и предмета оплаты по умолчанию для сертификатов
+
### v2.2.3 от 15.12.2021
* Добавлены поля для дефолтных значений для типа и предмета оплаты для сертификатов в настройках модуля
* Исправлено получение дефолтных значений для доставки при формировании чека
diff --git a/src/upload/admin/controller/extension/payment/yoomoney.php b/src/upload/admin/controller/extension/payment/yoomoney.php
index 70ff211..64133fa 100644
--- 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.3';
+ const MODULE_VERSION = '2.2.4';
const WIDGET_INSTALL_STATUS_SUCCESS = true;
const WIDGET_INSTALL_STATUS_FAIL = false;
diff --git a/src/upload/admin/language/en-gb/extension/payment/yoomoney.php b/src/upload/admin/language/en-gb/extension/payment/yoomoney.php
index 3c19544..5616d40 100644
--- a/src/upload/admin/language/en-gb/extension/payment/yoomoney.php
+++ b/src/upload/admin/language/en-gb/extension/payment/yoomoney.php
@@ -285,4 +285,4 @@
$_['kassa_voucher_payment_mode_default_label'] = 'Признак способа расчета для сертификата';
$_['kassa_voucher_payment_subject_default_label'] = 'Признак предмета расчета для сертификата';
-$_['kassa_voucher_default_description'] = 'Признаки предмета расчёта и способа расчёта для сертификатов будут браться из следующих полей:';
\ No newline at end of file
+$_['kassa_voucher_default_description'] = 'Признаки предмета расчёта и способа расчёта для сертификатов будут браться из следующих полей:';
\ No newline at end of file
diff --git a/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php b/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php
index c107f0f..a6f1023 100644
--- a/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php
+++ b/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php
@@ -336,4 +336,4 @@
$_['kassa_voucher_payment_mode_default_label'] = 'Признак способа расчета для сертификата';
$_['kassa_voucher_payment_subject_default_label'] = 'Признак предмета расчета для сертификата';
-$_['kassa_voucher_default_description'] = 'Признаки предмета расчёта и способа расчёта для сертификатов будут браться из следующих полей:';
\ No newline at end of file
+$_['kassa_voucher_default_description'] = 'Признаки предмета расчёта и способа расчёта для сертификатов будут браться из следующих полей:';
\ No newline at end of file
diff --git a/src/upload/admin/model/extension/payment/yoomoney.php b/src/upload/admin/model/extension/payment/yoomoney.php
index 80fe63e..089b6b3 100644
--- 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.3';
+ const MODULE_VERSION = '2.2.4';
const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
private $kassaModel;
diff --git a/src/upload/admin/view/template/extension/payment/yoomoney/kassa.twig b/src/upload/admin/view/template/extension/payment/yoomoney/kassa.twig
index 8db2f95..7f3b5c2 100644
--- a/src/upload/admin/view/template/extension/payment/yoomoney/kassa.twig
+++ b/src/upload/admin/view/template/extension/payment/yoomoney/kassa.twig
@@ -423,7 +423,7 @@
@@ -436,7 +436,7 @@
diff --git a/src/upload/catalog/controller/extension/payment/yoomoney.php b/src/upload/catalog/controller/extension/payment/yoomoney.php
index ca3460a..918967b 100644
--- 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.3';
+ const MODULE_VERSION = '2.2.4';
/**
* @var ModelExtensionPaymentYoomoney
diff --git a/src/upload/catalog/model/extension/payment/yoomoney.php b/src/upload/catalog/model/extension/payment/yoomoney.php
index 3ff321c..52032c1 100644
--- 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.3';
+ const MODULE_VERSION = '2.2.4';
private $kassaModel;
private $walletModel;
@@ -567,8 +567,8 @@ private function addReceipt($builder, $orderInfo)
$defaultPaymentMode = $this->config->get('yoomoney_kassa_payment_mode_default');
$defaultDeliveryPaymentSubject = $this->config->get('yoomoney_kassa_delivery_payment_subject_default');
$defaultDeliveryPaymentMode = $this->config->get('yoomoney_kassa_delivery_payment_mode_default');
- $defaultVoucherPaymentMode = $this->config->get('yoomoney_kassa_voucher_payment_mode_default');
- $defaultVoucherPaymentSubject = $this->config->get('yoomoney_kassa_voucher_payment_subject_default');
+ $defaultVoucherPaymentMode = $this->config->get('yoomoney_kassa_voucher_payment_mode_default');
+ $defaultVoucherPaymentSubject = $this->config->get('yoomoney_kassa_voucher_payment_subject_default');
$orderProducts = $this->model_account_order->getOrderProducts($orderInfo['order_id']);
foreach ($orderProducts as $prod) {
diff --git a/src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php b/src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php
index 502388e..74076b7 100644
--- a/src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php
+++ b/src/upload/catalog/model/extension/payment/yoomoney/Model/KassaModel.php
@@ -57,6 +57,8 @@ class KassaModel extends AbstractPaymentModel
protected $defaultPaymentSubject;
protected $defaultDeliveryPaymentMode;
protected $defaultDeliveryPaymentSubject;
+ protected $defaultVoucherPaymentMode;
+ protected $defaultVoucherPaymentSubject;
protected $currency;
protected $currency_convert;
@@ -125,6 +127,8 @@ public function __construct(Config $config)
$this->defaultPaymentSubject = $this->getConfigValue('payment_subject_default');
$this->defaultDeliveryPaymentMode = $this->getConfigValue('delivery_payment_mode_default');
$this->defaultDeliveryPaymentSubject = $this->getConfigValue('delivery_payment_subject_default');
+ $this->defaultVoucherPaymentMode = $this->getConfigValue('voucher_payment_mode_default');
+ $this->defaultVoucherPaymentSubject = $this->getConfigValue('voucher_payment_subject_default');
$this->currency = $this->getConfigValue('currency');
$this->currency_convert = $this->getConfigValue('currency_convert');
@@ -401,6 +405,22 @@ public function getDefaultDeliveryPaymentSubject()
return $this->defaultDeliveryPaymentSubject;
}
+ /**
+ * @return mixed
+ */
+ public function getDefaultVoucherPaymentMode()
+ {
+ return $this->defaultVoucherPaymentMode;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getDefaultVoucherPaymentSubject()
+ {
+ return $this->defaultVoucherPaymentSubject;
+ }
+
/**
* @return array
*/
diff --git a/yoomoney.oc3x.ocmod.zip b/yoomoney.oc3x.ocmod.zip
index 91bfdcf..adabe29 100644
Binary files a/yoomoney.oc3x.ocmod.zip and b/yoomoney.oc3x.ocmod.zip differ