antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-21 16:24:32 +02:00
commit b26fefd0f3
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/paybox/hookpayment.tpl
View File

@ -10,7 +10,7 @@
{if isset($PBX_BACKUP1)}<input type="hidden" name="PBX_BACKUP1" value="{$PBX_BACKUP1}" />{/if}
</form>
</div>
<input type="radio" name="paiement-method" value="">
<input type="radio" name="paiement-method" data-module-name="paybox" value="">
</div>
<div class="img_payment">
<img src="{$base_dir}modules/paybox/paiement_{$cookie->id_lang}.png" alt="{l s='Pay with Paybox' mod='paybox'}" />

1
themes/site/order-payment.tpl
View File

@ -143,7 +143,6 @@
// $form = $input.parent().children('div.hidden').children('form');
// $form.submit();
// }
// });
});