diff --git a/language/en-GB/en-GB.plg_vmextended_eurecap.ini b/language/en-GB/en-GB.plg_vmextended_eurecap.ini index fe7eac0e650e11fba8dd157838219e74c8ad3c02..8cd9dc6a89aa91686a8346519c8aa9030105c606 100644 --- a/language/en-GB/en-GB.plg_vmextended_eurecap.ini +++ b/language/en-GB/en-GB.plg_vmextended_eurecap.ini @@ -71,4 +71,7 @@ VMEXT_EU_RECAP_ORDERS="Orders" VMEXT_EU_RECAP_ORDERTOTALS="Total revenue" VMEXT_EU_RECAP_ORDERTAXES="Taxes" -VMEXT_EU_RECAP_CANCELLED="EU Sales Report settings cancelled." \ No newline at end of file +VMEXT_EU_RECAP_CANCELLED="EU Sales Report settings cancelled." + +VMEXT_EU_RECAP_SUMMARY="Total" +VMEXT_EU_RECAP_ORDERCOUNT="%d Order(s)" \ No newline at end of file diff --git a/language/en-GB/en-GB.plg_vmextended_eurecap.sys.ini b/language/en-GB/en-GB.plg_vmextended_eurecap.sys.ini index fe7eac0e650e11fba8dd157838219e74c8ad3c02..8cd9dc6a89aa91686a8346519c8aa9030105c606 100644 --- a/language/en-GB/en-GB.plg_vmextended_eurecap.sys.ini +++ b/language/en-GB/en-GB.plg_vmextended_eurecap.sys.ini @@ -71,4 +71,7 @@ VMEXT_EU_RECAP_ORDERS="Orders" VMEXT_EU_RECAP_ORDERTOTALS="Total revenue" VMEXT_EU_RECAP_ORDERTAXES="Taxes" -VMEXT_EU_RECAP_CANCELLED="EU Sales Report settings cancelled." \ No newline at end of file +VMEXT_EU_RECAP_CANCELLED="EU Sales Report settings cancelled." + +VMEXT_EU_RECAP_SUMMARY="Total" +VMEXT_EU_RECAP_ORDERCOUNT="%d Order(s)" \ No newline at end of file diff --git a/views/eurecap/tmpl/default.php b/views/eurecap/tmpl/default.php index a9072b283f9e396cf237c0304bc63c020bbbfab6..de6c8e02921d6be003463e7927cb1af8eea896c3 100644 --- a/views/eurecap/tmpl/default.php +++ b/views/eurecap/tmpl/default.php @@ -22,6 +22,9 @@ if (!class_exists('CurrencyDisplay')) require(VMPATH_ADMIN . DS . 'helpers' . DS . 'currencydisplay.php'); $myCurrencyDisplay = CurrencyDisplay::getInstance(); +$totalOrders = 0; +$totalRevenue = 0; +$totalTax = 0; ?> @@ -134,6 +137,7 @@ $myCurrencyDisplay = CurrencyDisplay::getInstance(); $orders = array_combine($oids, $onrs); $links = array(); foreach ($orders as $oid=>$onr) { + $totalOrders += 1; $orderlink = JROUTE::_ ('index.php?option=com_virtuemart&view=orders&task=edit&virtuemart_order_id=' . $oid, FALSE); $links[] = JHtml::_ ('link', JRoute::_ ($orderlink, FALSE), $onr, array('title' => $onr)); } @@ -141,11 +145,15 @@ $myCurrencyDisplay = CurrencyDisplay::getInstance(); ?> </td> <td align="right"> - <?php echo $myCurrencyDisplay->priceDisplay($r['sum_order_total']); ?> + <?php + $totalRevenue += $r['sum_order_total']; + echo $myCurrencyDisplay->priceDisplay($r['sum_order_total']); ?> </td> <?php if ($this->include_taxed_orders) { ?> <td align="right"> - <?php echo $myCurrencyDisplay->priceDisplay($r['sum_order_tax']); ?> + <?php + $totalTax += $r['sum_order_tax']; + echo $myCurrencyDisplay->priceDisplay($r['sum_order_tax']); ?> </td> <?php } ?> </tr> @@ -155,6 +163,22 @@ $myCurrencyDisplay = CurrencyDisplay::getInstance(); ?> </tbody> <tfoot> + <tr style="border-top: 2px solid;"> + <th align="center"></th> + <th align="center" ></th> + <th align="left"><?php echo vmText::_('VMEXT_EU_RECAP_SUMMARY'); ?></th> + <th align="left"></th> + <th align="left"><?php echo vmText::sprintf('VMEXT_EU_RECAP_ORDERCOUNT', $totalOrders); ?></th> + <th align="right"> + <?php echo $myCurrencyDisplay->priceDisplay($totalRevenue); ?> + </th> +<?php if ($this->include_taxed_orders) { ?> + <th align="right"> + <?php echo $myCurrencyDisplay->priceDisplay($totalTax); ?> + </th> +<?php } ?> + </tr> + <tr> <td colspan="10"> <?php if ($this->pagination) echo $this->pagination->getListFooter(); ?>