lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW Include an hourglass icon when we click on online payment button

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-15 10:27:21 +02:00
parent b29d0385e6
commit b3245fb455
7 changed files with 101 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/paypal/admin/paypal.php
View File

@ -141,7 +141,7 @@ print '<td>'.$langs->trans("Value").'</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="titlefield fieldrequired">'; print '<td class="titlefield">';
print $langs->trans("PaypalLiveEnabled").'</td><td>'; print $langs->trans("PaypalLiveEnabled").'</td><td>';
if (empty($conf->global->PAYPAL_API_SANDBOX)) if (empty($conf->global->PAYPAL_API_SANDBOX))
{ {

20
htdocs/public/paypal/newpayment.php
View File

@ -276,7 +276,7 @@ $paramcreditor='PAYPAL_CREDITOR_'.$suffix;
if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor; if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR; else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
print '<span id="dolpaymentspan"></span>'."\n"; print '<span id="dopaymentspan"></span>'."\n";
print '<div class="center">'."\n"; print '<div class="center">'."\n";
print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n"; print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n"; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
@ -969,12 +969,13 @@ if ($found && ! $error) // We are in a management option and no error
if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral') if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
{ {
print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">'; print '<br><input class="button" type="submit" id="dopayment" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
} }
if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly') if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
{ {
print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">'; print '<br><input class="button" type="submit" id="dopayment" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
} }
print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
} }
else else
{ {
@ -986,9 +987,22 @@ print '</td></tr>'."\n";
print '</table>'."\n"; print '</table>'."\n";
print '</form>'."\n"; print '</form>'."\n";
print '</div>'."\n"; print '</div>'."\n";
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
jQuery("#dopayment").click(function() {
jQuery("#dopayment").hide();
jQuery("#hourglasstopay").show();
});
});
</script>';
print '<br>'; print '<br>';
htmlPrintOnlinePaymentFooter($mysoc,$langs); htmlPrintOnlinePaymentFooter($mysoc,$langs);
llxFooter('', 'public'); llxFooter('', 'public');

156
htdocs/public/stripe/newpayment.php
View File

@ -90,8 +90,8 @@ if (! $action)
//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current $urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
$urlok=$urlwithroot.'/public/paypal/paymentok.php?'; $urlok=$urlwithroot.'/public/stripe/paymentok.php?';
$urlko=$urlwithroot.'/public/paypal/paymentko.php?'; $urlko=$urlwithroot.'/public/stripe/paymentko.php?';
// Complete urls for post treatment // Complete urls for post treatment
$SOURCE=GETPOST("source",'alpha'); $SOURCE=GETPOST("source",'alpha');
@ -1119,8 +1119,8 @@ if (preg_match('/^dopayment/',$action))
<div id="card-errors" role="alert"></div> <div id="card-errors" role="alert"></div>
</div> </div>
<br> <br>
<button>'.$langs->trans("ToPay").'</button> <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
</td></tr></tbody></table> </td></tr></tbody></table>
</form> </form>
@ -1131,82 +1131,84 @@ if (preg_match('/^dopayment/',$action))
<script type="text/javascript" language="javascript">'; <script type="text/javascript" language="javascript">';
?> ?>
// Create a Stripe client
var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
// Create a Stripe client // Create an instance of Elements
var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>'); var elements = stripe.elements();
// Create an instance of Elements // Custom styling can be passed to options when creating an Element.
var elements = stripe.elements(); // (Note that this demo uses a wider set of styles than the guide below.)
var style = {
// Custom styling can be passed to options when creating an Element. base: {
// (Note that this demo uses a wider set of styles than the guide below.) color: '#32325d',
var style = { lineHeight: '24px',
base: { fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
color: '#32325d', fontSmoothing: 'antialiased',
lineHeight: '24px', fontSize: '16px',
fontFamily: '"Helvetica Neue", Helvetica, sans-serif', '::placeholder': {
fontSmoothing: 'antialiased', color: '#aab7c4'
fontSize: '16px', }
'::placeholder': { },
color: '#aab7c4' invalid: {
} color: '#fa755a',
}, iconColor: '#fa755a'
invalid: { }
color: '#fa755a', };
iconColor: '#fa755a'
} // Create an instance of the card Element
}; var card = elements.create('card', {style: style});
// Create an instance of the card Element // Add an instance of the card Element into the `card-element` <div>
var card = elements.create('card', {style: style}); card.mount('#card-element');
// Add an instance of the card Element into the `card-element` <div> // Handle real-time validation errors from the card Element.
card.mount('#card-element'); card.addEventListener('change', function(event) {
var displayError = document.getElementById('card-errors');
// Handle real-time validation errors from the card Element. if (event.error) {
card.addEventListener('change', function(event) { displayError.textContent = event.error.message;
var displayError = document.getElementById('card-errors'); } else {
if (event.error) { displayError.textContent = '';
displayError.textContent = event.error.message; }
} else { });
displayError.textContent = '';
} // Handle form submission
}); var form = document.getElementById('payment-form');
console.log(form);
// Handle form submission form.addEventListener('submit', function(event) {
var form = document.getElementById('payment-form'); event.preventDefault();
console.log(form);
form.addEventListener('submit', function(event) { stripe.createToken(card).then(function(result) {
event.preventDefault(); if (result.error) {
// Inform the user if there was an error
stripe.createToken(card).then(function(result) { var errorElement = document.getElementById('card-errors');
if (result.error) { errorElement.textContent = result.error.message;
// Inform the user if there was an error } else {
var errorElement = document.getElementById('card-errors'); // Send the token to your server
errorElement.textContent = result.error.message; stripeTokenHandler(result.token);
} else { }
// Send the token to your server });
stripeTokenHandler(result.token); });
}
}); function stripeTokenHandler(token) {
}); // Insert the token ID into the form so it gets submitted to the server
var form = document.getElementById('payment-form');
function stripeTokenHandler(token) { var hiddenInput = document.createElement('input');
// Insert the token ID into the form so it gets submitted to the server hiddenInput.setAttribute('type', 'hidden');
var form = document.getElementById('payment-form'); hiddenInput.setAttribute('name', 'stripeToken');
var hiddenInput = document.createElement('input'); hiddenInput.setAttribute('value', token.id);
hiddenInput.setAttribute('type', 'hidden'); form.appendChild(hiddenInput);
hiddenInput.setAttribute('name', 'stripeToken');
hiddenInput.setAttribute('value', token.id); // Submit the form
form.appendChild(hiddenInput); jQuery('#buttontopay').hide();
jQuery('#hourglasstopay').show();
// Submit the form console.log("submit");
console.log("submit"); form.submit();
form.submit(); }
}
<?php <?php
print '</script>'; print '</script>';
} }

