From ed3252d27a0c8813e3b09c2385819e445084f889 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 25 Dec 2019 23:48:13 +0300 Subject: [PATCH] reports description --- app/Listeners/Update/V20/Version200.php | 10 ++++----- database/seeds/Accounts.php | 4 ++-- database/seeds/Categories.php | 14 ++++++------ database/seeds/Currencies.php | 8 +++---- database/seeds/Reports.php | 10 ++++----- resources/lang/en-GB/demo.php | 30 +++++++++++++++++++------ resources/lang/en-GB/reports.php | 1 - 7 files changed, 46 insertions(+), 31 deletions(-) diff --git a/app/Listeners/Update/V20/Version200.php b/app/Listeners/Update/V20/Version200.php index d4e73cbac..ef4f09acf 100644 --- a/app/Listeners/Update/V20/Version200.php +++ b/app/Listeners/Update/V20/Version200.php @@ -205,7 +205,7 @@ class Version200 extends Listener [ 'company_id' => $company->id, 'name' => trans('reports.summary.income'), - 'description' => 'This is the income summary by category.', + 'description' => trans('demo.reports.income'), 'class' => 'App\Reports\IncomeSummary', 'group' => 'category', 'period' => 'monthly', @@ -216,7 +216,7 @@ class Version200 extends Listener [ 'company_id' => $company->id, 'name' => trans('reports.summary.expense'), - 'description' => 'This is the expense summary by category.', + 'description' => trans('demo.reports.expense'), 'class' => 'App\Reports\ExpenseSummary', 'group' => 'category', 'period' => 'monthly', @@ -227,7 +227,7 @@ class Version200 extends Listener [ 'company_id' => $company->id, 'name' => trans('reports.summary.income_expense'), - 'description' => 'This is the income vs expense by category.', + 'description' => trans('demo.reports.income_expense'), 'class' => 'App\Reports\IncomeExpenseSummary', 'group' => 'category', 'period' => 'monthly', @@ -238,7 +238,7 @@ class Version200 extends Listener [ 'company_id' => $company->id, 'name' => trans('reports.summary.tax'), - 'description' => 'This is the tax summary by category.', + 'description' => trans('demo.reports.tax'), 'class' => 'App\Reports\TaxSummary', 'group' => 'category', 'period' => 'quarterly', @@ -249,7 +249,7 @@ class Version200 extends Listener [ 'company_id' => $company->id, 'name' => trans('reports.profit_loss'), - 'description' => 'This is the profit & loss by category.', + 'description' => trans('demo.reports.pl'), 'class' => 'App\Reports\ProfitLoss', 'group' => 'category', 'period' => 'quarterly', diff --git a/database/seeds/Accounts.php b/database/seeds/Accounts.php index a5a6f39d3..a08fbbac6 100644 --- a/database/seeds/Accounts.php +++ b/database/seeds/Accounts.php @@ -32,10 +32,10 @@ class Accounts extends Seeder $rows = [ [ 'company_id' => $company_id, - 'name' => trans('demo.accounts_cash'), + 'name' => trans('demo.accounts.cash'), 'number' => '1', 'currency_code' => 'USD', - 'bank_name' => trans('demo.accounts_cash'), + 'bank_name' => trans('demo.accounts.cash'), 'enabled' => '1', ], ]; diff --git a/database/seeds/Categories.php b/database/seeds/Categories.php index 88161ef4b..c74833575 100644 --- a/database/seeds/Categories.php +++ b/database/seeds/Categories.php @@ -32,35 +32,35 @@ class Categories extends Seeder 'name' => trans_choice('general.transfers', 1), 'type' => 'other', 'color' => '#3c3f72', - 'enabled' => '1' + 'enabled' => '1', ], [ 'company_id' => $company_id, - 'name' => trans('demo.categories_deposit'), + 'name' => trans('demo.categories.deposit'), 'type' => 'income', 'color' => '#efad32', - 'enabled' => '1' + 'enabled' => '1', ], [ 'company_id' => $company_id, - 'name' => trans('demo.categories_sales'), + 'name' => trans('demo.categories.sales'), 'type' => 'income', 'color' => '#6da252', - 'enabled' => '1' + 'enabled' => '1', ], [ 'company_id' => $company_id, 'name' => trans_choice('general.others', 1), 'type' => 'expense', 'color' => '#e5e5e5', - 'enabled' => '1' + 'enabled' => '1', ], [ 'company_id' => $company_id, 'name' => trans('general.general'), 'type' => 'item', 'color' => '#328aef', - 'enabled' => '1' + 'enabled' => '1', ], ]; diff --git a/database/seeds/Currencies.php b/database/seeds/Currencies.php index f9df40d27..4438cc3fa 100644 --- a/database/seeds/Currencies.php +++ b/database/seeds/Currencies.php @@ -29,7 +29,7 @@ class Currencies extends Seeder $rows = [ [ 'company_id' => $company_id, - 'name' => trans('demo.currencies_usd'), + 'name' => trans('demo.currencies.usd'), 'code' => 'USD', 'rate' => '1.00', 'enabled' => '1', @@ -41,7 +41,7 @@ class Currencies extends Seeder ], [ 'company_id' => $company_id, - 'name' => trans('demo.currencies_eur'), + 'name' => trans('demo.currencies.eur'), 'code' => 'EUR', 'rate' => '1.25', 'precision' => config('money.EUR.precision'), @@ -52,7 +52,7 @@ class Currencies extends Seeder ], [ 'company_id' => $company_id, - 'name' => trans('demo.currencies_gbp'), + 'name' => trans('demo.currencies.gbp'), 'code' => 'GBP', 'rate' => '1.60', 'precision' => config('money.GBP.precision'), @@ -63,7 +63,7 @@ class Currencies extends Seeder ], [ 'company_id' => $company_id, - 'name' => trans('demo.currencies_try'), + 'name' => trans('demo.currencies.try'), 'code' => 'TRY', 'rate' => '0.80', 'precision' => config('money.TRY.precision'), diff --git a/database/seeds/Reports.php b/database/seeds/Reports.php index 4ef3eb015..9402f6f1a 100644 --- a/database/seeds/Reports.php +++ b/database/seeds/Reports.php @@ -30,7 +30,7 @@ class Reports extends Seeder [ 'company_id' => $company_id, 'name' => trans('reports.summary.income'), - 'description' => 'This is the income summary by category.', + 'description' => trans('demo.reports.income'), 'class' => 'App\Reports\IncomeSummary', 'group' => 'category', 'period' => 'monthly', @@ -40,7 +40,7 @@ class Reports extends Seeder [ 'company_id' => $company_id, 'name' => trans('reports.summary.expense'), - 'description' => 'This is the expense summary by category.', + 'description' => trans('demo.reports.expense'), 'class' => 'App\Reports\ExpenseSummary', 'group' => 'category', 'period' => 'monthly', @@ -50,7 +50,7 @@ class Reports extends Seeder [ 'company_id' => $company_id, 'name' => trans('reports.summary.income_expense'), - 'description' => 'This is the income vs expense by category.', + 'description' => trans('demo.reports.income_expense'), 'class' => 'App\Reports\IncomeExpenseSummary', 'group' => 'category', 'period' => 'monthly', @@ -60,7 +60,7 @@ class Reports extends Seeder [ 'company_id' => $company_id, 'name' => trans('reports.summary.tax'), - 'description' => 'This is the tax summary by category.', + 'description' => trans('demo.reports.tax'), 'class' => 'App\Reports\TaxSummary', 'group' => 'category', 'period' => 'quarterly', @@ -70,7 +70,7 @@ class Reports extends Seeder [ 'company_id' => $company_id, 'name' => trans('reports.profit_loss'), - 'description' => 'This is the profit & loss by category.', + 'description' => trans('demo.reports.pl'), 'class' => 'App\Reports\ProfitLoss', 'group' => 'category', 'period' => 'quarterly', diff --git a/resources/lang/en-GB/demo.php b/resources/lang/en-GB/demo.php index a5ffa3172..8cffce07a 100644 --- a/resources/lang/en-GB/demo.php +++ b/resources/lang/en-GB/demo.php @@ -2,12 +2,28 @@ return [ - 'accounts_cash' => 'Cash', - 'categories_deposit' => 'Deposit', - 'categories_sales' => 'Sales', - 'currencies_usd' => 'US Dollar', - 'currencies_eur' => 'Euro', - 'currencies_gbp' => 'British Pound', - 'currencies_try' => 'Turkish Lira', + 'accounts' => [ + 'cash' => 'Cash', + ], + + 'categories' => [ + 'deposit' => 'Deposit', + 'sales' => 'Sales', + ], + + 'currencies' => [ + 'usd' => 'US Dollar', + 'eur' => 'Euro', + 'gbp' => 'British Pound', + 'try' => 'Turkish Lira', + ], + + 'reports' => [ + 'income' => 'Monthly income summary by category.', + 'expense' => 'Monthly expense summary by category.', + 'income_expense' => 'Monthly income vs expense summary by category.', + 'tax' => 'Quarterly tax summary by category.', + 'pl' => 'Quarterly profit & loss by category.', + ], ]; diff --git a/resources/lang/en-GB/reports.php b/resources/lang/en-GB/reports.php index 1c829c34b..035ba1d8e 100644 --- a/resources/lang/en-GB/reports.php +++ b/resources/lang/en-GB/reports.php @@ -12,7 +12,6 @@ return [ 'net_profit' => 'Net Profit', 'total_expenses' => 'Total Expenses', 'net' => 'NET', - 'income-expense' => 'Income & Expense', 'summary' => [ 'income' => 'Income Summary',