Adjusted invoice_view.php for subgroups.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 696890b6f6264fbf815f8d31d1d6bdbd6ae36628..ca4c7a04ab8f5c0d8ccadd600f3d90a19ab315dd 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4606 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4607 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index 9faa3bb21fccf17a39ee8bbe2e92f9f90da699c9..6441b44dbf58e79847746095a5d70befb8a902c4 100644 (file)
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -20,10 +20,10 @@
         <tr>
           <td class="tableHeader">{$i18n.label.date}</td>
           <td class="tableHeader">{$i18n.form.invoice.person}</td>
         <tr>
           <td class="tableHeader">{$i18n.label.date}</td>
           <td class="tableHeader">{$i18n.form.invoice.person}</td>

-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}

           <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
           <td class="tableHeader">{$i18n.label.project}</td>
   {/if}

-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_task}

           <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
           <td class="tableHeader">{$i18n.label.note}</td>
           <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
           <td class="tableHeader">{$i18n.label.note}</td>


@@ -37,10 +37,10 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td valign="top">{$invoice_item.date}</td>
           <td valign="top">{$invoice_item.user_name|escape}</td>
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td valign="top">{$invoice_item.date}</td>
           <td valign="top">{$invoice_item.user_name|escape}</td>

-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}

           <td valign="top">{$invoice_item.project_name|escape}</td>
     {/if}
           <td valign="top">{$invoice_item.project_name|escape}</td>
     {/if}

-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_task}

           <td valign="top">{$invoice_item.task_name|escape}</td>
     {/if}
           <td valign="top">{$invoice_item.note|escape}</td>
           <td valign="top">{$invoice_item.task_name|escape}</td>
     {/if}
           <td valign="top">{$invoice_item.note|escape}</td>

diff --git a/invoice_view.php b/invoice_view.php
index 8168c3ad89544d6ed51255cc5e23b5b036b2a06f..772500ef51191f0bbad9377dc6fc0c86946cf951 100644 (file)
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -71,20 +71,24 @@ if ($tax_percent > 0) {
 }
 $total = $subtotal + $tax; 
 
 }
 $total = $subtotal + $tax; 
 

-$smarty->assign('subtotal', $user->currency.' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($subtotal, 2))));
-if ($tax) $smarty->assign('tax', $user->currency.' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($tax, 2))));
-$smarty->assign('total', $user->currency.' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($total, 2))));
+$currency = $user->getCurrency();
+$decimalMark = $user->getDecimalMark();

 
 

-if ('.' != $user->decimal_mark) {
+$smarty->assign('subtotal', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($subtotal, 2))));
+if ($tax) $smarty->assign('tax', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($tax, 2))));
+$smarty->assign('total', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($total, 2))));
+
+if ('.' != $decimalMark) {

   foreach ($invoice_items as &$item)
   foreach ($invoice_items as &$item)

-    $item['cost'] = str_replace('.', $user->decimal_mark, $item['cost']);
+    $item['cost'] = str_replace('.', $decimalMark, $item['cost']);

 }
 
 // Calculate colspan for invoice summary.
 $colspan = 4;
 }
 
 // Calculate colspan for invoice summary.
 $colspan = 4;

-if (MODE_PROJECTS == $user->tracking_mode)
+$trackingMode = $user->getTrackingMode();
+if (MODE_PROJECTS == $trackingMode)

   $colspan++;
   $colspan++;

-elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+elseif (MODE_PROJECTS_AND_TASKS == $trackingMode)

   $colspan += 2;
 
 $form = new Form('invoiceForm');
   $colspan += 2;
 
 $form = new Form('invoiceForm');


@@ -117,9 +121,11 @@ if ($request->isPost()) {
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('invoice_id', $cl_invoice_id);
 $smarty->assign('invoice_name', $invoice['name']);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('invoice_id', $cl_invoice_id);
 $smarty->assign('invoice_name', $invoice['name']);

-$smarty->assign('invoice_date', $invoice_date->toString($user->date_format));
+$smarty->assign('invoice_date', $invoice_date->toString($user->getDateFormat()));

 $smarty->assign('client_name', $client['name']);
 $smarty->assign('client_address', $client['address']);
 $smarty->assign('client_name', $client['name']);
 $smarty->assign('client_address', $client['address']);

+$smarty->assign('show_project', MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode);
+$smarty->assign('show_task', MODE_PROJECTS_AND_TASKS == $trackingMode);

 $smarty->assign('invoice_items', $invoice_items);
 $smarty->assign('colspan', $colspan);
 $smarty->assign('title', $i18n->get('title.view_invoice'));
 $smarty->assign('invoice_items', $invoice_items);
 $smarty->assign('colspan', $colspan);
 $smarty->assign('title', $i18n->get('title.view_invoice'));