diff --git a/htdocs/paypal/ajaxtransaction.php b/htdocs/paypal/ajaxtransaction.php index 49ee5c54b65..4572808b5cd 100644 --- a/htdocs/paypal/ajaxtransaction.php +++ b/htdocs/paypal/ajaxtransaction.php @@ -333,35 +333,64 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti $img_addressstatus=($addressstatus=='confirmed' ? img_tick($langs->trans(ucfirst($addressstatus))) : img_warning($langs->trans(ucfirst($addressstatus))) ); $return_arr['contents'].= '
| '.$langs->trans('Ref').' | '; $return_arr['contents'].= ''.$langs->trans('Label').' | '; - $return_arr['contents'].= ''.$langs->trans('Qty').' | '; + $return_arr['contents'].= ''.$langs->trans('UnitPriceHT').' | '; + $return_arr['contents'].= ''.$langs->trans('Qty').' | '; + $return_arr['contents'].= ''.$langs->trans('AmountHT').' | '; $return_arr['contents'].= '
| '.$_SESSION[$_GET['transaction_id']]["L_NUMBER".$i].' | '; $return_arr['contents'].= ''.$_SESSION[$_GET['transaction_id']]["L_NAME".$i].' | '; - $return_arr['contents'].= ''.$_SESSION[$_GET['transaction_id']]["L_QTY".$i].' | '; + $return_arr['contents'].= ''.price($unitprice_ht).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].' | '; + $return_arr['contents'].= ''.$_SESSION[$_GET['transaction_id']]["L_QTY".$i].' | '; + $return_arr['contents'].= ''.price($amount_ht).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].' | '; $return_arr['contents'].= '
| '.$langs->trans('TotalHT').' | '.price($total_ht).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].' | '; + + $var=!$var; + $return_arr['contents'].= '||||
| '.$langs->trans('TotalVAT').' | '.price($_SESSION[$_GET['transaction_id']]['TAXAMT']).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].' | '; + + $shipamount=($_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']?$_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']:$_SESSION[$_GET['transaction_id']]['SHIPAMOUNT']); + $var=!$var; + $return_arr['contents'].= '||||
| '.$langs->trans('SHIPAMOUNT').' | '.price($shipamount).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].' | '; + + $var=!$var; + $return_arr['contents'].= '||||
| '.$langs->trans('TotalTTC').' | '.price($_SESSION[$_GET['transaction_id']]['AMT']).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].' | '; + $return_arr['contents'].= '||||