dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-05-21 16:29:48 +02:00
parent 22ba79eb10 2542e97164
commit 2f660b70b2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+3
View File
@@ -267,6 +267,9 @@ class ToolsCore
// $_SERVER['SSL'] exists only in some specific configuration // $_SERVER['SSL'] exists only in some specific configuration
if (isset($_SERVER['SSL'])) if (isset($_SERVER['SSL']))
return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on'); return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on');
// $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration
if (isset($_SERVER['REDIRECT_HTTPS']))
return ($_SERVER['REDIRECT_HTTPS'] == 1 || strtolower($_SERVER['REDIRECT_HTTPS']) == 'on');
return false; return false;
} }
classes/pdf/HTMLTemplateOrderSlip.php
+2
View File
@@ -211,6 +211,8 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
if ($ecotax) if ($ecotax)
foreach ($tmp_tax_infos as $rate => &$row) foreach ($tmp_tax_infos as $rate => &$row)
{ {
if (!isset($ecotax[$rate]))
continue
$row['total_price_tax_excl'] -= $ecotax[$rate]['ecotax_tax_excl']; $row['total_price_tax_excl'] -= $ecotax[$rate]['ecotax_tax_excl'];
$row['total_amount'] -= ($ecotax[$rate]['ecotax_tax_incl'] - $ecotax[$rate]['ecotax_tax_excl']); $row['total_amount'] -= ($ecotax[$rate]['ecotax_tax_incl'] - $ecotax[$rate]['ecotax_tax_excl']);
} }