Skip to content

Commit

Permalink
Merge pull request #184 from Invertus-mollie/4.1.3-MOL-360-order-page…
Browse files Browse the repository at this point in the history
…-icon-fix

4.1.3 - MOL-360 - Admin order page icon fix
  • Loading branch information
margud committed Dec 16, 2020
2 parents f1eb5c9 + 68707eb commit 1ac87bf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 30 deletions.
2 changes: 1 addition & 1 deletion mollie.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function __construct()
{
$this->name = 'mollie';
$this->tab = 'payments_gateways';
$this->version = '4.1.2';
$this->version = '4.1.3';
$this->author = 'Mollie B.V.';
$this->need_instance = 1;
$this->bootstrap = true;
Expand Down
21 changes: 8 additions & 13 deletions src/Presenter/OrderListActionBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,17 @@ public function __construct(Mollie $mollie)

public function buildOrderPaymentResendButton(Smarty_Data $smarty, $orderId)
{
$smarty->assign('idOrder', $orderId);

$smarty->assign(
'message',
$this->mollie->l('You will resend email with payment link to the customer', self::FILE_NAME)
);
$icon = $this->mollie->display(
$this->mollie->getLocalPath(),
'views/templates/hook/admin/order-list-save-label-icon.tpl'
);

$smarty->assign('icon', $icon);
$smarty->assign([
'idOrder' => (int) $orderId,
'message' => $this->mollie->l(
'You will resend email with payment link to the customer',
self::FILE_NAME
),
]);

return $this->mollie->display(
$this->mollie->getLocalPath(),
'views/templates/hook/admin/order-list-icon-container.tpl'
'views/templates/hook/admin/order-list-icon.tpl'
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
*}

<div class="mollie-icon-container" data-id-order="{$idOrder|intval}">
{$icon|escape:'html':'UTF-8'}
<i class="icon-send-mail-mollie resend-payment-mail-mollie" data-id-order="{$idOrder|intval}"></i>
<div class="mollie-message-container">{$message|escape:'html':'UTF-8'}</div>
</div>
15 changes: 0 additions & 15 deletions views/templates/hook/admin/order-list-save-label-icon.tpl

This file was deleted.

0 comments on commit 1ac87bf

Please sign in to comment.