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

close #45 Fixed: Not loading payment methods in general settings

Browse Source
This commit is contained in:
cuneytsenturk
2017-10-11 15:47:07 +03:00
parent 4f4a646146
commit be148e3799
12 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@ use App\Models\Income\Revenue;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Utilities\Modules;
class Transfers extends Controller
{
@ -79,7 +81,9 @@ class Transfers extends Controller
{
$accounts = Account::enabled()->pluck('name', 'id');
return view('banking.transfers.create', compact('accounts'));
$payment_methods = Modules::getPaymentMethods();
return view('banking.transfers.create', compact('accounts', 'payment_methods'));
}
/**
@ -167,7 +171,9 @@ class Transfers extends Controller
$accounts = Account::listArray();
return view('banking.transfers.edit', compact('transfer', 'accounts'));
$payment_methods = Modules::getPaymentMethods();
return view('banking.transfers.edit', compact('transfer', 'accounts', 'payment_methods'));
}
/**

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

@ -130,7 +130,7 @@ class Companies extends Controller
Setting::set('general.company_logo', $logo_path);
}
Setting::set('general.default_payment_method', 'cash');
Setting::set('general.default_payment_method', 'offlinepayment.cash.1');
Setting::set('general.default_currency', $request->get('default_currency'));
Setting::save();

1
app/Http/Controllers/Customers/Payments.php
View File

@ -11,7 +11,6 @@ use App\Utilities\Modules;
use Auth;
class Payments extends Controller
{

10
app/Http/Controllers/Expenses/Payments.php
View File

@ -11,6 +11,8 @@ use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Traits\Uploads;
use App\Utilities\Modules;
class Payments extends Controller
{
use Uploads;
@ -53,7 +55,9 @@ class Payments extends Controller
$categories = Category::enabled()->type('expense')->pluck('name', 'id');
return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'vendors', 'categories'));
$payment_methods = Modules::getPaymentMethods();
return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods'));
}
/**
@ -105,7 +109,9 @@ class Payments extends Controller
$categories = Category::enabled()->type('expense')->pluck('name', 'id');
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories'));
$payment_methods = Modules::getPaymentMethods();
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods'));
}
/**

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

@ -11,6 +11,8 @@ use App\Models\Setting\Setting;
use App\Traits\DateTime;
use App\Traits\Uploads;
use App\Utilities\Modules;
class Settings extends Controller
{
use DateTime, Uploads;
@ -36,6 +38,8 @@ class Settings extends Controller
$taxes = Tax::enabled()->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
$date_formats = [
'd M Y' => '31 Dec 2017',
'd F Y' => '31 December 2017',
@ -65,6 +69,7 @@ class Settings extends Controller
'accounts',
'currencies',
'taxes',
'payment_methods',
'date_formats',
'date_separators',
'email_protocols'