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

fix conflicts

Browse Source
This commit is contained in:
Marion Muszynski 2017-07-11 16:21:20 +02:00
commit ae39024da4
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@
}
});
if(payment_click == 0) {
payment_click = payment_click+1;
//payment_click = payment_click+1;
if ($input.val()) {
// LOADER POUR PAYBOX
if ($input.attr('data-module-name') == "paybox-direct"){
@ -76,9 +76,9 @@
} else {
if($input.attr('data-module-name') == "paybox"){
if(!$('input#save_info_paybox:checked').length){
$form = $input.parent().children('form#paybox_form');
$form = $input.parent().children('div.hidden').children('form#paybox_form');
} else {
$form = $input.parent().children('form#paybox_form_save');
$form = $input.parent().children('div.hidden').children('form#paybox_form_save');
}
$name = "paybox";
} else {
@ -142,7 +142,7 @@
{/if}
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=2" title="{l s='Previous'}" class="button">{l s='Previous'}</a>
<a class="exclusive submitPayment" title="{l s='Valider ma commande'}" class="button" onclick="submitPayment(payment_click); return ((window.ga && ga.create)? !ga.loaded : true);">{l s='Valider ma commande'}</a>
<a class="exclusive submitPayment" title="{l s='Valider ma commande'}" class="button" onclick="submitPayment(payment_click); payment_click++; return ((window.ga && ga.create)? !ga.loaded : true);">{l s='Valider ma commande'}</a>
</p>
{else}
</div>

13
themes/site_mobile/contact-form.tpl
View File

@ -102,18 +102,17 @@
</p>
{/if}*}
{/if}
{*if $fileupload == 1}
{if $fileupload == 1}
<p class="text">
<label for="fileUpload">{l s='Attach File'}</label>
<input type="hidden" name="MAX_FILE_SIZE" value="2000000" />
<span id="listFile">
<input type="file" name="fileUpload" id="fileUpload" />
{* <span id="listFile">
<input name="file_0" id="file_0" type="file" /><br />
</span>
<span class="gradient"><input type="button" id="addFile" class="exclusive" value="{l s='Add another file'}" /></span>
</span> *}
{* <span class="gradient"><input type="button" id="addFile" class="exclusive" value="{l s='Add another file'}" /></span> *}
</p>
{/if*}
{/if}
<p class="textarea">
<label for="message">{l s='Message'}</label>
<textarea id="message" name="message">{if isset($message)}{$message|escape:'htmlall':'UTF-8'|stripslashes}{/if}</textarea>

8
themes/site_mobile/order-payment.tpl
View File

@ -59,7 +59,7 @@
}
});
if(payment_click == 0) {
payment_click = payment_click+1;
//payment_click = payment_click+1;
if ($input.val()) {
// LOADER POUR PAYBOX
if ($input.attr('data-module-name') == "paybox-direct"){
@ -75,9 +75,9 @@
} else {
if($input.attr('data-module-name') == "paybox"){
if(!$('input#save_info_paybox:checked').length){
$form = $input.parent().children('form#paybox_form');
$form = $input.parent().children('div.hidden').children('form#paybox_form');
} else {
$form = $input.parent().children('form#paybox_form_save');
$form = $input.parent().children('div.hidden').children('form#paybox_form_save');
}
$name = "paybox";
} else {
@ -135,7 +135,7 @@
{if !$opc}
<p class="cart_navigation">
<a href="{$link->getPageLink('order.php', true)}?step=2" title="{l s='Previous'}" class="button">{l s='Previous'}</a>
<a class="exclusive submitPayment" title="{l s='Valider ma commande'}" class="button" onclick="submitPayment(payment_click); return ((window.ga && ga.create)? !ga.loaded : true);">{l s='Valider ma commande'}</a>
<a class="exclusive submitPayment" title="{l s='Valider ma commande'}" class="button" onclick="submitPayment(payment_click); payment_click++; return ((window.ga && ga.create)? !ga.loaded : true);">{l s='Valider ma commande'}</a>
</p>
{else}
</div>