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

Fix: Direct payment from autosubscribe form was showing wrong text.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-13 11:42:39 +00:00
parent 759cf4d4c8
commit 7f52c3900d
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/menus/init_menu_auguria.sql
View File

@ -1,6 +1,6 @@
--
-- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
-- $Revision: 1.119 $
-- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
-- $Revision: 1.121 $
--
-- Menu base entries
-- This file is loaded when a menu handler base is activated (auguria, etc..)

2
htdocs/includes/menus/standard/eldy.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/includes/menus/standard/eldy.lib.php
* \brief Library for file eldy menus
* \version $Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
* \version $Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
*/

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

@ -193,3 +193,4 @@ Associations=Foundations
Collectivités=Organizations
Particuliers=Personal
Entreprises=Companies
DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br>

1
htdocs/langs/fr_FR/members.lang
View File

@ -197,3 +197,4 @@ Associations=Associations
Collectivités=Collectivités
Particuliers=Particuliers
Entreprises=Entreprises
DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>

11
htdocs/public/paybox/newpayment.php
View File

@ -23,7 +23,7 @@
* \ingroup paybox
* \brief File to offer a way to make a payment for a particular Dolibarr entity
* \author Laurent Destailleur
* \version $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $
* \version $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -188,7 +188,12 @@ if ($urllogo)
// Output introduction text
$text='';
if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."<br>\n";
if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
{
$langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
}
if (empty($text))
{
$text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@ -723,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
$db->close();
llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $');
llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
?>

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

@ -23,7 +23,7 @@
* \ingroup paypal
* \brief File to offer a way to make a payment for a particular Dolibarr entity
* \author Laurent Destailleur
* \version $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $
* \version $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -282,7 +282,12 @@ if ($urllogo)
// Output introduction text
$text='';
if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."<br>\n";
if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
{
$langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
}
if (empty($text))
{
$text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@ -941,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
$db->close();
llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $');
llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
?>