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

added account to payment methods

Browse Source
This commit is contained in:
Denis Duliçi
2020-06-27 12:25:44 +03:00
parent 634c807bc2
commit efd1ea584e
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Abstracts/Http/PaymentController.php
View File

@ -34,7 +34,7 @@ abstract class PaymentController extends BaseController
$this->logger = $this->getLogger();
$this->user = user();
$this->module = module($this->alias);
return $next($request);
@ -160,6 +160,7 @@ abstract class PaymentController extends BaseController
public function dispatchPaidEvent($invoice, $request)
{
$request['company_id'] = $invoice->company_id;
$request['account_id'] = setting($this->alias . '.account_id', setting('default.account'));
$request['amount'] = $invoice->amount;
$request['payment_method'] = $this->alias;
$request['reference'] = $this->getReference($invoice);

7
app/Http/Controllers/Settings/Modules.php
View File

@ -3,6 +3,8 @@
namespace App\Http\Controllers\Settings;
use App\Abstracts\Http\Controller;
use App\Models\Banking\Account;
use App\Models\Setting\Category;
use App\Models\Setting\Setting;
use App\Utilities\Modules as Utility;
use App\Http\Requests\Setting\Module as Request;
@ -30,6 +32,9 @@ class Modules extends Controller
*/
public function edit($alias)
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$setting = Setting::prefix($alias)->get()->transform(function ($s) use ($alias) {
$s->key = str_replace($alias . '.', '', $s->key);
return $s;
@ -37,7 +42,7 @@ class Modules extends Controller
$module = module($alias);
return view('settings.modules.edit', compact('setting', 'module'));
return view('settings.modules.edit', compact('setting', 'module', 'accounts', 'categories'));
}
/**