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

Merge branch 'master' into discount-per-item

Browse Source
This commit is contained in:
Burak Çakırel
2020-03-24 00:18:09 +03:00
parent 6903a44bce 59cc7b4fd1
commit aa4532e9d5
6 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Requests/Setting/Module.php
View File

@ -27,12 +27,16 @@ class Module extends FormRequest
$module = module($this->request->get('module_alias'));
if ($module->get('settings')) {
foreach ($module->get('settings') as $field) {
if (isset($field['attributes']['required'])) {
$rules[$field['name']] = $field['attributes']['required'];
}
if (!$fields = $module->get('settings')) {
return $rules;
}
foreach ($fields as $field) {
if (empty($field['rules'])) {
continue;
}
$rules[$field['name']] = $field['rules'];
}
return $rules;

4
app/Models/Banking/Transfer.php
View File

@ -32,7 +32,7 @@ class Transfer extends Model
public function expense_account()
{
return $this->belongsTo('App\Models\Banking\Account', 'expense_transaction.account_id', 'id');
return $this->belongsTo('App\Models\Banking\Account', 'expense_transaction.account_id', 'id')->withDefault(['name' => trans('general.na')]);
}
public function income_transaction()
@ -42,6 +42,6 @@ class Transfer extends Model
public function income_account()
{
return $this->belongsTo('App\Models\Banking\Account', 'income_transaction.account_id', 'id');
return $this->belongsTo('App\Models\Banking\Account', 'income_transaction.account_id', 'id')->withDefault(['name' => trans('general.na')]);
}
}