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

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'));
     }
 
     /**

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();

app/Http/Controllers/Customers/Payments.php

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

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'));
     }
 
     /**

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'

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',

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.');

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', []) }}
         </div>

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', []) }}
         </div>

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',[]) }}
 

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',[]) }}
 

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, []) }}
                     </div>