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

close #2260 Fixed: Categories in New Payment window initially shown by id instead of name.

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-10-06 15:24:12 +03:00
parent 3738c64430
commit 11346d899f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Abstracts/View/Components/DocumentForm.php
View File

@@ -285,7 +285,7 @@ abstract class DocumentForm extends Base
/** Content Component End */ /** Content Component End */
/** Metadata Component Start */ /** Metadata Component Start */
$this->contacts = $this->getContacts($type, $contacts); $this->contacts = $this->getContacts($type, $document, $contacts);
$this->contact = $this->getContact($contact, $document); $this->contact = $this->getContact($contact, $document);
$this->contactType = $this->getContactType($type, $contactType); $this->contactType = $this->getContactType($type, $contactType);
@@ -442,7 +442,7 @@ abstract class DocumentForm extends Base
return 'general.recurring_and_more'; return 'general.recurring_and_more';
} }
protected function getContacts($type, $contacts) protected function getContacts($type, $document, $contacts)
{ {
if (!empty($contacts)) { if (!empty($contacts)) {
return $contacts; return $contacts;
@@ -456,6 +456,10 @@ abstract class DocumentForm extends Base
$contacts = Contact::enabled()->orderBy('name')->take(setting('default.select_limit'))->get(); $contacts = Contact::enabled()->orderBy('name')->take(setting('default.select_limit'))->get();
} }
if (!empty($document) && ($document->contact && !$contacts->has($document->contact_id))) {
$contacts->put($document->contact->id, $document->contact->name);
}
return $contacts; return $contacts;
} }

4
app/View/Components/Documents/Form/Advanced.php
View File

@@ -22,6 +22,10 @@ class Advanced extends Component
$categories = Category::enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id'); $categories = Category::enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
} }
if (!empty($this->document) && ($this->document->category && !$categories->has($this->document->category_id))) {
$categories->put($this->document->category->id, $this->document->category->name);
}
$recurring_class = 'col-sm-6 col-md-6 col-lg-6 col-xl-6'; $recurring_class = 'col-sm-6 col-md-6 col-lg-6 col-xl-6';
$more_class = 'col-sm-6 col-md-6 col-lg-6 col-xl-6'; $more_class = 'col-sm-6 col-md-6 col-lg-6 col-xl-6';
$more_form_class = 'col-md-12'; $more_form_class = 'col-md-12';

2
app/View/Components/Documents/Form/Company.php
View File

@@ -18,6 +18,6 @@ class Company extends Component
$inputNameType = config('type.' . $this->type . '.route.parameter'); $inputNameType = config('type.' . $this->type . '.route.parameter');
return view('components.documents.form.company', compact('company','inputNameType')); return view('components.documents.form.company', compact('company', 'inputNameType'));
} }
} }