Fix: Direct payment from autosubscribe form was showing wrong text.
This commit is contained in:
Laurent Destailleur
parent
f7e510c76f
commit
0ef5b0335d
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -22,7 +22,7 @@
|
||||
* \file htdocs/fourn/facture/index.php
|
||||
* \ingroup fournisseur,facture
|
||||
* \brief List of suppliers invoices
|
||||
* \version $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
|
||||
accessforbidden();
|
||||
|
||||
$langs->load("companies");
|
||||
$langs->load("bills");
|
||||
|
||||
$socid = $_GET["socid"];
|
||||
|
||||
@ -293,5 +292,5 @@ else
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -193,4 +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 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>
|
||||
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>
|
||||
|
||||
@ -197,4 +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 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>
|
||||
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>
|
||||
|
||||
@ -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.42 2011/07/13 11:56:36 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
|
||||
@ -184,7 +184,7 @@ if ($action == 'add')
|
||||
}
|
||||
if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
|
||||
{
|
||||
if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
|
||||
if (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:56:36 $ - $Revision: 1.42 $');
|
||||
llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
|
||||
exit;
|
||||
}
|
||||
|
||||
@ -537,5 +537,5 @@ print "<br></form>\n";
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
|
||||
llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
|
||||
?>
|
||||
|
||||
@ -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.60 2011/07/13 12:03:30 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,12 +188,11 @@ if ($urllogo)
|
||||
|
||||
// Output introduction text
|
||||
$text='';
|
||||
if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
|
||||
if (! empty($conf->global->PAYBOX_NEWMEMBER_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";
|
||||
$text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
|
||||
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))
|
||||
{
|
||||
@ -729,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
|
||||
llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
|
||||
?>
|
||||
|
||||
@ -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.24 2011/07/13 12:00:18 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,11 +282,11 @@ if ($urllogo)
|
||||
|
||||
// Output introduction text
|
||||
$text='';
|
||||
if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
|
||||
if (! empty($conf->global->PAYBOX_NEWMEMBER_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";
|
||||
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))
|
||||
{
|
||||
@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
|
||||
llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user