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 12:03:30 +00:00
parent d4f06046f0
commit 2c6b057270
6 changed files with 20 additions and 19 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 * \file htdocs/adherents/fiche.php
* \ingroup member * \ingroup member
* \brief Page of 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"); require("../main.inc.php");
@ -944,7 +944,7 @@ if ($action == 'edit')
print '</td></tr>'; print '</td></tr>';
// Country // 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>'; 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'); $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); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
?> ?>

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

@ -193,4 +193,4 @@ Associations=Foundations
Collectivités=Organizations Collectivités=Organizations
Particuliers=Personal Particuliers=Personal
Entreprises=Companies 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> DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" 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>

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

@ -197,4 +197,4 @@ Associations=Associations
Collectivités=Collectivités Collectivités=Collectivités
Particuliers=Particuliers Particuliers=Particuliers
Entreprises=Entreprises 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> DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" 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>

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

@ -22,7 +22,7 @@
* \file htdocs/public/members/new.php * \file htdocs/public/members/new.php
* \ingroup member * \ingroup member
* \brief Example of form to add a new 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 * Note that you can add following constant to change behaviour of page
* MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form * MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form
@ -184,7 +184,7 @@ if ($action == 'add')
} }
if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
{ {
if (GETPOST('budget') <= 0) if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
{ {
$error+=1; $error+=1;
$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n"; $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@ -289,7 +289,7 @@ if ($action == 'added')
print $langs->trans("NewMemberbyWeb"); print $langs->trans("NewMemberbyWeb");
print '</center>'; 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; exit;
} }
@ -537,5 +537,5 @@ print "<br></form>\n";
$db->close(); $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 * \ingroup paybox
* \brief File to offer a way to make a payment for a particular Dolibarr entity * \brief File to offer a way to make a payment for a particular Dolibarr entity
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $ * \version $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
*/ */
define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -188,11 +188,12 @@ if ($urllogo)
// Output introduction text // Output introduction text
$text=''; $text='';
if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
{ {
$langs->load("members"); $langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n"; if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n"; else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
$text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
} }
if (empty($text)) if (empty($text))
{ {
@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs);
$db->close(); $db->close();
llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $'); llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
?> ?>

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

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