From fb92986d654657531db173063c8688b3d38ac308 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:14:43 +0000
Subject: [PATCH] Fix: Message for payment forms
---
htdocs/public/members/new.php | 31 +++++++++++++++++++----------
htdocs/public/paybox/newpayment.php | 19 ++++++++++++------
htdocs/public/paypal/newpayment.php | 17 +++++++++++-----
3 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 035e8848da4..d461137eaf6 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.40 2011/07/13 10:22:54 eldy Exp $
+ * \version $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
*
* Note that you can add following constant to change behaviour of page
* MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form
@@ -182,13 +182,18 @@ if ($action == 'add')
$langs->load("errors");
$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
}
- if (isset($public))
+ if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
{
- $public=1;
- }else{
- $public=0;
+ if (GETPOST('budget') <= 0)
+ {
+ $error+=1;
+ $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
+ }
}
+ if (isset($public)) $public=1;
+ else $public=0;
+
if (! $error)
{
// email a peu pres correct et le login n'existe pas
@@ -232,20 +237,24 @@ if ($action == 'add')
}
if ($backtopage) $urlback=$backtopage;
- else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+ else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)
+ {
+ $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+ // TODO Make replacement of __AMOUNT__, etc...
+ }
else $urlback=$_SERVER["PHP_SELF"]."?action=added";
if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
{
if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
{
- $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref;
+ $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
}
else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
{
- $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref;
+ $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
}
@@ -280,7 +289,7 @@ if ($action == 'added')
print $langs->trans("NewMemberbyWeb");
print '</center>';
- llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
+ llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
exit;
}
@@ -450,7 +459,7 @@ print '</tr>'."\n";
if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
{
$arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+');
- print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").'</td><td>';
+ print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1);
print ' € or $';
@@ -528,5 +537,5 @@ print "<br></form>\n";
$db->close();
-llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
+llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 7f306f4e8ce..fdec201c31d 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.56 2011/07/05 08:29:53 eldy Exp $
+ * \version $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@@ -186,10 +186,17 @@ if ($urllogo)
print '</tr>'."\n";
}
-print '<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
-
-print '<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."<br>\n";
+if (empty($text))
+{
+ $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
+ $text.='<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+// Output payment summary form
print '<tr><td align="center">';
print '<table with="100%">';
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
@@ -678,9 +685,9 @@ if (GETPOST("source") == 'membersubscription')
// EMail
$var=!$var;
print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
- print ' ('.$langs->trans("ToComplete").')';
$email=$member->client->email;
$email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:''));
+ if (empty($email)) print ' ('.$langs->trans("ToComplete").')';
print '</td><td class="CTableRow'.($var?'1':'2').'"><input class="flat" type="text" name="email" size="48" value="'.$email.'"></td></tr>'."\n";
}
@@ -716,5 +723,5 @@ html_print_paybox_footer($mysoc,$langs);
$db->close();
-llxFooterPayBox('$Date: 2011/07/05 08:29:53 $ - $Revision: 1.56 $');
+llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $');
?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index c4a390cf1bd..82fd23583a6 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.21 2011/06/26 12:34:54 eldy Exp $
+ * \version $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@@ -280,10 +280,17 @@ if ($urllogo)
print '</tr>'."\n";
}
-print '<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
-
-print '<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."<br>\n";
+if (empty($text))
+{
+ $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
+ $text.='<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+// Output payment summary form
print '<tr><td align="center">';
print '<table with="100%">';
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
@@ -934,5 +941,5 @@ html_print_paypal_footer($mysoc,$langs);
$db->close();
-llxFooterPaypal('$Date: 2011/06/26 12:34:54 $ - $Revision: 1.21 $');
+llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $');
?>
--
GitLab