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('ADDRESSSTATUS').''.$img_addressstatus.''; - $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'].''; - $return_arr['contents'].= ''; $i=0; + $total_ht=0; $return_arr['contents'].= ''; $return_arr['contents'].= ''; $return_arr['contents'].= ''; $return_arr['contents'].= ''; - $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; $return_arr['contents'].= ''; while (isset($_SESSION[$_GET['transaction_id']]["L_NAME".$i])) { $var=!$var; + $qty = $_SESSION[$_GET['transaction_id']]["L_QTY".$i]; + + if ($_SESSION[$_GET['transaction_id']]["L_AMT".$i]) + { + $amount_ht = ($_SESSION[$_GET['transaction_id']]["L_AMT".$i] - $_SESSION[$_GET['transaction_id']]["L_SHIPPINGAMT".$i]); + $unitprice_ht = ($amount_ht / $qty); + } + else + { + $amount_ht = ($_SESSION[$_GET['transaction_id']]["AMT"] - $_SESSION[$_GET['transaction_id']]["SHIPAMOUNT"] - $_SESSION[$_GET['transaction_id']]["L_TAXAMT".$i]); + $unitprice_ht = ($amount_ht / $qty); + } + $return_arr['contents'].= ''; $return_arr['contents'].= ''; $return_arr['contents'].= ''; - $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; + $return_arr['contents'].= ''; $return_arr['contents'].= ''; + $total_ht+=$amount_ht; + $i++; } + $var=!$var; + $return_arr['contents'].= ''; + + $var=!$var; + $return_arr['contents'].= ''; + + $shipamount=($_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']?$_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']:$_SESSION[$_GET['transaction_id']]['SHIPAMOUNT']); + $var=!$var; + $return_arr['contents'].= ''; + + $var=!$var; + $return_arr['contents'].= ''; + $return_arr['contents'].= '
'.$langs->trans('Ref').''.$langs->trans('Label').''.$langs->trans('Qty').''.$langs->trans('UnitPriceHT').''.$langs->trans('Qty').''.$langs->trans('AmountHT').'
'.$_SESSION[$_GET['transaction_id']]["L_NUMBER".$i].''.$_SESSION[$_GET['transaction_id']]["L_NAME".$i].''.$_SESSION[$_GET['transaction_id']]["L_QTY".$i].''.price($unitprice_ht).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].''.$_SESSION[$_GET['transaction_id']]["L_QTY".$i].''.price($amount_ht).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].'
'.$langs->trans('TotalHT').''.price($total_ht).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].'
'.$langs->trans('TotalVAT').''.price($_SESSION[$_GET['transaction_id']]['TAXAMT']).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].'
'.$langs->trans('SHIPAMOUNT').''.price($shipamount).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].'
'.$langs->trans('TotalTTC').''.price($_SESSION[$_GET['transaction_id']]['AMT']).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].'
'; if (! empty($objects)) @@ -394,7 +423,6 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti $return_arr['contents'].= ''; } - /* $return_arr['contents'].= '
'; foreach ($_SESSION[$_GET['transaction_id']] as $key => $value)