diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index d7311ee40ef..3e510424795 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -257,7 +257,7 @@ HelpAbandonOther=Ce montant a été abandonné car il s'agissait d'une erreur de IdSocialContribution=Id charge sociale PaymentId=Id paiement InvoiceId=Id facture -InvoiceRef=Ref. facture +InvoiceRef=Réf. facture InvoiceDateCreation=Date création facture InvoiceStatus=Statut facture InvoiceNote=Note facture diff --git a/htdocs/paypal/ajaxtransaction.php b/htdocs/paypal/ajaxtransaction.php index e2a2680e330..fe5c20a21f9 100644 --- a/htdocs/paypal/ajaxtransaction.php +++ b/htdocs/paypal/ajaxtransaction.php @@ -263,6 +263,8 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti else if ($_GET['action'] == 'showdetails') { $langs->load('paypal'); + $langs->load('orders'); + $langs->load('bills'); $return_arr = array(); $return_arr['element_created'] = false; @@ -350,6 +352,37 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti $return_arr['contents'].= ''; + if (! empty($objects)) + { + $return_arr['contents'].= ''; + + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + + if (! empty($objects['order'])) + { + $var=!$var; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + } + if (! empty($objects['invoice'])) + { + $var=!$var; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + } + + $return_arr['contents'].= '
'.$langs->trans('BuildDocuments').'
'.$langs->trans('RefOrder').''.$objects['order']->getNomUrl(1).''.$objects['order']->getLibStatut(3).'
'.$langs->trans('InvoiceRef').''.$objects['invoice']->getNomUrl(1).''.$objects['invoice']->getLibStatut(3).'
'; + } + + /* $return_arr['contents'].= '
'; foreach ($_SESSION[$_GET['transaction_id']] as $key => $value)