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

[-] PDF : Bug Fixed #PSCFV-2724 - Incorrect SQL query for ecotax breakdown

Browse Source
This commit is contained in:
fBrignoli
2012-06-07 13:27:33 +00:00
parent 8af95a7ee0
commit 901e9516e6
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderInvoice.php
+4 -2
View File
@@ -349,11 +349,13 @@ class OrderInvoiceCore extends ObjectModel
public function getEcoTaxTaxesBreakdown() public function getEcoTaxTaxesBreakdown()
{ {
return Db::getInstance()->executeS(' return Db::getInstance()->executeS('
SELECT `ecotax_tax_rate`, SUM(`ecotax`) as `ecotax_tax_excl`, SUM(`ecotax`) as `ecotax_tax_incl` SELECT `ecotax_tax_rate` as `rate`, SUM(`ecotax`) as `ecotax_tax_excl`, SUM(`ecotax`) as `ecotax_tax_incl`
FROM `'._DB_PREFIX_.'order_detail` FROM `'._DB_PREFIX_.'order_detail`
WHERE `id_order` = '.(int)$this->id_order.' WHERE `id_order` = '.(int)$this->id_order.'
AND `id_order_invoice` = '.(int)$this->id AND `id_order_invoice` = '.(int)$this->id.'
GROUP BY `ecotax_tax_rate`'
); );
} }
/** /**
pdf/invoice.tax-tab.tpl
+9
View File
@@ -62,6 +62,15 @@
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td> <td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
</tr> </tr>
{/foreach} {/foreach}
{foreach $ecotax_tax_breakdown as $ecotax_tax_infos}
<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
<td style="width: 30%">{l s='Ecotax' pdf='true'}</td>
<td style="width: 20%; text-align: right;">{$ecotax_tax_infos.rate} %</td>
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td>
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td>
</tr>
{/foreach}
</table> </table>
{/if} {/if}
</td> </td>