Merge branch 'paypal_billing' into develop
This commit is contained in:
commit
639d2402e6
@ -74,7 +74,7 @@
|
||||
<input type="hidden" name="custom" value="{$custom|escape:'htmlall':'UTF-8'}" />
|
||||
</form>
|
||||
</div>
|
||||
<input type="radio" value="" name="paiement-method" id="paypal_{$account.id_paypal_agreement}">
|
||||
<input data-module-name="paypal" type="radio" value="" name="paiement-method" id="paypal_{$account.id_paypal_agreement}">
|
||||
<label for="paypal_{$account.id_paypal_agreement}">{$account.email} - {$account.name}</label>
|
||||
</div>
|
||||
{/foreach}
|
||||
|
@ -79,6 +79,20 @@
|
||||
{/if}
|
||||
|
||||
|
||||
<div class="overlay_bbb" style="display: none;"></div>
|
||||
<div class="box_add_to_cart box_paypal" style="display: none;">
|
||||
<div class="content">
|
||||
<p style="text-align: center;">
|
||||
<img src="/modules/paypal/img/logos/FR_pp_cc_mark_74x46.jpg" alt="">
|
||||
<br />
|
||||
<span>{l s='Paiement en cours, veuillez patienter'}</span>
|
||||
<br />
|
||||
<img src="img/loader_payment.gif" alt="">
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
var paiementErrorMessage = "{l s='You have to choose a paiement method' js=1}";
|
||||
</script>
|
||||
@ -88,7 +102,6 @@
|
||||
$('.payment_module .inner').live('click', function(e) {
|
||||
$(this).children('.input_radio').children('input[name="paiement-method"]').attr('checked', true);
|
||||
});
|
||||
|
||||
|
||||
$('.submitPayment').live('click', function(e) {
|
||||
e.preventDefault();
|
||||
@ -101,6 +114,11 @@
|
||||
if ($input.val()) {
|
||||
window.location = $input.val();
|
||||
} else {
|
||||
// LOADER POUR PAYPAL
|
||||
if ($input.attr('data-module-name') == "paypal") {
|
||||
$('.overlay_bbb').fadeIn();
|
||||
$('.box_paypal').fadeIn();
|
||||
}
|
||||
$form = $input.parent().children('div.hidden').children('form');
|
||||
$form.submit();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user