NEW Can set a dedicated message on payment forms

htdocs/core/lib/payments.lib.php

@@ -95,9 +95,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
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany,$langs)
+function htmlPrintOnlinePaymentFooter($fromcompany,$langs,$addformmessage=0)
 {
     global $conf;
 
@@ -149,8 +150,16 @@ function htmlPrintOnlinePaymentFooter($fromcompany,$langs)
         $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
     }
 
-    print '<br><br><hr>'."\n";
+    print '<br>';
+
     print '<div class="center"><font style="font-size: 10px;">'."\n";
+    if ($addformmessage)
+    {
+    	$key='ONLINE_PAYMENT_MESSAGE_FORM';
+    	if (! empty($conf->global->$key)) print '<br>'.$conf->global->$key;
+    }
+
+    print '<br><hr>'."\n";
     print $fromcompany->name.'<br>';
     print $line1.'<br>';
     print $line2;

htdocs/public/paybox/newpayment.php

@@ -802,7 +802,7 @@ print '</div>'."\n";
 print '<br>';
 
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs,1);
 
 
 llxFooter('', 'public');

htdocs/public/paybox/paymentko.php

@@ -156,7 +156,8 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 
 print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
 
-if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_KO)) print $conf->global->ONLINE_PAYMENT_MESSAGE_KO;
+$key='ONLINE_PAYMENT_MESSAGE_KO';
+if (! empty($conf->global->$key)) print $conf->global->$key;
 
 print "\n</div>\n";
 

htdocs/public/paybox/paymentok.php

@@ -115,7 +115,8 @@ dol_syslog("Call newpaymentok with token=".$onlinetoken." paymentType=".$payment
 
 print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
 
-if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_OK)) print $conf->global->ONLINE_PAYMENT_MESSAGE_OK;
+$key='ONLINE_PAYMENT_MESSAGE_OK';
+if (! empty($conf->global->$key)) print $conf->global->$key;
 
 
 // Appel des triggers

htdocs/public/payment/newpayment.php

@@ -1264,6 +1264,7 @@ else
 print '</td></tr>'."\n";
 
 print '</table>'."\n";
+
 print '</form>'."\n";
 print '</div>'."\n";
 print '<br>';
@@ -1446,7 +1447,7 @@ if (preg_match('/^dopayment/',$action))
 
 
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs,1);
 
 llxFooter('', 'public');
 

htdocs/public/payment/paymentko.php

@@ -238,7 +238,9 @@ if ($urllogo)
 
 print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
 
-if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_KO)) print $conf->global->ONLINE_PAYMENT_MESSAGE_KO;
+$key='ONLINE_PAYMENT_MESSAGE_KO';
+if (! empty($conf->global->$key)) print $conf->global->$key;
+
 print "\n</div>\n";
 
 

htdocs/public/payment/paymentok.php

@@ -285,7 +285,9 @@ if ($ispaymentok)
 
     print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
     print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
-    if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_OK)) print $conf->global->ONLINE_PAYMENT_MESSAGE_OK;
+
+    $key='ONLINE_PAYMENT_MESSAGE_OK';
+    if (! empty($conf->global->$key)) print $conf->global->$key;
 
     $sendemail = '';
     if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;

htdocs/public/paypal/newpayment.php

@@ -1015,7 +1015,7 @@ print '<br>';
 
 
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs,1);
 
 llxFooter('', 'public');
 

htdocs/public/paypal/paymentko.php

@@ -166,7 +166,9 @@ print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
 
-if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_KO)) print $conf->global->ONLINE_PAYMENT_MESSAGE_KO;
+$key='ONLINE_PAYMENT_MESSAGE_KO';
+if (! empty($conf->global->$key)) print $conf->global->$key;
+
 print "\n</div>\n";
 
 

htdocs/public/paypal/paymentok.php

@@ -170,7 +170,9 @@ if ($PAYPALTOKEN)
 
             print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
             print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
-            if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_OK)) print $conf->global->ONLINE_PAYMENT_MESSAGE_OK;
+
+			$key='ONLINE_PAYMENT_MESSAGE_OK';
+			if (! empty($conf->global->$key)) print $conf->global->$key;
 
             // Appel des triggers
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

htdocs/public/stripe/newpayment.php

@@ -1229,7 +1229,7 @@ if (preg_match('/^dopayment/',$action))
 
 
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs,1);
 
 llxFooter('', 'public');
 

htdocs/public/stripe/paymentko.php

@@ -153,7 +153,9 @@ print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
 
-if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_KO)) print $conf->global->ONLINE_PAYMENT_MESSAGE_KO;
+$key='ONLINE_PAYMENT_MESSAGE_KO';
+if (! empty($conf->global->$key)) print $conf->global->$key;
+
 print "\n</div>\n";
 
 

htdocs/public/stripe/paymentok.php

@@ -120,7 +120,9 @@ if ($ispaymentok)
 
     print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
     print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
-    if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_OK)) print $conf->global->ONLINE_PAYMENT_MESSAGE_OK;
+
+	$key='ONLINE_PAYMENT_MESSAGE_OK';
+	if (! empty($conf->global->$key)) print $conf->global->$key;
 
     $sendemail = '';
     if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;