Skip to content

Commit

Permalink
Удаление error="skip" для тега file
Browse files Browse the repository at this point in the history
  • Loading branch information
SaShaSpi committed Aug 30, 2021
1 parent cec6c2e commit 03f607c
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### v2.1.4 от 30.08.2021
* Удаление error="skip" для тега file

### v2.1.3 от 26.07.2021
* Курсы валют с учетом номинала
* Обновлен SDK до версии 2.1.3
Expand Down
22 changes: 11 additions & 11 deletions src/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modification>
<name>YooMoney for Opencart 3.x</name>
<code>YooMoney</code>
<version>2.1.3</version>
<version>2.1.4</version>
<author>YooMoney</author>
<link>https://github.com/yoomoney/cms-opencart3</link>
<!-- Вставка кнопки в историю заказов-->
Expand Down Expand Up @@ -232,17 +232,17 @@
</operation>
</file>
<!-- Проброс конфига в шаблон header -->
<file path="catalog/controller/common/header.php" error="skip">
<operation>
<file path="catalog/controller/common/header.php">
<operation error="skip">
<search><![CDATA[$data['menu'] = $this->load->controller('common/menu');]]></search>
<add position="after"><![CDATA[
$data['config'] = $this->config;
]]></add>
</operation>
</file>
<!-- Вставка скрипта кнопки "Заплатить по частям" -->
<file path="catalog/view/theme/*/template/common/header.twig" error="skip">
<operation>
<file path="catalog/view/theme/*/template/common/header.twig">
<operation error="skip">
<search><![CDATA[</head>]]></search>
<add position="before"><![CDATA[
{% if config is defined and config.get('yoomoney_kassa_enabled') and (config.get('yoomoney_kassa_use_installments_button') or config.get('yoomoney_kassa_add_installments_block')) %}
Expand All @@ -252,8 +252,8 @@
</operation>
</file>
<!-- Получение данных для виджета "Заплатить по частям" -->
<file path="catalog/controller/product/product.php" error="skip">
<operation>
<file path="catalog/controller/product/product.php">
<operation error="skip">
<search trim="true"><![CDATA[if ($product_info) {]]></search>
<add position="after"><![CDATA[
$showInstallmentsBlock = $this->config->get('yoomoney_kassa_enabled')
Expand All @@ -280,7 +280,7 @@
</operation>
</file>
<!-- Отображение виджета "Заплатить по частям" -->
<file path="catalog/view/theme/*/template/product/product.twig" error="skip">
<file path="catalog/view/theme/*/template/product/product.twig">
<operation error="skip" info="Product installments">
<search><![CDATA[<div id="product"> {% if options %}]]></search>
<add position="before"><![CDATA[
Expand Down Expand Up @@ -320,7 +320,7 @@
]]></add>
</operation>
</file>
<file path="admin/view/template/catalog/product_form.twig" error="skip">
<file path="admin/view/template/catalog/product_form.twig">
<operation error="skip" info="Add Product Properties">
<search position="after"><![CDATA[<input type="text" name="sort_order" value="{{ sort_order }}" placeholder="{{ entry_sort_order }}" id="input-sort-order" class="form-control" />]]></search>
<add><![CDATA[
Expand Down Expand Up @@ -357,7 +357,7 @@
</operation>
</file>

<file path="admin/controller/catalog/product.php" error="skip">
<file path="admin/controller/catalog/product.php">
<operation error="skip" info="Add Capture Link">
<search position="after"><![CDATA[$data['layouts'] = $this->model_design_layout->getLayouts();]]></search>
<add><![CDATA[
Expand Down Expand Up @@ -397,7 +397,7 @@
</operation>
</file>

<file path="admin/controller/catalog/product.php" error="skip">
<file path="admin/controller/catalog/product.php">
<operation error="skip" info="Add Capture Link">
<search position="after"><![CDATA[$this->model_catalog_product->editProduct($this->request->get['product_id'], $this->request->post);]]></search>
<add><![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion src/upload/admin/controller/extension/payment/yoomoney.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class ControllerExtensionPaymentYoomoney extends Controller
{
const MODULE_NAME = 'yoomoney';
const MODULE_VERSION = '2.1.3';
const MODULE_VERSION = '2.1.4';

const WIDGET_INSTALL_STATUS_SUCCESS = true;
const WIDGET_INSTALL_STATUS_FAIL = false;
Expand Down
2 changes: 1 addition & 1 deletion src/upload/admin/model/extension/payment/yoomoney.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
/**
* string
*/
const MODULE_VERSION = '2.1.3';
const MODULE_VERSION = '2.1.4';
const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';

private $kassaModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class ControllerExtensionPaymentYoomoney extends Controller
{
const MODULE_NAME = 'yoomoney';
const MODULE_VERSION = '2.1.3';
const MODULE_VERSION = '2.1.4';

/**
* @var ModelExtensionPaymentYoomoney
Expand Down
2 changes: 1 addition & 1 deletion src/upload/catalog/model/extension/payment/yoomoney.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
class ModelExtensionPaymentYoomoney extends Model
{
const MODULE_VERSION = '2.1.3';
const MODULE_VERSION = '2.1.4';

private $kassaModel;
private $walletModel;
Expand Down
Binary file modified yoomoney.oc3x.ocmod.zip
Binary file not shown.

0 comments on commit 03f607c

Please sign in to comment.