From 4694e3bfaff1a7008b7427dc7baf978b1fd950cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 7 Nov 2020 22:48:25 +0300 Subject: [PATCH] Change default category prefix sales to income, purchases to expense --- app/Listeners/Update/V21/Version210.php | 8 ++++---- database/seeds/Categories.php | 14 +++++++------- resources/lang/en-GB/settings.php | 4 ++-- resources/views/purchases/bills/create.blade.php | 2 +- .../views/purchases/payments/create.blade.php | 2 +- resources/views/sales/invoices/create.blade.php | 2 +- resources/views/sales/revenues/create.blade.php | 2 +- resources/views/settings/default/edit.blade.php | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/Listeners/Update/V21/Version210.php b/app/Listeners/Update/V21/Version210.php index cacf6257e..81fd01bf7 100644 --- a/app/Listeners/Update/V21/Version210.php +++ b/app/Listeners/Update/V21/Version210.php @@ -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(); } diff --git a/database/seeds/Categories.php b/database/seeds/Categories.php index 463f84f85..a46874f73 100644 --- a/database/seeds/Categories.php +++ b/database/seeds/Categories.php @@ -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); } } diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php index 3a6f8335a..3e47ce44d 100644 --- a/resources/lang/en-GB/settings.php +++ b/resources/lang/en-GB/settings.php @@ -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' => [ diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php index 19ebd4c6d..f730ba22c 100644 --- a/resources/views/purchases/bills/create.blade.php +++ b/resources/views/purchases/bills/create.blade.php @@ -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') }} diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php index 46844b047..493b857a2 100644 --- a/resources/views/purchases/payments/create.blade.php +++ b/resources/views/purchases/payments/create.blade.php @@ -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') }} diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php index 68de6d3ec..25931a413 100644 --- a/resources/views/sales/invoices/create.blade.php +++ b/resources/views/sales/invoices/create.blade.php @@ -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') }} diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php index dbbb3495d..36308d1b8 100644 --- a/resources/views/sales/revenues/create.blade.php +++ b/resources/views/sales/revenues/create.blade.php @@ -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') }} diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php index b5c8bbc46..9f22b9e29 100644 --- a/resources/views/settings/default/edit.blade.php +++ b/resources/views/settings/default/edit.blade.php @@ -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'), []) }}