shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added withholding option in report

Browse Source
This commit is contained in:
Denis Duliçi 2020-08-07 17:10:24 +03:00
parent 30639e29b6
commit a67c03ef17
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Reports/TaxSummary.php
View File

@ -32,7 +32,9 @@ class TaxSummary extends Report
public function setTables() public function setTables()
{ {
$taxes = Tax::enabled()->notWithholding()->notRate(0)->orderBy('name')->pluck('name')->toArray(); $withholding = ($this->getSetting('withholding') == 'yes') ? 'withholding' : 'notWithholding';
$taxes = Tax::enabled()->$withholding()->notRate(0)->orderBy('name')->pluck('name')->toArray();
$this->tables = array_combine($taxes, $taxes); $this->tables = array_combine($taxes, $taxes);
} }
@ -122,6 +124,25 @@ class TaxSummary extends Report
return [ return [
$this->getPeriodField(), $this->getPeriodField(),
$this->getBasisField(), $this->getBasisField(),
$this->getWithholdingField(),
];
}
public function getWithholdingField()
{
return [
'type' => 'selectGroup',
'name' => 'withholding',
'title' => trans('taxes.withholding'),
'icon' => 'hand-holding-usd',
'values' => [
'yes' => trans('general.yes'),
'no' => trans('general.no'),
],
'selected' => 'no',
'attributes' => [
'required' => 'required',
],
]; ];
} }
} }

6
resources/views/common/reports/edit.blade.php
View File

@ -42,16 +42,16 @@
'data-field' => 'settings', 'data-field' => 'settings',
], ],
$field['attributes']), $field['attributes']),
isset($class->model->settings->{$field['name']}) ? $class->model->settings->{$field['name']}: null isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']}: null
) }} ) }}
@elseif ($type == 'selectGroup') @elseif ($type == 'selectGroup')
{{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $report->settings->{$field['name']}, array_merge([ {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : $field['selected'], array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], ],
$field['attributes']) $field['attributes'])
) }} ) }}
@elseif ($type == 'radioGroup') @elseif ($type == 'radioGroup')
{{ Form::$type($field['name'], $field['title'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : 1, $field['enable'], $field['disable'], array_merge([ {{ Form::$type($field['name'], $field['title'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : true, $field['enable'], $field['disable'], array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], ],
$field['attributes']) $field['attributes'])