diff --git a/ChangeLog b/ChangeLog index 92e60740ea0..bd91571cd60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ For developers: - New: A page can force reload of css style sheet - New: A module can add import description for import wizard, even for tables with foreign keys. - New: Can add tabs on statistics views. +- New: Add CSS id/class into public payment pages. - Qual: Add a lot of more PHPUnit tests. - Qual: Data structure for supplier prices is simpler. - Qual: Removed no more used external libraries. diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index e26f13411b1..3b0d23a2016 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2011 Laurent Destailleur + * Copyright (C) 2006-2012 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -152,7 +152,7 @@ print ''."\n"; print ''."\n"; print "\n"; -print ''."\n"; +print '
'."\n"; // Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo) $width=0; @@ -195,14 +195,14 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT)) } if (empty($text)) { - $text.=''."\n"; - $text.=''."\n"; + $text.=''."\n"; + $text.=''."\n"; } print $text; // Output payment summary form print '

'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'


'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'

'; -print ''; +print '
'; print ''."\n"; $found=false; @@ -220,14 +220,14 @@ if (! GETPOST("source")) // Creditor $var=!$var; - print ''."\n"; // Amount $var=!$var; - print ''."\n"; } @@ -288,20 +288,20 @@ if (GETPOST("source") == 'order') // Creditor $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''; + print ''; print ''."\n"; // Amount $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''."\n"; // Last subscription amount $var=!$var; - print ''."\n"; @@ -664,7 +664,7 @@ if (GETPOST("source") == 'membersubscription') // Amount $var=!$var; - print '
'.$langs->trans("ThisIsInformationOnPayment").' :
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -244,7 +244,7 @@ if (! GETPOST("source")) // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -252,7 +252,7 @@ if (! GETPOST("source")) // EMail $var=!$var; - print '
'.$langs->trans("YourEMail"); + print '
'.$langs->trans("YourEMail"); print ' ('.$langs->trans("ToComplete").')'; print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("ThirdParty"); + print '
'.$langs->trans("ThirdParty"); print ''.$order->thirdparty->name.''; // Object $var=!$var; $text=''.$langs->trans("PaymentOrderRef",$order->ref).''; - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -309,7 +309,7 @@ if (GETPOST("source") == 'order') // Amount $var=!$var; - print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -325,7 +325,7 @@ if (GETPOST("source") == 'order') // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -333,7 +333,7 @@ if (GETPOST("source") == 'order') // EMail $var=!$var; - print '
'.$langs->trans("YourEMail"); + print '
'.$langs->trans("YourEMail"); print ' ('.$langs->trans("ToComplete").')'; $email=$order->thirdparty->email; $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:'')); @@ -371,20 +371,20 @@ if (GETPOST("source") == 'invoice') // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("ThirdParty"); + print '
'.$langs->trans("ThirdParty"); print ''.$invoice->thirdparty->name.''; // Object $var=!$var; $text=''.$langs->trans("PaymentInvoiceRef",$invoice->ref).''; - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -392,7 +392,7 @@ if (GETPOST("source") == 'invoice') // Amount $var=!$var; - print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -408,7 +408,7 @@ if (GETPOST("source") == 'invoice') // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -416,7 +416,7 @@ if (GETPOST("source") == 'invoice') // EMail $var=!$var; - print '
'.$langs->trans("YourEMail"); + print '
'.$langs->trans("YourEMail"); print ' ('.$langs->trans("ToComplete").')'; $email=$invoice->thirdparty->email; $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:'')); @@ -500,14 +500,14 @@ if (GETPOST("source") == 'contractline') // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("ThirdParty"); + print '
'.$langs->trans("ThirdParty"); print ''.$contract->thirdparty->name.''; // Object @@ -527,7 +527,7 @@ if (GETPOST("source") == 'contractline') $text.='
'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite); } - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -556,14 +556,14 @@ if (GETPOST("source") == 'contractline') $duration=$product->duration_value.' '.$dur[$product->duration_unit]; } } - print '
'.$label.'
'.$label.''.($duration?$duration:$qty).''; print ''; print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -579,7 +579,7 @@ if (GETPOST("source") == 'contractline') // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -587,7 +587,7 @@ if (GETPOST("source") == 'contractline') // EMail $var=!$var; - print '
'.$langs->trans("YourEMail"); + print '
'.$langs->trans("YourEMail"); print ' ('.$langs->trans("ToComplete").')'; $email=$contract->thirdparty->email; $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:'')); @@ -626,14 +626,14 @@ if (GETPOST("source") == 'membersubscription') // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("Member"); + print '
'.$langs->trans("Member"); print ''.$member->getFullName($langs).''; // Object @@ -649,13 +649,13 @@ if (GETPOST("source") == 'membersubscription') { // Last subscription date $var=!$var; - print '
'.$langs->trans("LastSubscriptionDate"); + print '
'.$langs->trans("LastSubscriptionDate"); print ''.dol_print_date($member->last_subscription_date,'day'); print '
'.$langs->trans("LastSubscriptionAmount"); + print '
'.$langs->trans("LastSubscriptionAmount"); print ''.price($member->last_subscription_amount); print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -680,7 +680,7 @@ if (GETPOST("source") == 'membersubscription') // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -688,7 +688,7 @@ if (GETPOST("source") == 'membersubscription') // EMail $var=!$var; - print '
'.$langs->trans("YourEMail"); + print '
'.$langs->trans("YourEMail"); $email=$member->email; $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:'')); if (empty($email)) print ' ('.$langs->trans("ToComplete").')'; @@ -725,7 +725,8 @@ print '
'; html_print_paybox_footer($mysoc,$langs); -$db->close(); llxFooterPayBox(); + +$db->close(); ?> diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index d4aa889d2e0..b2bf8ad54e9 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -265,7 +265,7 @@ print ''."\n"; print ''."\n"; print "\n"; -print ''."\n"; +print '
'."\n"; // Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo) $width=0; @@ -308,14 +308,14 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT)) } if (empty($text)) { - $text.=''."\n"; - $text.=''."\n"; + $text.=''."\n"; + $text.=''."\n"; } print $text; // Output payment summary form print '

