diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index d461137eaf61c433f0fa1c262519ff0123adeb7a..f4d349046b03d6e1762d85f1d773140790e2340d 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -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 $'); ?> diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index e27a24933696d4cbd1c407a7a4ffac0d3994b553..d87a7ed10511ea1e559061c8f75f09ac992bac75 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -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.58 2011/07/13 11:42:39 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,11 +188,11 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) +if (! empty($conf->global->PAYBOX_NEWFORM_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 (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)) { @@ -728,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs); $db->close(); -llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $'); +llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $'); ?> diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 30001659341e474bc44f60fdc411472cd0c918b5..4b96c8075ea8606ec500b73dd98beb2f0b550261 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -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.23 2011/07/13 11:42:39 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,11 +282,12 @@ if ($urllogo) // Output introduction text $text=''; -if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) +if (! empty($conf->global->PAYPAL_NEWFORM_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 (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)) { @@ -946,5 +947,5 @@ html_print_paypal_footer($mysoc,$langs); $db->close(); -llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $'); +llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $'); ?>