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

[-] FO : invoice: do not display taxes table if there is not tax to display

Browse Source
This commit is contained in:
Damien Metzger
2013-04-23 16:46:11 +02:00
parent 913d0d9711
commit 6f96f0ac9a
2 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderInvoice.php
+7 -6
View File
@@ -384,21 +384,22 @@ class OrderInvoiceCore extends ObjectModel
*/ */
public function getEcoTaxTaxesBreakdown() public function getEcoTaxTaxesBreakdown()
{ {
$res = Db::getInstance()->executeS(' $result = Db::getInstance()->executeS('
SELECT `ecotax_tax_rate` as `rate`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_excl`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_incl` SELECT `ecotax_tax_rate` as `rate`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_excl`, SUM(`ecotax` * `product_quantity`) 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`' GROUP BY `ecotax_tax_rate`');
);
if ($res) $taxes = array();
foreach ($res as &$row) foreach ($result as $row)
if ($row['ecotax_tax_excl'] > 0)
{ {
$row['ecotax_tax_incl'] = Tools::ps_round($row['ecotax_tax_excl'] + ($row['ecotax_tax_excl'] * $row['rate'] / 100), 2); $row['ecotax_tax_incl'] = Tools::ps_round($row['ecotax_tax_excl'] + ($row['ecotax_tax_excl'] * $row['rate'] / 100), 2);
$row['ecotax_tax_excl'] = Tools::ps_round($row['ecotax_tax_excl'], 2); $row['ecotax_tax_excl'] = Tools::ps_round($row['ecotax_tax_excl'], 2);
$taxes[] = $row;
} }
return $res; return $taxes;
} }
/** /**
pdf/invoice.tax-tab.tpl
+46 -44
View File
@@ -22,6 +22,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if $tax_exempt || ((isset($product_tax_breakdown) && $product_tax_breakdown|@count > 0) || (isset($ecotax_tax_breakdown) && $ecotax_tax_breakdown|@count > 0))}
<!-- TAX DETAILS --> <!-- TAX DETAILS -->
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
@@ -41,56 +43,56 @@
</tr> </tr>
{if isset($product_tax_breakdown)} {if isset($product_tax_breakdown)}
{foreach $product_tax_breakdown as $rate => $product_tax_infos} {foreach $product_tax_breakdown as $rate => $product_tax_infos}
<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};"> <tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
<td style="width: 30%"> <td style="width: 30%">
{if !isset($pdf_product_tax_written)} {if !isset($pdf_product_tax_written)}
{l s='Products' pdf='true'} {l s='Products' pdf='true'}
{assign var=pdf_product_tax_written value=1} {assign var=pdf_product_tax_written value=1}
{/if}
</td>
<td style="width: 20%; text-align: right;">{$rate} %</td>
{if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">
{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
</td>
{/if}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}</td>
</tr>
{/foreach}
{/if} {/if}
</td>
<td style="width: 20%; text-align: right;">{$rate} %</td>
{if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">
{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
</td>
{/if}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}</td>
</tr>
{/foreach}
{/if}
{if isset($shipping_tax_breakdown)} {if isset($shipping_tax_breakdown)}
{foreach $shipping_tax_breakdown as $shipping_tax_infos} {foreach $shipping_tax_breakdown as $shipping_tax_infos}
<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};"> <tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
<td style="width: 30%"> <td style="width: 30%">
{if !isset($pdf_shipping_tax_written)} {if !isset($pdf_shipping_tax_written)}
{l s='Shipping' pdf='true'} {l s='Shipping' pdf='true'}
{assign var=pdf_shipping_tax_written value=1} {assign var=pdf_shipping_tax_written value=1}
{/if}
</td>
<td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td>
{if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}</td>
{/if} {/if}
</td> <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
<td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td> </tr>
{if !$use_one_after_another_method} {/foreach}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}</td>
{/if}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
</tr>
{/foreach}
{/if} {/if}
{if isset($ecotax_tax_breakdown)} {if isset($ecotax_tax_breakdown)}
{foreach $ecotax_tax_breakdown as $ecotax_tax_infos} {foreach $ecotax_tax_breakdown as $ecotax_tax_infos}
{if $ecotax_tax_infos.ecotax_tax_excl > 0} {if $ecotax_tax_infos.ecotax_tax_excl > 0}
<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};"> <tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
<td style="width: 30%">{l s='Ecotax' pdf='true'}</td> <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;">{$ecotax_tax_infos.rate } %</td>
{if !$use_one_after_another_method} {if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td> <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td>
{/if}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td>
</tr>
{/if} {/if}
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td> {/foreach}
</tr>
{/if}
{/foreach}
{/if} {/if}
</table> </table>
{/if} {/if}
@@ -98,4 +100,4 @@
</tr> </tr>
</table> </table>
<!-- / TAX DETAILS --> <!-- / TAX DETAILS -->
{/if}