diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index ca8617150..4a3f81bce 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -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')); } /** diff --git a/app/Http/Controllers/Companies/Companies.php b/app/Http/Controllers/Companies/Companies.php index 7db9ef2b9..911d352da 100644 --- a/app/Http/Controllers/Companies/Companies.php +++ b/app/Http/Controllers/Companies/Companies.php @@ -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(); diff --git a/app/Http/Controllers/Customers/Payments.php b/app/Http/Controllers/Customers/Payments.php index 6feabec74..c1b9c571b 100644 --- a/app/Http/Controllers/Customers/Payments.php +++ b/app/Http/Controllers/Customers/Payments.php @@ -11,7 +11,6 @@ use App\Utilities\Modules; use Auth; - class Payments extends Controller { diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index c0497c6cf..ccbcf2969 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -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')); } /** diff --git a/app/Http/Controllers/Settings/Settings.php b/app/Http/Controllers/Settings/Settings.php index 1d40a030b..c2a142dfb 100644 --- a/app/Http/Controllers/Settings/Settings.php +++ b/app/Http/Controllers/Settings/Settings.php @@ -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' diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php index 635d314be..fb20a1a3b 100644 --- a/database/seeds/Settings.php +++ b/database/seeds/Settings.php @@ -33,7 +33,7 @@ class Settings extends Seeder 'general.invoice_prefix' => 'INV-', 'general.invoice_digit' => '5', 'general.invoice_start' => '1', - 'general.default_payment_method' => 'cash', + 'general.default_payment_method' => 'offlinepayment.cash.1', 'general.email_protocol' => 'mail', 'general.email_sendmail_path' => '/usr/sbin/sendmail -bs', 'general.send_invoice_reminder' => '0', diff --git a/database/seeds/TestCompany.php b/database/seeds/TestCompany.php index 03792f49f..6ca7bce79 100644 --- a/database/seeds/TestCompany.php +++ b/database/seeds/TestCompany.php @@ -48,7 +48,7 @@ class TestCompany extends Seeder Setting::set('general.company_address', 'New Street 1254'); Setting::set('general.default_currency', 'USD'); Setting::set('general.default_account', '1'); - Setting::set('general.default_payment_method', 'cash'); + Setting::set('general.default_payment_method', 'offlinepayment.cash.1'); Setting::save(); $this->command->info('Test company created.'); diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index 75983bab1..56ef47908 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -18,7 +18,7 @@ {{ Form::textareaGroup('description', trans('general.description')) }} - {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', ['cash' => 'Cash', 'bank' => 'Bank Transfer', 'paypal' => 'PayPal'], setting('general.default_payment_method')) }} + {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('general.default_payment_method')) }} {{ Form::textGroup('reference', trans('general.reference'), 'file-text-o', []) }} diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index 867bba4fc..1823f6c47 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -22,7 +22,7 @@ {{ Form::textareaGroup('description', trans('general.description')) }} - {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', ['cash' => 'Cash', 'bank' => 'Bank Transfer', 'paypal' => 'PayPal'], setting('general.default_payment_method')) }} + {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, null) }} {{ Form::textGroup('reference', trans('general.reference'), 'file-text-o', []) }} diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index 84e0f2d85..039e60942 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -30,7 +30,7 @@ {{ Form::selectGroup('vendor_id', trans_choice('general.vendors', 1), 'user', $vendors, null, []) }} - {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card',['cash' => trans('general.cash'), 'bank' => trans('general.bank'), 'paypal' => trans('general.paypal')], setting('general.default_payment_method')) }} + {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('general.default_payment_method')) }} {{ Form::textGroup('reference', trans('general.reference'), 'file-text-o',[]) }} diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index 4cda784b8..bfbdfe209 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -35,7 +35,7 @@ {{ Form::selectGroup('vendor_id', trans_choice('general.vendors', 1), 'user', $vendors, null, []) }} - {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card',['cash' => 'Cash', 'bank' => 'Bank Transfer', 'paypal' => 'PayPal'], setting('general.default_payment_method')) }} + {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, null) }} {{ Form::textGroup('reference', trans('general.reference'), 'file-text-o',[]) }} diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php index 4cfc83130..b12fe9cd7 100644 --- a/resources/views/settings/settings/edit.blade.php +++ b/resources/views/settings/settings/edit.blade.php @@ -66,7 +66,7 @@ {{ Form::selectGroup('default_tax', trans('settings.default.tax'), 'percent', $taxes, null, []) }} - {{ Form::selectGroup('default_payment_method', trans('settings.default.payment'), 'credit-card', ['cash' => 'Cash', 'bank' => 'Bank Transfer', 'paypal' => 'PayPal'], null, []) }} + {{ Form::selectGroup('default_payment_method', trans('settings.default.payment'), 'credit-card', $payment_methods, setting('general.default_payment_method'), []) }} {{ Form::selectGroup('default_locale', trans('settings.default.language'), 'flag', language()->allowed(), null, []) }}