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

Merge branch '2.1-dev' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-11-11 18:49:19 +03:00
parent 72231b10ce 6dbf2a8d5c
commit 8784dc14db
91 changed files with 1938 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/Permissions.php
View File

@ -20,7 +20,7 @@ class Permissions extends Controller
{
$permissions = Permission::collect();
return view('auth.permissions.index', compact('permissions'));
return $this->response('auth.permissions.index', compact('permissions'));
}
/**

2
app/Http/Controllers/Auth/Roles.php
View File

@ -21,7 +21,7 @@ class Roles extends Controller
{
$roles = Role::collect();
return view('auth.roles.index', compact('roles'));
return $this->response('auth.roles.index', compact('roles'));
}
/**

6
app/Http/Controllers/Auth/Users.php
View File

@ -37,7 +37,7 @@ class Users extends Controller
{
$users = User::with('media', 'roles')->collect();
return view('auth.users.index', compact('users'));
return $this->response('auth.users.index', compact('users'));
}
/**
@ -58,7 +58,7 @@ class Users extends Controller
return $r->hasPermission('read-client-portal');
});
$companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id');
$companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
return view('auth.users.create', compact('roles', 'companies', 'landing_pages'));
}
@ -123,7 +123,7 @@ class Users extends Controller
});
}
$companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id');
$companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
return view('auth.users.edit', compact('user', 'companies', 'roles', 'landing_pages'));
}

2
app/Http/Controllers/Banking/Accounts.php
View File

@ -21,7 +21,7 @@ class Accounts extends Controller
{
$accounts = Account::collect();
return view('banking.accounts.index', compact('accounts'));
return $this->response('banking.accounts.index', compact('accounts'));
}
/**

2
app/Http/Controllers/Banking/Reconciliations.php
View File

@ -26,7 +26,7 @@ class Reconciliations extends Controller
$accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'));
return view('banking.reconciliations.index', compact('reconciliations', 'accounts'));
return $this->response('banking.reconciliations.index', compact('reconciliations', 'accounts'));
}
/**

4
app/Http/Controllers/Banking/Transactions.php
View File

@ -22,7 +22,7 @@ class Transactions extends Controller
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$types = collect(['expense' => 'Expense', 'income' => 'Income'])
$types = collect(['expense' => trans_choice('general.expenses', 1), 'income' => trans_choice('general.incomes', 1)])
->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
$request_type = !request()->has('type') ? ['income', 'expense'] : request('type');
@ -30,7 +30,7 @@ class Transactions extends Controller
$transactions = Transaction::with('account', 'category', 'contact')->collect(['paid_at'=> 'desc']);
return view('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories'));
return $this->response('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories'));
}
/**

8
app/Http/Controllers/Banking/Transfers.php
View File

@ -52,10 +52,10 @@ class Transfers extends Controller
];
}
$special_key = array(
$special_key = [
'expense_transaction.name' => 'from_account',
'income_transaction.name' => 'to_account',
);
];
$request = request();
@ -77,12 +77,12 @@ class Transfers extends Controller
array_multisort($sort_order, $sort_type, $data);
}
$transfers = $this->paginate($data);
$transfers = $request->expectsJson() ? $data : $this->paginate($data);
$accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
return view('banking.transfers.index', compact('transfers', 'accounts'));
return $this->response('banking.transfers.index', compact('transfers', 'accounts'));
}
/**

4
app/Http/Controllers/Common/BulkActions.php
View File

@ -6,9 +6,7 @@ use App\Abstracts\Http\Controller;
use App\Http\Requests\Common\BulkAction as Request;
use Illuminate\Support\Str;
class
BulkActions extends Controller
class BulkActions extends Controller
{
/**

2
app/Http/Controllers/Common/Companies.php
View File

@ -26,7 +26,7 @@ class Companies extends Controller
{
$companies = Company::collect();
return view('common.companies.index', compact('companies'));
return $this->response('common.companies.index', compact('companies'));
}
/**

2
app/Http/Controllers/Common/Dashboards.php
View File

@ -40,7 +40,7 @@ class Dashboards extends Controller
{
$dashboards = user()->dashboards()->collect();
return view('common.dashboards.index', compact('dashboards'));
return $this->response('common.dashboards.index', compact('dashboards'));
}
/**

6
app/Http/Controllers/Common/Items.php
View File

@ -30,7 +30,7 @@ class Items extends Controller
{
$items = Item::with('category', 'media')->collect();
return view('common.items.index', compact('items'));
return $this->response('common.items.index', compact('items'));
}
/**
@ -50,7 +50,7 @@ class Items extends Controller
*/
public function create()
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
@ -129,7 +129,7 @@ class Items extends Controller
*/
public function edit(Item $item)
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');

