From d75e71b9b9b531dd36f572d3a2f0fcd780c33e44 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 Feb 2009 11:19:53 +0000 Subject: [PATCH] Works with Paybox v2 --- htdocs/admin/paybox.php | 21 ++++++++++--- htdocs/paybox/paybox.lib.php | 48 ++++++++++++++++++++++++++--- htdocs/public/paybox/newpayment.php | 16 +++++++--- 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php index 25b9e8418e3..a972468c3b7 100644 --- a/htdocs/admin/paybox.php +++ b/htdocs/admin/paybox.php @@ -38,9 +38,10 @@ if (!$user->admin) if ($_POST["action"] == 'setvalue' && $user->admin) { //$result=dolibarr_set_const($db, "PAYBOX_IBS_DEVISE",$_POST["PAYBOX_IBS_DEVISE"]); + $result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"]); + $result=dolibarr_set_const($db, "PAYBOX_CREDITOR",$_POST["PAYBOX_CREDITOR"]); $result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V1",$_POST["PAYBOX_CGI_URL_V1"]); $result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V2",$_POST["PAYBOX_CGI_URL_V2"]); - $result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"]); $result=dolibarr_set_const($db, "PAYBOX_IBS_SITE",$_POST["PAYBOX_IBS_SITE"]); $result=dolibarr_set_const($db, "PAYBOX_IBS_RANG",$_POST["PAYBOX_IBS_RANG"]); $result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT",$_POST["PAYBOX_PBX_IDENTIFIANT"]); @@ -105,38 +106,48 @@ print ''; +$var=!$var; +print ''; +print $langs->trans("PAYBOX_CREDITOR").''; +print ''; +print '
'.$langs->trans("Example").': '.$mysoc->nom; +print ''; + +/* $var=!$var; print ''; print $langs->trans("PAYBOX_CGI_URL_V1").''; print ''; print '
'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi'; print ''; +*/ $var=!$var; print ''; -print $langs->trans("PAYBOX_CGI_URL_V2").''; +print $langs->trans("PAYBOX_CGI_URL_V2").'*'; print ''; print '
'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi'; print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_IBS_SITE").''; +print $langs->trans("PAYBOX_PBX_SITE").'*'; print ''; print '
'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')'; print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_IBS_RANG").''; +print $langs->trans("PAYBOX_PBX_RANG").'*'; print ''; print '
'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')'; print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_PBX_IDENTIFIANT").''; +print $langs->trans("PAYBOX_PBX_IDENTIFIANT").'*'; print ''; +print '
'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')'; print ''; diff --git a/htdocs/paybox/paybox.lib.php b/htdocs/paybox/paybox.lib.php index 312928c66c4..6a1c597174c 100644 --- a/htdocs/paybox/paybox.lib.php +++ b/htdocs/paybox/paybox.lib.php @@ -75,17 +75,19 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) dol_syslog("Paypal.lib::print_paybox_redirect", LOG_DEBUG); // Clean parameters + $PBX_IDENTIFIANT="2"; # Identifiant pour v2 test + if ($conf->global->PAYBOX_PBX_IDENTIFIANT) $PBX_IDENTIFIANT=$conf->global->PAYBOX_PBX_IDENTIFIANT; $IBS_SITE="1999888"; # Site test if ($conf->global->PAYBOX_IBS_SITE) $IBS_SITE=$conf->global->PAYBOX_IBS_SITE; $IBS_RANG="99"; # Rang test if ($conf->global->PAYBOX_IBS_RANG) $IBS_RANG=$conf->global->PAYBOX_IBS_RANG; - $IBS_DEVISE=""; # Currency + $IBS_DEVISE="840"; # Currency (Dollar US by default) if ($CURRENCY == 'EUR') $IBS_DEVISE="978"; - + if ($CURRENCY == 'USD') $IBS_DEVISE="840"; $URLPAYBOX=""; if ($conf->global->PAYBOX_CGI_URL_V1) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V1; - //if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2; + if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2; if (empty($IBS_DEVISE)) { @@ -123,12 +125,16 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) $IBS_REFUSE=$urlko; $IBS_BKGD="#FFFFFF"; $IBS_WAIT="2000"; - $IBS_LANG="GBR"; // FRA, GBR, ESP, ITA et DEU + $IBS_LANG="GBR"; // By default GBR=english (FRA, GBR, ESP, ITA et DEU...) if (eregi('^FR',$langs->defaultlang)) $IBS_LANG="FRA"; if (eregi('^ES',$langs->defaultlang)) $IBS_LANG="ESP"; if (eregi('^IT',$langs->defaultlang)) $IBS_LANG="ITA"; if (eregi('^DE',$langs->defaultlang)) $IBS_LANG="DEU"; + if (eregi('^NL',$langs->defaultlang)) $IBS_LANG="NLD"; + if (eregi('^SE',$langs->defaultlang)) $IBS_LANG="SWE"; $IBS_OUTPUT='E'; + $PBX_SOURCE='HTML'; + $PBX_TYPEPAIEMENT='CARTE'; dol_syslog("Soumission Paybox", LOG_DEBUG); dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG); @@ -146,6 +152,9 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG); dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG); dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG); + dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTITIANT", LOG_DEBUG); + dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG); + dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG); header("Content-type: text/html; charset=".$conf->character_set_client); @@ -156,8 +165,12 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) print ''."\n"; print "\n"; - // Formulaire pour module Paybox v1 (IBS_xxx) + // Formulaire pour module Paybox print '
'."\n"; + + // For Paybox V1 (IBS_xxx) + /* + print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -173,6 +186,31 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) print ''."\n"; print ''."\n"; print ''."\n"; + print ''."\n"; + */ + + // For Paybox V2 (PBX_xxx) + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print '
'."\n"; // Formulaire pour module Paybox v2 (PBX_xxx) diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index fdf79f17bd0..7832432bd15 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -102,6 +102,11 @@ if ($_REQUEST["action"] == 'dopayment') llxHeaderPayBox($langs->trans("PaymentForm")); +// Common variables +$creditor=$mysoc->nom; +if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBOX_CREDITOR; + + print '
'; print '
'; print ''; @@ -134,7 +139,7 @@ if ($urllogo) print '
'.$langs->trans("WelcomeOnPaymentPage").'
'."\n"; -print '
'.$langs->trans("ThisScreenAllowsYouToPay",$mysoc->nom).'