7
htdocs/stripe/admin/stripe.php
View File

@ -134,7 +134,7 @@ print '<td>'.$langs->trans("Value").'</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="titlefield fieldrequired">'; print '<td class="titlefield">';
print $langs->trans("StripeLiveEnabled").'</td><td>'; print $langs->trans("StripeLiveEnabled").'</td><td>';
if (!empty($conf->global->STRIPE_LIVE)) if (!empty($conf->global->STRIPE_LIVE))
{ {
@ -229,7 +229,7 @@ $token='';
// Url list // Url list
print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>'; print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>'; print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n"; print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br>\n";
if (! empty($conf->commande->enabled)) if (! empty($conf->commande->enabled))
{ {
print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>'; print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
@ -250,7 +250,6 @@ if (! empty($conf->commande->enabled))
} }
print '</form>'; print '</form>';
} }
print '<br>';
} }
if (! empty($conf->facture->enabled)) if (! empty($conf->facture->enabled))
{ {
@ -272,7 +271,6 @@ if (! empty($conf->facture->enabled))
} }
print '</form>'; print '</form>';
} }
print '<br>';
} }
if (! empty($conf->contrat->enabled)) if (! empty($conf->contrat->enabled))
{ {
@ -294,7 +292,6 @@ if (! empty($conf->contrat->enabled))
} }
print '</form>'; print '</form>';
} }
print '<br>';
} }
if (! empty($conf->adherent->enabled)) if (! empty($conf->adherent->enabled))
{ {

BIN
htdocs/theme/common/dolibarr_box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 33 KiB

6
htdocs/theme/eldy/style.css.php
View File

@ -3264,7 +3264,7 @@ div.visible {
display: block; display: block;
} }
div.hidden { div.hidden, td.hidden, img.hidden {
display: none; display: none;
} }
@ -3272,10 +3272,6 @@ tr.visible {
display: block; display: block;
} }
td.hidden {
display: none;
}
/* ============================================================================== */ /* ============================================================================== */
/* Module website */ /* Module website */

6
htdocs/theme/md/style.css.php
View File

@ -3362,7 +3362,7 @@ div.visible {
display: block; display: block;
} }
div.hidden { div.hidden, td.hidden, img.hidden {
display: none; display: none;
} }
@ -3370,10 +3370,6 @@ tr.visible {
display: block; display: block;
} }
td.hidden {
display: none;
}
/* ============================================================================== */ /* ============================================================================== */
/* Module website */ /* Module website */