From 026f9d8e2afb336ec7367aece138a02e4e5f676f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Sep 2017 10:54:30 +0200 Subject: [PATCH] Can set a dedicated message on payment forms --- htdocs/core/lib/payments.lib.php | 17 +++++++++++------ htdocs/public/paybox/newpayment.php | 2 +- htdocs/public/paybox/paymentko.php | 2 +- htdocs/public/paybox/paymentok.php | 2 +- htdocs/public/payment/newpayment.php | 2 +- htdocs/public/payment/paymentko.php | 2 +- htdocs/public/payment/paymentok.php | 2 +- htdocs/public/paypal/newpayment.php | 2 +- htdocs/public/paypal/paymentko.php | 2 +- htdocs/public/paypal/paymentok.php | 2 +- htdocs/public/stripe/newpayment.php | 2 +- htdocs/public/stripe/paymentko.php | 2 +- htdocs/public/stripe/paymentok.php | 2 +- 13 files changed, 23 insertions(+), 18 deletions(-) diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php index 84d66f3f1e4..e5199ad50a8 100644 --- a/htdocs/core/lib/payments.lib.php +++ b/htdocs/core/lib/payments.lib.php @@ -96,9 +96,10 @@ function payment_supplier_prepare_head(Paiement $object) { * @param Societe $fromcompany Third party * @param Translate $langs Output language * @param int $addformmessage Add the payment form message + * @param string $suffix Suffix to use on constants * @return void */ -function htmlPrintOnlinePaymentFooter($fromcompany,$langs,$addformmessage=0) +function htmlPrintOnlinePaymentFooter($fromcompany,$langs,$addformmessage=0,$suffix='') { global $conf; @@ -152,16 +153,20 @@ function htmlPrintOnlinePaymentFooter($fromcompany,$langs,$addformmessage=0) print '
'; - print '
'."\n"; + print '
'."\n"; if ($addformmessage) { - $key='ONLINE_PAYMENT_MESSAGE_FORM'; - if (! empty($conf->global->$key)) print '
'.$conf->global->$key; + print '
'; + $parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix; + if (! empty($conf->global->$parammessageform)) print $conf->global->$parammessageform; + else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $conf->global->ONLINE_PAYMENT_MESSAGE_FORM; } - print '
'."\n"; + print '
'."\n"; print $fromcompany->name.'
'; - print $line1.'
'; + print $line1; + if (strlen($line1+$line2) > 50) print '
'; + else print ' - '; print $line2; print '
'."\n"; } diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index bcf9a8a1b36..22d2e4ddc00 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -802,7 +802,7 @@ print '
'."\n"; print '
'; -htmlPrintOnlinePaymentFooter($mysoc,$langs,1); +htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index 15828f7d53b..feb4070c16b 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -162,7 +162,7 @@ if (! empty($conf->global->$key)) print $conf->global->$key; print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index 7c0a9048ae8..e3812c28dc1 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -193,7 +193,7 @@ if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 05589b9da9c..fc16f8c0a9d 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -1447,7 +1447,7 @@ if (preg_match('/^dopayment/',$action)) -htmlPrintOnlinePaymentFooter($mysoc,$langs,1); +htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php index 1ab3ecba9b1..cbea7db650f 100644 --- a/htdocs/public/payment/paymentko.php +++ b/htdocs/public/payment/paymentko.php @@ -244,7 +244,7 @@ if (! empty($conf->global->$key)) print $conf->global->$key; print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index bda39223673..29d2b78d142 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -443,7 +443,7 @@ else print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index eeb738f6e8a..efbe9b1b682 100644 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -1015,7 +1015,7 @@ print '
'; -htmlPrintOnlinePaymentFooter($mysoc,$langs,1); +htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index f9eb9984ce3..3e555379849 100644 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -172,7 +172,7 @@ if (! empty($conf->global->$key)) print $conf->global->$key; print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index 5e896b6f38a..9ae2e90795e 100644 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -328,7 +328,7 @@ else print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php index 36eb3cc2968..e12cb194c4d 100644 --- a/htdocs/public/stripe/newpayment.php +++ b/htdocs/public/stripe/newpayment.php @@ -1229,7 +1229,7 @@ if (preg_match('/^dopayment/',$action)) -htmlPrintOnlinePaymentFooter($mysoc,$langs,1); +htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php index 0be9f5e53ec..a2462904b07 100644 --- a/htdocs/public/stripe/paymentko.php +++ b/htdocs/public/stripe/paymentko.php @@ -159,7 +159,7 @@ if (! empty($conf->global->$key)) print $conf->global->$key; print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public'); diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php index f67f3c1a794..f018bc98b7a 100644 --- a/htdocs/public/stripe/paymentok.php +++ b/htdocs/public/stripe/paymentok.php @@ -193,7 +193,7 @@ if ($ispaymentok) print "\n\n"; -htmlPrintOnlinePaymentFooter($mysoc,$langs); +htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix); llxFooter('', 'public');