'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'


'.$langs->trans("WelcomeOnPaymentPage").'

'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'

'; -print ''; +print '
'; print ''."\n"; $found=false; @@ -331,14 +331,14 @@ if (! GETPOST("source") && $valid) // Creditor $var=!$var; - print ''."\n"; // Amount $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''; + print ''; print ''."\n"; // Amount $var=!$var; - print ''."\n"; // Debitor $var=!$var; - print ''."\n"; // Last subscription amount $var=!$var; - print ''."\n"; @@ -830,7 +830,7 @@ if (GETPOST("source") == 'membersubscription' && $valid) // Amount $var=!$var; - print '
'.$langs->trans("ThisIsInformationOnPayment").' :
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -354,7 +354,7 @@ if (! GETPOST("source") && $valid) // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -396,20 +396,20 @@ if (GETPOST("source") == 'order' && $valid) // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("ThirdParty"); + print '
'.$langs->trans("ThirdParty"); print ''.$order->thirdparty->name.''; // Object $var=!$var; $text=''.$langs->trans("PaymentOrderRef",$order->ref).''; - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -417,7 +417,7 @@ if (GETPOST("source") == 'order' && $valid) // Amount $var=!$var; - print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -433,7 +433,7 @@ if (GETPOST("source") == 'order' && $valid) // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -499,20 +499,20 @@ if (GETPOST("source") == 'invoice' && $valid) // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("ThirdParty"); + print '
'.$langs->trans("ThirdParty"); print ''.$invoice->thirdparty->name.''; // Object $var=!$var; $text=''.$langs->trans("PaymentInvoiceRef",$invoice->ref).''; - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -520,7 +520,7 @@ if (GETPOST("source") == 'invoice' && $valid) // Amount $var=!$var; - print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -536,7 +536,7 @@ if (GETPOST("source") == 'invoice' && $valid) // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -648,14 +648,14 @@ if (GETPOST("source") == 'contractline' && $valid) // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("ThirdParty"); + print '
'.$langs->trans("ThirdParty"); print ''.$contract->thirdparty->name.''; // Object @@ -675,7 +675,7 @@ if (GETPOST("source") == 'contractline' && $valid) $text.='
'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite); } - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -704,14 +704,14 @@ if (GETPOST("source") == 'contractline' && $valid) $duration=$product->duration_value.' '.$dur[$product->duration_unit]; } } - print '
'.$label.'
'.$label.''.($duration?$duration:$qty).''; print ''; print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -727,7 +727,7 @@ if (GETPOST("source") == 'contractline' && $valid) // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print ''; @@ -792,20 +792,20 @@ if (GETPOST("source") == 'membersubscription' && $valid) // Creditor $var=!$var; - print '
'.$langs->trans("Creditor"); + print '
'.$langs->trans("Creditor"); print ''.$creditor.''; print ''; print '
'.$langs->trans("Member"); + print '
'.$langs->trans("Member"); print ''.$member->getFullName($langs).''; // Object $var=!$var; $text=''.$langs->trans("PaymentSubscription").''; - print '
'.$langs->trans("Designation"); + print '
'.$langs->trans("Designation"); print ''.$text; print ''; print ''; @@ -815,13 +815,13 @@ if (GETPOST("source") == 'membersubscription' && $valid) { // Last subscription date $var=!$var; - print '
'.$langs->trans("LastSubscriptionDate"); + print '
'.$langs->trans("LastSubscriptionDate"); print ''.dol_print_date($member->last_subscription_date,'day'); print '
'.$langs->trans("LastSubscriptionAmount"); + print '
'.$langs->trans("LastSubscriptionAmount"); print ''.price($member->last_subscription_amount); print '
'.$langs->trans("Amount"); + print '
'.$langs->trans("Amount"); if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; print ''; if (empty($amount) || ! is_numeric($amount)) print ''; @@ -846,7 +846,7 @@ if (GETPOST("source") == 'membersubscription' && $valid) // Tag $var=!$var; - print '
'.$langs->trans("PaymentCode"); + print '
'.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; print '';