2
app/Http/Controllers/Common/Reports.php
View File

@ -45,7 +45,7 @@ class Reports extends Controller
$categories[$class->getCategory()][] = $report;
}
return view('common.reports.index', compact('categories', 'totals', 'icons'));
return $this->response('common.reports.index', compact('categories', 'totals', 'icons'));
}
/**

2
app/Http/Controllers/Modals/Items.php
View File

@ -30,7 +30,7 @@ class Items extends Controller
*/
public function create(IRequest $request)
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');

2
app/Http/Controllers/Modules/Home.php
View File

@ -29,6 +29,6 @@ class Home extends Controller
$free = $this->getFreeModules($data);
$installed = Module::all()->pluck('enabled', 'alias')->toArray();
return view('modules.home.index', compact('pre_sale', 'paid', 'new', 'free', 'installed'));
return $this->response('modules.home.index', compact('pre_sale', 'paid', 'new', 'free', 'installed'));
}
}

2
app/Http/Controllers/Modules/My.php
View File

@ -21,6 +21,6 @@ class My extends Controller
$modules = $this->getInstalledModules();
$installed = Module::where('company_id', '=', session('company_id'))->pluck('enabled', 'alias')->toArray();
return view('modules.my.index', compact('purchased', 'modules', 'installed'));
return $this->response('modules.my.index', compact('purchased', 'modules', 'installed'));
}
}

2
app/Http/Controllers/Portal/Invoices.php
View File

