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

Fix: Message for payment forms

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-13 11:56:36 +00:00
parent d41b9fb02e
commit b89dc2c2df
6 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/fiche.php
View File

@ -23,7 +23,7 @@
* \file htdocs/adherents/fiche.php
* \ingroup member
* \brief Page of member
* \version $Id$
* \version $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
*/
require("../main.inc.php");
@ -944,7 +944,7 @@ if ($action == 'edit')
print '</td></tr>';
// Country
$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
//$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id; // In edit mode we don't force to company country if not defined
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
$html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
?>

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>

8
htdocs/public/members/new.php
View File

@ -22,7 +22,7 @@
* \file htdocs/public/members/new.php
* \ingroup member
* \brief Example of form to add a new member
* \version $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
* \version $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
*
* Note that you can add following constant to change behaviour of page
* MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form
@ -184,7 +184,7 @@ if ($action == 'add')
}
if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
{
if (GETPOST('budget') <= 0)
if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
{
$error+=1;
$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@ -289,7 +289,7 @@ if ($action == 'added')
print $langs->trans("NewMemberbyWeb");
print '</center>';
llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
exit;
}
@ -537,5 +537,5 @@ print "<br></form>\n";
$db->close();
llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
?>

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.59 2011/07/13 12:00:18 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_NEWFORM_TEXT))
{
$langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
else $text.=$conf->global->PAYBOX_NEWFORM_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 12:00:18 $ - $Revision: 1.59 $');
?>

12
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.25 2011/07/13 12:03:29 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -282,7 +282,13 @@ 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->PAYPAL_NEWFORM_TEXT))
{
$langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
$text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
}
if (empty($text))
{
$text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@ -941,5 +947,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 12:03:29 $ - $Revision: 1.25 $');
?>