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

Fix buttons for payments

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-07 13:51:53 +02:00
parent 9314bb4667
commit 1520ca9646
6 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/paybox.lang
View File

@ -10,7 +10,7 @@ ToComplete=To complete
YourEMail=Email to receive payment confirmation YourEMail=Email to receive payment confirmation
Creditor=Creditor Creditor=Creditor
PaymentCode=Payment code PaymentCode=Payment code
PayBoxDoPayment=Pay with Credit or Debit Card (Paybox) PayBoxDoPayment=Pay with Paybox
ToPay=Do payment ToPay=Do payment
YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
Continue=Next Continue=Next

1
htdocs/langs/en_US/paypal.lang
View File

@ -33,3 +33,4 @@ PostActionAfterPayment=Post actions after payments
ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary. ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
ValidationOfPaymentFailed=Validation of payment has failed ValidationOfPaymentFailed=Validation of payment has failed
CardOwner=Card holder CardOwner=Card holder
PayPalBalance=Paypal credit

2
htdocs/langs/en_US/stripe.lang
View File

@ -12,7 +12,7 @@ YourEMail=Email to receive payment confirmation
STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail) STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
Creditor=Creditor Creditor=Creditor
PaymentCode=Payment code PaymentCode=Payment code
StripeDoPayment=Pay with Credit or Debit Card (Stripe) StripeDoPayment=Pay with Stripe
YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
Continue=Next Continue=Next
ToOfferALinkForOnlinePayment=URL for %s payment ToOfferALinkForOnlinePayment=URL for %s payment

18
htdocs/public/payment/newpayment.php
View File

@ -1670,27 +1670,37 @@ if ($action != 'dopayment')
if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled)) if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
{ {
// If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of paybox // If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of paybox
print '<br><div class="button buttonpayment"><span class="fa fa-credit-card"></span> <input class="" type="submit" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'"></div>'; print '<br><div class="button buttonpayment"><span class="fa fa-credit-card"></span> <input class="" type="submit" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
print '<br>';
print '<span class="buttonpaymentsmall">'.$langs->trans("CreditOrDebitCard").'</span>';
print '</div>';
} }
if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled)) if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
{ {
// If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe // If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe
print '<br><div class="button buttonpayment"><span class="fa fa-credit-card"></span> <input class="" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'"></div>'; print '<br><div class="button buttonpayment"><span class="fa fa-credit-card"></span> <input class="" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
print '<br>';
print '<span class="buttonpaymentsmall">'.$langs->trans("CreditOrDebitCard").'</span>';
print '</div>';
} }
if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled)) if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
{ {
if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral'; if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
print '<br><div class="button buttonpayment"><span class="fa fa-paypal"></span> <input class="" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral') if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
{ {
print '<br><div class="button buttonpayment"><span class="fa fa-paypal"></span> <input class="" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'"></div>'; print '<br>';
print '<span class="buttonpaymentsmall">'.$langs->trans("CreditOrDebitCard").'</span><span class="buttonpaymentsmall"> - </span>';
print '<span class="buttonpaymentsmall">'.$langs->trans("PayPalBalance").'</span>';
} }
if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly') if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
{ {
print '<br><div class="button buttonpayment"><span class="fa fa-paypal"></span> <input class="" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'"></div>'; //print '<br><span class="buttonpaymentsmall">'.$langs->trans("PaypalAccount").'"></span>';
} }
print '</div>';
} }
} }
} }

7
htdocs/theme/eldy/global.inc.php
View File

@ -133,7 +133,7 @@ input.buttongen {
vertical-align: middle; vertical-align: middle;
} }
input.buttonpayment, button.buttonpayment, div.buttonpayment { input.buttonpayment, button.buttonpayment, div.buttonpayment {
min-width: 320px; min-width: 290px;
margin-bottom: 15px; margin-bottom: 15px;
background-image: none; background-image: none;
line-height: 24px; line-height: 24px;
@ -147,6 +147,11 @@ input.buttonpayment, button.buttonpayment, div.buttonpayment {
color: #fff; color: #fff;
border-radius: 4px; border-radius: 4px;
} }
.buttonpaymentsmall {
font-size: 0.65em;
padding-left: 5px;
padding-right: 5px;
}
div.buttonpayment input { div.buttonpayment input {
background-color: unset; background-color: unset;
color: #fff; color: #fff;

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

@ -353,8 +353,11 @@ input.buttongen {
vertical-align: middle; vertical-align: middle;
} }
input.buttonpayment, button.buttonpayment, div.buttonpayment { input.buttonpayment, button.buttonpayment, div.buttonpayment {
min-width: 320px; min-width: 290px;
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 0;
margin-left: 5px;
margin-right: 5px;
background-image: none; background-image: none;
line-height: 24px; line-height: 24px;
padding: 8px; padding: 8px;