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

Change default category prefix sales to income, purchases to expense

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-11-07 22:48:25 +03:00
parent e638b7860c
commit 4694e3bfaf
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Listeners/Update/V21/Version210.php
View File

@ -52,16 +52,16 @@ class Version210 extends Listener
public function updateSettings($company)
{
$sales_category = Category::income()->enabled()->first();
$purchases_category = Category::expense()->enabled()->first();
$income_category = Category::income()->enabled()->first();
$expense_category = Category::expense()->enabled()->first();
// Set the active company settings
setting()->setExtraColumns(['company_id' => $company->id]);
setting()->forgetAll();
setting()->load(true);
setting()->set(['default.sales_category' => setting('default.sales_category', $sales_category->id)]);
setting()->set(['default.purchases_category' => setting('default.purchases_category', $purchases_category->id)]);
setting()->set(['default.income_category' => setting('default.income_category', $income_category->id)]);
setting()->set(['default.expense_category' => setting('default.expense_category', $expense_category->id)]);
setting()->save();
}

14
database/seeds/Categories.php
View File

@ -64,26 +64,26 @@ class Categories extends Seeder
],
];
$sales_category = $purchases_category = false;
$income_category = $expense_category = false;
foreach ($rows as $row) {
$category = Category::create($row);
switch ($category->type) {
case 'income':
if (empty($sales_category)) {
$sales_category = $category;
if (empty($income_category)) {
$income_category = $category;
}
break;
case 'expense':
if (empty($purchases_category)) {
$purchases_category = $category;
if (empty($expense_category)) {
$expense_category = $category;
}
break;
}
}
setting()->set('default.sales_category', $sales_category->id);
setting()->set('default.purchases_category', $purchases_category->id);
setting()->set('default.income_category', $income_category->id);
setting()->set('default.expense_category', $expense_category->id);
}
}

4
resources/lang/en-GB/settings.php
View File

@ -68,8 +68,8 @@ return [
'description' => 'Default account, currency, language of your company',
'list_limit' => 'Records Per Page',
'use_gravatar' => 'Use Gravatar',
'sales_category' => 'Sales Category',
'purchases_category'=> 'Purchases Category',
'income_category' => 'Income Category',
'expense_category' => 'Expense Category',
],
'email' => [

2
resources/views/purchases/bills/create.blade.php
View File

@ -194,7 +194,7 @@
{{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.purchases_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
{{ Form::recurring('create') }}

2
resources/views/purchases/payments/create.blade.php
View File

@ -30,7 +30,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.purchases_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
{{ Form::recurring('create') }}

2
resources/views/sales/invoices/create.blade.php
View File

@ -196,7 +196,7 @@
{{ Form::textareaGroup('footer', trans('general.footer'), '', setting('invoice.footer'), ['rows' => '3'], 'col-md-6') }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.sales_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
{{ Form::recurring('create') }}

2
resources/views/sales/revenues/create.blade.php
View File

@ -30,7 +30,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.sales_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
{{ Form::recurring('create') }}

4
resources/views/settings/default/edit.blade.php
View File

@ -22,9 +22,9 @@
{{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), []) }}
{{ Form::selectGroup('sales_category', trans('settings.default.sales_category'), 'folder', $sales_categories, setting('default.sales_category'), []) }}
{{ Form::selectGroup('income_category', trans('settings.default.income_category'), 'folder', $sales_categories, setting('default.income_category'), []) }}
{{ Form::selectGroup('purchases_category', trans('settings.default.purchases_category'), 'folder', $purchases_categories, setting('default.purchases_category'), []) }}
{{ Form::selectGroup('expense_category', trans('settings.default.expense_category'), 'folder', $purchases_categories, setting('default.expense_category'), []) }}
{{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, setting('default.tax'), []) }}