diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index d3c26c8e65a..a4eee3680af 100644 --- a/htdocs/langs/en_US/paybox.lang +++ b/htdocs/langs/en_US/paybox.lang @@ -10,7 +10,7 @@ ToComplete=To complete YourEMail=Email to receive payment confirmation Creditor=Creditor PaymentCode=Payment code -PayBoxDoPayment=Pay with Credit or Debit Card (Paybox) +PayBoxDoPayment=Pay with Paybox ToPay=Do payment YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information Continue=Next diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 1db01a59012..5eb5f389445 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -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. ValidationOfPaymentFailed=Validation of payment has failed CardOwner=Card holder +PayPalBalance=Paypal credit diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang index 1eb0a649a74..91d1f5a54c5 100644 --- a/htdocs/langs/en_US/stripe.lang +++ b/htdocs/langs/en_US/stripe.lang @@ -12,7 +12,7 @@ YourEMail=Email to receive payment confirmation STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail) Creditor=Creditor 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 Continue=Next ToOfferALinkForOnlinePayment=URL for %s payment diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 32db0d99a08..90646ef9b41 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -1670,27 +1670,37 @@ if ($action != 'dopayment') 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 - print '
'; + print '
'; + print '
'; + print ''.$langs->trans("CreditOrDebitCard").''; + print '
'; } 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 - print '
'; + print '
'; + print '
'; + print ''.$langs->trans("CreditOrDebitCard").''; + print '
'; } 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'; + print '
'; if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral') { - print '
'; + print '
'; + print ''.$langs->trans("CreditOrDebitCard").' - '; + print ''.$langs->trans("PayPalBalance").''; } if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly') { - print '
'; + //print '
'.$langs->trans("PaypalAccount").'">'; } + print '
'; } } } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 70496d8689a..e5e68e59c48 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -133,7 +133,7 @@ input.buttongen { vertical-align: middle; } input.buttonpayment, button.buttonpayment, div.buttonpayment { - min-width: 320px; + min-width: 290px; margin-bottom: 15px; background-image: none; line-height: 24px; @@ -147,6 +147,11 @@ input.buttonpayment, button.buttonpayment, div.buttonpayment { color: #fff; border-radius: 4px; } +.buttonpaymentsmall { + font-size: 0.65em; + padding-left: 5px; + padding-right: 5px; +} div.buttonpayment input { background-color: unset; color: #fff; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 98618800e39..752f60541d1 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -353,8 +353,11 @@ input.buttongen { vertical-align: middle; } input.buttonpayment, button.buttonpayment, div.buttonpayment { - min-width: 320px; + min-width: 290px; margin-bottom: 15px; + margin-top: 0; + margin-left: 5px; + margin-right: 5px; background-image: none; line-height: 24px; padding: 8px;