'."\n"; +print '
'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'

'."\n"; print ''; print ''; @@ -143,6 +148,7 @@ print ''."\n"; + print ''."\n"; // Debitor $var=!$var; @@ -244,7 +250,7 @@ if ($_REQUEST["amount"] == 'invoice') // Creditor $var=!$var; print ''."\n"; + print ''."\n"; // Debitor $var=!$var; @@ -361,7 +367,7 @@ if ($_REQUEST["amount"] == 'contractline') // Creditor $var=!$var; print ''."\n"; + print ''."\n"; // Debitor $var=!$var; @@ -460,7 +466,7 @@ if (is_numeric($_REQUEST["amount"])) // Creditor $var=!$var; print ''."\n"; + print ''."\n"; // Amount $var=!$var;
'.$langs->trans("Thi $found=false; $var=false; + // Payment on customer order if ($_REQUEST["amount"] == 'order') { @@ -171,7 +177,7 @@ if ($_REQUEST["amount"] == 'order') // Creditor $var=!$var; print '
'.$langs->trans("Creditor"); - print ''.$mysoc->nom.'
'.$creditor.'
'.$langs->trans("Creditor"); - print ''.$mysoc->nom.'
'.$creditor.'
'.$langs->trans("Creditor"); - print ''.$mysoc->nom.'
'.$creditor.'
'.$langs->trans("Creditor"); - print ''.$mysoc->nom.'
'.$creditor.'