@ -32,7 +32,7 @@ class Invoices extends Controller
$statuses = $this->getInvoiceStatuses();
return view('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
return $this->response('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
}
/**

2
app/Http/Controllers/Portal/Payments.php
View File

@ -20,7 +20,7 @@ class Payments extends Controller
$payment_methods = Modules::getPaymentMethods('all');
return view('portal.payments.index', compact('payments', 'payment_methods'));
return $this->response('portal.payments.index', compact('payments', 'payment_methods'));
}
/**

16
app/Http/Controllers/Purchases/Bills.php
View File

@ -39,13 +39,7 @@ class Bills extends Controller
{
$bills = Bill::with('contact', 'transactions')->collect(['billed_at'=> 'desc']);
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$statuses = $this->getBillStatuses();
return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
return $this->response('purchases.bills.index', compact('bills'));
}
/**
@ -96,7 +90,7 @@ class Bills extends Controller
*/
public function create()
{
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -106,7 +100,7 @@ class Bills extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$number = $this->getNextBillNumber();
@ -192,7 +186,7 @@ class Bills extends Controller
*/
public function edit(Bill $bill)
{
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -202,7 +196,7 @@ class Bills extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}

16
app/Http/Controllers/Purchases/Payments.php
View File

@ -32,13 +32,7 @@ class Payments extends Controller
{
$payments = Transaction::with('account', 'bill', 'category', 'contact')->expense()->isNotTransfer()->collect(['paid_at'=> 'desc']);
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
return $this->response('purchases.payments.index', compact('payments'));
}
/**
@ -66,9 +60,9 @@ class Payments extends Controller
$currency = Currency::where('code', $account_currency_code)->first();
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -154,9 +148,9 @@ class Payments extends Controller
$currency = Currency::where('code', $payment->currency_code)->first();
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();

2
app/Http/Controllers/Purchases/Vendors.php
View File

@ -30,7 +30,7 @@ class Vendors extends Controller
{
$vendors = Contact::with('bills.transactions')->vendor()->collect();
return view('purchases.vendors.index', compact('vendors'));
return $this->response('purchases.vendors.index', compact('vendors'));
}
/**

2
app/Http/Controllers/Sales/Customers.php
View File

@ -28,7 +28,7 @@ class Customers extends Controller
{
$customers = Contact::with('invoices.transactions')->customer()->collect();
return view('sales.customers.index', compact('customers'));
return $this->response('sales.customers.index', compact('customers'));
}
/**

16
app/Http/Controllers/Sales/Invoices.php
View File

@ -40,13 +40,7 @@ class Invoices extends Controller
{
$invoices = Invoice::with('contact', 'transactions')->collect(['invoice_number'=> 'desc']);
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$statuses = $this->getInvoiceStatuses();
return view('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
return $this->response('sales.invoices.index', compact('invoices'));
}
/**
@ -99,7 +93,7 @@ class Invoices extends Controller
*/
public function create()
{
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -109,7 +103,7 @@ class Invoices extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$number = $this->getNextInvoiceNumber();
@ -195,7 +189,7 @@ class Invoices extends Controller
*/
public function edit(Invoice $invoice)
{
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -205,7 +199,7 @@ class Invoices extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}

16
app/Http/Controllers/Sales/Revenues.php
View File

@ -32,13 +32,7 @@ class Revenues extends Controller
{
$revenues = Transaction::with('account', 'category', 'contact', 'invoice')->income()->isNotTransfer()->collect(['paid_at'=> 'desc']);
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
return $this->response('sales.revenues.index', compact('revenues'));
}
/**
@ -66,9 +60,9 @@ class Revenues extends Controller
$currency = Currency::where('code', $account_currency_code)->first();
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -154,9 +148,9 @@ class Revenues extends Controller
$currency = Currency::where('code', $revenue->currency_code)->first();
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();

2
app/Http/Controllers/Settings/Categories.php
View File

@ -30,7 +30,7 @@ class Categories extends Controller
'other' => trans_choice('general.others', 1),
]);
return view('settings.categories.index', compact('categories', 'types', 'transfer_id'));
return $this->response('settings.categories.index', compact('categories', 'types', 'transfer_id'));
}
/**

2
app/Http/Controllers/Settings/Currencies.php
View File

@ -21,7 +21,7 @@ class Currencies extends Controller
{
$currencies = Currency::collect();
return view('settings.currencies.index', compact('currencies'));
return $this->response('settings.currencies.index', compact('currencies'));
}
/**

6
app/Http/Controllers/Settings/Defaults.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers\Settings;
use App\Abstracts\Http\Controller;
use App\Models\Banking\Account;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
use App\Utilities\Modules;
@ -16,6 +17,9 @@ class Defaults extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$sales_categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$purchases_categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -23,6 +27,8 @@ class Defaults extends Controller
return view('settings.default.edit', compact(
'accounts',
'currencies',
'sales_categories',
'purchases_categories',
'taxes',
'payment_methods'
));

2
app/Http/Controllers/Settings/Settings.php
View File

@ -63,7 +63,7 @@ class Settings extends Controller
$settings[$alias] = $setting;
}
return view('settings.settings.index', ['modules' => $settings]);
return $this->response('settings.settings.index', ['modules' => $settings]);
}
/**

2
app/Http/Controllers/Settings/Taxes.php
View File

@ -29,7 +29,7 @@ class Taxes extends Controller
'compound' => trans('taxes.compound'),
];
return view('settings.taxes.index', compact('taxes', 'types'));
return $this->response('settings.taxes.index', compact('taxes', 'types'));
}
/**