Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Required fields refactor

Browse Source
This commit is contained in:
David Bomba 2022-03-08 23:09:20 +11:00
parent d6c15abd50
commit 6a34ee3064
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Livewire/RequiredClientInfo.php
View File

@ -64,6 +64,15 @@ class RequiredClientInfo extends Component
// 'contact_phone' => 'phone',
];
public $client_address_array = [
'address_line_1',
'address_line_2',
'city',
'state',
'postal_code',
'country_id',
];
public $show_form = false;
public $company;
@ -141,8 +150,7 @@ class RequiredClientInfo extends Component
$_field = $this->mappings[$field['name']];
if (Str::startsWith($field['name'], 'client_')) {
if (empty($this->contact->client->{$_field}) || is_null($this->contact->client->{$_field})) {
// if (empty($this->contact->client->{$_field}) || is_null($this->contact->client->{$_field}) || $this->contact->client->{$_field} == 840) {
if (empty($this->contact->client->{$_field}) || is_null($this->contact->client->{$_field}) || in_array($_field, $this->client_address_array)) {
$this->show_form = true;
} else {
$this->fields[$index]['filled'] = true;
@ -151,7 +159,6 @@ class RequiredClientInfo extends Component
if (Str::startsWith($field['name'], 'contact_')) {
if (empty($this->contact->{$_field}) || is_null($this->contact->{$_field})) {
// if ((empty($this->contact->{$_field}) || is_null($this->contact->{$_field})) || $this->contact->client->{$_field} == 840) {
$this->show_form = true;
} else {
$this->fields[$index]['filled'] = true;