Merge branch 'ticket-payboxAgreement' into develop

This commit is contained in:
Marion Muszynski 2016-09-15 13:02:36 +02:00
commit 5a9c94e694
2 changed files with 32 additions and 32 deletions

View File

@ -49,7 +49,7 @@
<thead>
<th class="item">{l s='Name' mod='paymentinfo'}</th>
<th class="item">{l s='Email' mod='paymentinfo'}</th>
<th class="item">{l s='City' mod='paymentinfo'}</th>
{* <th class="item">{l s='City' mod='paymentinfo'}</th> *}
<th class="item">{l s='Date add' mod='paymentinfo'}</th>
<th class="item">{l s='Action' mod='paymentinfo'}</th>
</thead>
@ -58,7 +58,7 @@
<tr class="alternate_item {if $smarty.foreach.accounts.index % 2 == 0}odd{else}even{/if}">
<td class="bold">{$paypal.name}</td>
<td >{$paypal.email}</td>
<td>{$paypal.city}</td>
{* <td>{$paypal.city}</td> *}
<td>{$paypal.date_add|date_format:'d/m/Y'}</td>
<td><a onclick="return confirm('{l s='Are you sure?' mod='paymentinfo'}');" href="?delete_agreement={$paypal.id_paypal_agreement}" title="{l s='Delete' mod='paymentinfo'}">{l s='X' mod='paymentinfo'}</a></td>
</tr>

View File

@ -10,6 +10,29 @@
<br>
{/if}
<h4 class='subtitle'>{l s='My cards' mod='paymentinfo'}</h4>
{if $paybox_accounts}
<table class="std table_skin">
<tbody>
{foreach from=$paybox_accounts item=paybox}
<tr>
<td>
<b>{$paybox.payment_type}</b> - {$paybox.value} {substr_replace($paybox.date,'/',-2,0)}
</td>
<td><a onclick="return confirm('{l s='Are you sure?' mod='paymentinfo'}');" href="?delete_card={$paybox.id_paybox_card}">{l s='Delete' mod='paymentinfo'}</a></td>
</tr>
{/foreach}
</tbody>
</table>
{else}
<div id="block-history" class="block-center">
<p class="warning">{l s='No card register' mod='paymentinfo'}</p>
</div>
{/if}
<br />
<h4 class='subtitle'>{l s='My paypal account' mod='paymentinfo'}</h4>
{if $paypal_accounts}
@ -37,29 +60,6 @@
<br />
<h4 class='subtitle'>{l s='My cards' mod='paymentinfo'}</h4>
{if $paybox_accounts}
<table class="std table_skin">
<tbody>
{foreach from=$paybox_accounts item=paybox}
<tr>
<td>
<b>{$paybox.payment_type}</b> - {$paybox.value} {substr_replace($paybox.date,'/',-2,0)}
</td>
<td><a onclick="return confirm('{l s='Are you sure?' mod='paymentinfo'}');" href="?delete_card={$paybox.id_paybox_card}">{l s='Delete' mod='paymentinfo'}</a></td>
</tr>
{/foreach}
</tbody>
</table>
{else}
<div id="block-history" class="block-center">
<p class="warning">{l s='No card register' mod='paymentinfo'}</p>
</div>
{/if}
<br />
<p class="footer_links">
<a class="back_account" href="{$link->getPageLink('my-account.php', true)}" class="button">
<i class="icon-user"></i><span>{l s='Back to my account' mod='paymentinfo'}</span>