Skip to content

Commit

Permalink
Merge pull request #95 from yoomoney/release/v2.0.3
Browse files Browse the repository at this point in the history 
Release/2.0.3
  • Loading branch information
@tonchik-tm
tonchik-tm authored Dec 25, 2020
2 parents dd6c1ac + 551009d commit 6931f90
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 13 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### v2.0.3 от 25.12.2020
* Исправлен шаблон письма со счетом

### v2.0.2 от 18.12.2020
* Исправлена ошибка в Javascript-обработчике кнопки "Оплатить заказ"

Expand Down
2 changes: 1 addition & 1 deletion src/install.xml
View file
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.0.2</version>
<version>2.0.3</version>
<author>YooMoney</author>
<!-- Вставка кнопки в историю заказов-->
<file path="catalog/controller/account/order.php">
Expand Down
4 changes: 2 additions & 2 deletions src/upload/admin/controller/extension/payment/yoomoney.php
View file
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.0.2';
const MODULE_VERSION = '2.0.3';

const WIDGET_INSTALL_STATUS_SUCCESS = true;
const WIDGET_INSTALL_STATUS_FAIL = false;
Expand Down Expand Up @@ -899,7 +899,7 @@ public function sendmail()
$mail->setFrom($this->config->get('config_email'));
$mail->setSender($this->config->get('config_email'));
$mail->setSubject($subject);
if ($logo != '') {
if ($kassa->getSendInvoiceLogo() && $logo != '') {
$mail->addAttachment($logo);
}
$mail->setHtml($message);
Expand Down
2 changes: 1 addition & 1 deletion src/upload/admin/model/extension/payment/yoomoney.php
View file
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.0.2';
const MODULE_VERSION = '2.0.3';
const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';

private $kassaModel;
Expand Down
18 changes: 11 additions & 7 deletions src/upload/admin/view/template/extension/payment/yoomoney/invoice_message.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
<td style="padding:15px 25px;">
<a href="https://yookassa.ru/?_openstat=mail%3Bmy%3Binvoice_p%3Blogo" target="_blank" style="font-weight:normal;text-decoration:none;cursor:pointer;">
<font color="#4d7fd2" face="Arial" size="3">
<img src="https://yoomoney.ru/i/html-letters/header__logo_theme_office.png" width="143" height="38" alt="ЮKassa" title="ЮKassa" style="border:0;vertical-align:middle;">
<img src="https://yoomoney.ru/i/html-letters/header__logo_theme_kassa.png" width="146" height="38" alt="ЮKassa" title="ЮKassa" style="border:0;vertical-align:middle;">
</font>
</a>
</td>
{% if b_logo and shop_logo %}
<td style="padding:15px 25px;" align="right">
<a href="{{ shop_url }}" target="_blank" style="font-weight:normal;text-decoration:none;cursor:pointer;">
<font color="#4d7fd2" face="Arial" size="3">
<img src="{{ shop_logo }}" width="143" height="38" alt="{{ shop_name }}" title="{{ shop_name }}" style="border:0;vertical-align:middle;">
<img src="{{ shop_logo }}" height="38" alt="{{ shop_name }}" title="{{ shop_name }}" style="border:0;vertical-align:middle;">
</font>
</a>
</td>
Expand Down Expand Up @@ -56,7 +56,7 @@
</font>
</p>
<div>
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="100%" height="13" style="border:0;background:#ffffff;">
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="560" height="13" style="border:0;background:#ffffff;">
</div>
<h2 style="font-weight:normal;line-height:normal;padding:0;margin:0;margin-bottom:10px;font-weight:bold;">
<font size="4" color="#000000" face="Arial">В вашем заказе</font>
Expand Down Expand Up @@ -84,9 +84,11 @@
<tr>
<td>
<div>
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="100%" height="10" style="border:0;background:#ffffff;">
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="384" height="10" style="border:0;background:#ffffff;">
</div>
</td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
Expand All @@ -109,9 +111,11 @@
<tr>
<td>
<div>
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="100%" height="25" style="border:0;background:#ffffff;">
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="384" height="25" style="border:0;background:#ffffff;">
</div>
</td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
Expand All @@ -121,7 +125,7 @@
</div>
{% endif %}
<div>
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="100%" height="25" style="border:0;background:#ffffff;">
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="560" height="25" style="border:0;background:#ffffff;">
</div>
<table cellpadding="0" cellspacing="0" width="100%" height="auto" style="border-collapse:collapse;">
<tbody>
Expand All @@ -144,7 +148,7 @@
</tbody>
</table>
<div>
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="100%" height="45" style="border:0;background:#ffffff;">
<img src="https://yoomoney.ru/i/html-letters/margin-block.png" width="560" height="45" style="border:0;background:#ffffff;">
</div>
<table cellpadding="0" cellspacing="0" width="100%" height="auto" style="border-collapse:collapse;">
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion src/upload/catalog/controller/extension/payment/yoomoney.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
class ControllerExtensionPaymentYoomoney extends Controller
{
const MODULE_NAME = 'yoomoney';
const MODULE_VERSION = '2.0.2';
const MODULE_VERSION = '2.0.3';

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

private $kassaModel;
private $walletModel;
Expand Down
Binary file modified src/upload/image/catalog/payment/yoomoney/yoomoney_buttons.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified yoomoney.oc3x.ocmod.zip
View file
Binary file not shown.

0 comments on commit 6931f90

Please sign in to comment.