From 567fcd8e306f8cf47a6139bf0aa27a04609b7a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 14 May 2021 10:18:26 +0200 Subject: [PATCH 1/2] Update client settings to match the one's at the admin panel --- .../Profile/Settings/NameWebsiteLogo.php | 4 +++ resources/lang/en/texts.php | 1 + .../portal/ninja2020/profile/index.blade.php | 10 +++--- .../profile/settings/general.blade.php | 2 +- .../settings/name-website-logo.blade.php | 33 ++++++++++++------- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php b/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php index 5f708e5dba00..dfb5a1e71e94 100644 --- a/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php +++ b/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php @@ -9,6 +9,7 @@ class NameWebsiteLogo extends Component public $profile; public $name; + public $vat_number; public $website; public $phone; @@ -16,6 +17,7 @@ class NameWebsiteLogo extends Component public $rules = [ 'name' => ['sometimes', 'min:3'], + 'vat_number' => ['sometimes'], 'website' => ['sometimes'], 'phone' => ['sometimes', 'string', 'max:255'], ]; @@ -25,6 +27,7 @@ class NameWebsiteLogo extends Component $this->fill([ 'profile' => auth()->user('contact')->client, 'name' => auth()->user('contact')->client->present()->name, + 'vat_number' => auth()->user('contact')->client->present()->vat_number, 'website' => auth()->user('contact')->client->present()->website, 'phone' => auth()->user('contact')->client->present()->phone, 'saved' => ctrans('texts.save'), @@ -41,6 +44,7 @@ class NameWebsiteLogo extends Component $data = $this->validate($this->rules); $this->profile->name = $data['name']; + $this->profile->vat_number = $data['vat_number']; $this->profile->website = $data['website']; $this->profile->phone = $data['phone']; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 7f1174d56bf1..37583dfd8d45 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4249,6 +4249,7 @@ $LANG = array( 'new_login_detected' => 'New login detected for your account.', 'new_login_description' => 'You recently logged in to your Invoice Ninja account from a new location or device:

IP: :ip
Time: :time
Email: :email', 'download_backup_subject' => 'Your company backup is ready for download', + 'contact_details' => 'Contact Details', ); return $LANG; diff --git a/resources/views/portal/ninja2020/profile/index.blade.php b/resources/views/portal/ninja2020/profile/index.blade.php index f3fa6d9219a3..d44b9aeff603 100644 --- a/resources/views/portal/ninja2020/profile/index.blade.php +++ b/resources/views/portal/ninja2020/profile/index.blade.php @@ -14,19 +14,19 @@ @endif - - @livewire('profile.settings.general') - - + @livewire('profile.settings.name-website-logo') + + @livewire('profile.settings.general') + @livewire('profile.settings.personal-address', ['countries' => $countries]) diff --git a/resources/views/portal/ninja2020/profile/settings/general.blade.php b/resources/views/portal/ninja2020/profile/settings/general.blade.php index 65e8eaa0c3b9..c891f046160e 100644 --- a/resources/views/portal/ninja2020/profile/settings/general.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/general.blade.php @@ -2,7 +2,7 @@
-

{{ ctrans('texts.profile') }}

+

{{ ctrans('texts.contact_details') }}

diff --git a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php index 94b7c5c8c1f3..fb19889e381a 100644 --- a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php @@ -2,7 +2,7 @@
-

{{ ctrans('texts.name_website_logo') }}

+

{{ ctrans('texts.client_details') }}

@@ -14,35 +14,46 @@
- + @error('name') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
+ +
+ + + @error('vat_number') +
+ {{ $message }} +
+ @enderror +
+
- + @error('phone')
{{ $message }}
@enderror
+
E.g. https://invoiceninja.com
- + @error('website') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
-
From 8ccc5a225316a46adce67d44cd6b0b1baf1fd0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 14 May 2021 10:24:40 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41c457b97688..c7e09c0677d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased (daily channel)](https://github.com/invoiceninja/invoiceninja/tree/v5-develop) - Add Cache-control: no-cache to prevent overaggressive caching of assets +- Improved labelling in the settings (client portal) ## [v5.1.56-release](https://github.com/invoiceninja/invoiceninja/releases/tag/v5.1.56-release) ## Fixed: