lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Works on paypal module

Browse Source 
Fix: add linked objects
This commit is contained in:
Regis Houssin 2011-05-24 07:29:14 +00:00
parent edd91b7d26
commit df3625d498
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,7 +257,7 @@ HelpAbandonOther=Ce montant a été abandonné car il s'agissait d'une erreur de
IdSocialContribution=Id charge sociale IdSocialContribution=Id charge sociale
PaymentId=Id paiement PaymentId=Id paiement
InvoiceId=Id facture InvoiceId=Id facture
InvoiceRef=Ref. facture InvoiceRef=Réf. facture
InvoiceDateCreation=Date création facture InvoiceDateCreation=Date création facture
InvoiceStatus=Statut facture InvoiceStatus=Statut facture
InvoiceNote=Note facture InvoiceNote=Note facture

33
htdocs/paypal/ajaxtransaction.php
View File

@ -263,6 +263,8 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti
else if ($_GET['action'] == 'showdetails') else if ($_GET['action'] == 'showdetails')
{ {
$langs->load('paypal'); $langs->load('paypal');
$langs->load('orders');
$langs->load('bills');
$return_arr = array(); $return_arr = array();
$return_arr['element_created'] = false; $return_arr['element_created'] = false;
@ -350,6 +352,37 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti
$return_arr['contents'].= '</table>'; $return_arr['contents'].= '</table>';
if (! empty($objects))
{
$return_arr['contents'].= '<table style="noboardernopading" width="100%">';
$return_arr['contents'].= '<tr class="liste_titre">';
$return_arr['contents'].= '<td colspan="3">'.$langs->trans('BuildDocuments').'</td>';
$return_arr['contents'].= '</tr>';
if (! empty($objects['order']))
{
$var=!$var;
$return_arr['contents'].= '<tr '.$bc[$var].'>';
$return_arr['contents'].= '<td>'.$langs->trans('RefOrder').'</td>';
$return_arr['contents'].= '<td>'.$objects['order']->getNomUrl(1).'</td>';
$return_arr['contents'].= '<td align="center">'.$objects['order']->getLibStatut(3).'</td>';
$return_arr['contents'].= '</tr>';
}
if (! empty($objects['invoice']))
{
$var=!$var;
$return_arr['contents'].= '<tr '.$bc[$var].'>';
$return_arr['contents'].= '<td>'.$langs->trans('InvoiceRef').'</td>';
$return_arr['contents'].= '<td>'.$objects['invoice']->getNomUrl(1).'</td>';
$return_arr['contents'].= '<td align="center">'.$objects['invoice']->getLibStatut(3).'</td>';
$return_arr['contents'].= '</tr>';
}
$return_arr['contents'].= '</table>';
}
/* /*
$return_arr['contents'].= '<br />'; $return_arr['contents'].= '<br />';
foreach ($_SESSION[$_GET['transaction_id']] as $key => $value) foreach ($_SESSION[$_GET['transaction_id']] as $key => $value)