Merge pull request #9570 from beganovich/1405-client-portal

Update client information in the portal
This commit is contained in:
David Bomba 2024-06-01 08:50:13 +10:00 committed by GitHub
commit b0aa3ac695
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 15 deletions

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{ {
"name": "invoiceninja", "name": "@invoiceninja/invoiceninja",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

File diff suppressed because one or more lines are too long

View File

@ -240,7 +240,7 @@
"src": "resources/js/setup/setup.js" "src": "resources/js/setup/setup.js"
}, },
"resources/sass/app.scss": { "resources/sass/app.scss": {
"file": "assets/app-d1d7e29f.css", "file": "assets/app-c7c5fad4.css",
"isEntry": true, "isEntry": true,
"src": "resources/sass/app.scss" "src": "resources/sass/app.scss"
} }

View File

@ -5,10 +5,10 @@
<div class="flex flex-col xl:flex-row gap-4"> <div class="flex flex-col xl:flex-row gap-4">
<div class="w-full rounded-md border border-[#E5E7EB] bg-white p-5 text-sm text-[#6C727F]"> <div class="w-full rounded-md border border-[#E5E7EB] bg-white p-5 text-sm text-[#6C727F]">
<h3 class="mb-4 text-xl font-semibold text-[#212529]">{{ $contact->first_name }} {{ $contact->last_name }}</h3> <h3 class="mb-4 text-xl font-semibold text-[#212529]">{{ $contact->first_name }} {{ $contact->last_name }}</h3>
<p class="mb-1.5">{{ $contact->phone }}</p> <p>{{ $contact->phone }}</p>
<p class="mb-4">{{ $client->address1 }}</p> <p>{{ $client->address1 }}</p>
<p class="mb-1.5">{{ $client->city }}, {{ $client->state }}</p> <p>{{ $client->city }}, {{ $client->state }}</p>
<p class="mb-1.5">{{ $client->postal_code }}</p> <p>{{ $client->postal_code }}</p>
<p>{{ App\Models\Country::find($client->country_id)?->name }}</p> <p>{{ App\Models\Country::find($client->country_id)?->name }}</p>
</div> </div>
@ -81,16 +81,24 @@
</div> </div>
</div> </div>
<div class="text-light-grey-text flex grow basis-full flex-col justify-center pt-5 text-sm md:basis-1/2 md:border-r md:border-[#E5E7EB] md:pt-0 xl:basis-auto xl:px-5"> <div class="text-light-grey-text flex grow basis-full flex-col justify-center pt-5 text-sm md:basis-1/2 md:border-r md:border-[#E5E7EB] md:pt-0 xl:basis-auto xl:px-5 space-y-2">
<p class="mb-2">{{ $client->company->settings->address1 }}</p> <p>{{ $client->company->settings->address1 }}</p>
<p class="mb-2">{{ $client->company->settings->address2 }}</p> <p>{{ $client->company->settings->city }} {{ $client->company->settings->state }}</p>
<p class="mb-2">{{ $client->company->settings->postal_code }}</p> <p>{{ $client->company->settings->postal_code }}</p>
<p>{{ App\Models\Country::find($client->company->settings->country_id)?->name }}</p> <p>{{ App\Models\Country::find($client->company->settings->country_id)?->name }}</p>
</div> </div>
<div class="text-light-grey-text flex grow basis-full flex-col justify-center text-sm md:basis-1/2 md:pl-4 xl:basis-auto xl:px-5">
<p class="mb-2">{{ $client->company->settings->email }}</p> <div class="text-light-grey-text flex grow basis-full flex-col justify-center text-sm md:basis-1/2 md:pl-4 xl:basis-auto xl:px-5 space-y-2 mt-3 xl:mt-0">
<p class="mb-2">{{ $client->company->settings->phone }}</p> <p><span class="font-semibold">{{ ctrans('texts.vat') }}</span>: {{ $client->company->settings->vat_number }}</p>
<p>{{ $client->company->settings->website }}</p> <p>
<a class="underline" href="mailto:{{ $client->company->settings->email }}" target="_blank">{{ $client->company->settings->email }}</a>
</p>
<p>{{ $client->company->settings->phone }}</p>
<p>
<a class="underline" href="{{ $client->company->settings->website }}" target="_blank">
{{ $client->company->settings->website }}
</a>
</p>
</div> </div>
</div> </div>
@stop @stop