Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-05 18:52:44 +01:00
Code Issues Releases Activity

Refactor total table columns:

Browse Source 
- $task.cost => $task.rate
- $task.quantity => $task.hours
This commit is contained in:
Benjamin Beganović 2020-11-04 11:22:43 +01:00
parent 2d2bfe9d49
commit 14b11ecbbd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -624,8 +624,8 @@ class CompanySettings extends BaseSettings
'task_columns' =>[
'$task.product_key',
'$task.notes',
'$task.cost',
'$task.quantity',
'$task.rate',
'$task.hours',
'$task.discount',
'$task.tax',
'$task.line_total',

4
app/Utils/HtmlEngine.php
View File

@ -304,8 +304,8 @@ class HtmlEngine
$data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
$data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
$data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
$data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
$data['$task.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
$data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')];
$data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')];
$data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];

4
app/Utils/Traits/MakesTemplateData.php
View File

@ -193,8 +193,8 @@ trait MakesTemplateData
$data['$task.discount'] = ['value' => '5%', 'label' => ctrans('texts.discount')];
$data['$task.product_key'] = ['value' => 'key', 'label' => ctrans('texts.product_key')];
$data['$task.notes'] = ['value' => 'Note for Tasks', 'label' => ctrans('texts.notes')];
$data['$task.cost'] = ['value' => '$100.00', 'label' => ctrans('texts.cost')];
$data['$task.quantity'] = ['value' => '1', 'label' => ctrans('texts.quantity')];
$data['$task.rate'] = ['value' => '$100.00', 'label' => ctrans('texts.rate')];
$data['$task.hours'] = ['value' => '1', 'label' => ctrans('texts.hours')];
$data['$task.tax_name1'] = ['value' => 'GST', 'label' => ctrans('texts.tax')];
$data['$task.tax_name2'] = ['value' => 'VAT', 'label' => ctrans('texts.tax')];
$data['$task.tax_name3'] = ['value' => 'CA Sales Tax', 'label' => ctrans('texts.tax')];