Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-13 09:54:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5856 from beganovich/v5-2905-registration-default-country

Browse Source 
(v5) Defaulting blank country on client registration
This commit is contained in:
Benjamin Beganović 2021-05-29 13:56:02 +02:00 committed by GitHub
commit 02036e8b9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 112 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View File

@ -1,6 +1,6 @@
{ {
"/js/app.js": "/js/app.js?id=696e8203d5e8e7cf5ff5", "/js/app.js": "/js/app.js?id=696e8203d5e8e7cf5ff5",
"/css/app.css": "/css/app.css?id=8bf94fe817c8702670c9", "/css/app.css": "/css/app.css?id=14a824656f32eec8c2b1",
"/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4", "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4",
"/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1", "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1",
"/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=0dc8c34010d09195d2f7", "/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=0dc8c34010d09195d2f7",
@ -19,7 +19,5 @@
"/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=5c35d28cf0a3286e7c45", "/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=5c35d28cf0a3286e7c45",
"/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=fc3055d6a099f523ea98", "/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=fc3055d6a099f523ea98",
"/js/setup/setup.js": "/js/setup/setup.js?id=8d454e7090f119552a6c", "/js/setup/setup.js": "/js/setup/setup.js?id=8d454e7090f119552a6c",
"/css/card-js.min.css": "/css/card-js.min.css?id=62afeb675235451543ad", "/css/card-js.min.css": "/css/card-js.min.css?id=62afeb675235451543ad"
"/js/admin.js": "/js/admin.js?id=003930085af69b13a86a",
"/css/admin.css": "/css/admin.css?id=0f5a9ba733ae0e1f9cbf"
} }

49
resources/views/portal/ninja2020/auth/includes/register/personal_address.blade.php
View File

@ -10,52 +10,53 @@
<div class="grid grid-cols-6 gap-6"> <div class="grid grid-cols-6 gap-6">
<div class="col-span-6 sm:col-span-4"> <div class="col-span-6 sm:col-span-4">
<label for="address1" class="input-label">{{ ctrans('texts.address1') }}</label> <label for="address1" class="input-label">{{ ctrans('texts.address1') }}</label>
<input id="address1" class="input w-full" name="address1" /> <input id="address1" class="input w-full" name="address1"/>
@error('address1') @error('address1')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
<div class="col-span-6 sm:col-span-3"> <div class="col-span-6 sm:col-span-3">
<label for="address2" class="input-label">{{ ctrans('texts.address2') }}</label> <label for="address2" class="input-label">{{ ctrans('texts.address2') }}</label>
<input id="address2" class="input w-full" name="address2" /> <input id="address2" class="input w-full" name="address2"/>
@error('address2') @error('address2')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
<div class="col-span-6 sm:col-span-3"> <div class="col-span-6 sm:col-span-3">
<label for="city" class="input-label">{{ ctrans('texts.city') }}</label> <label for="city" class="input-label">{{ ctrans('texts.city') }}</label>
<input id="city" class="input w-full" name="city" /> <input id="city" class="input w-full" name="city"/>
@error('city') @error('city')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
<div class="col-span-6 sm:col-span-2"> <div class="col-span-6 sm:col-span-2">
<label for="state" class="input-label">{{ ctrans('texts.state') }}</label> <label for="state" class="input-label">{{ ctrans('texts.state') }}</label>
<input id="state" class="input w-full" name="state" /> <input id="state" class="input w-full" name="state"/>
@error('state') @error('state')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
<div class="col-span-6 sm:col-span-2"> <div class="col-span-6 sm:col-span-2">
<label for="postal_code" class="input-label">{{ ctrans('texts.postal_code') }}</label> <label for="postal_code" class="input-label">{{ ctrans('texts.postal_code') }}</label>
<input id="postal_code" class="input w-full" name="postal_code" /> <input id="postal_code" class="input w-full" name="postal_code"/>
@error('postal_code') @error('postal_code')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
<div class="col-span-6 sm:col-span-2"> <div class="col-span-6 sm:col-span-2">
<label for="country" class="input-label">{{ ctrans('texts.country') }}</label> <label for="country" class="input-label">{{ ctrans('texts.country') }}</label>
<select id="country" class="input w-full form-select" name="country"> <select id="country" class="input w-full form-select" name="country">
<option value="none"></option>
@foreach(App\Utils\TranslationHelper::getCountries() as $country) @foreach(App\Utils\TranslationHelper::getCountries() as $country)
<option value="{{ $country->id }}"> <option value="{{ $country->id }}">
{{ $country->iso_3166_2 }} ({{ $country->name }}) {{ $country->iso_3166_2 }} ({{ $country->name }})
@ -63,11 +64,11 @@
@endforeach @endforeach
</select> </select>
@error('country') @error('country')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
</div> </div>
</div> </div>
</div> </div>

152
resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php
View File

@ -1,74 +1,88 @@
<!-- Client shipping address --> <!-- Client shipping address -->
<h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.shipping_address') }}</h3> <h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.shipping_address') }}</h3>
<p class="mt-1 text-sm leading-5 text-gray-500"> <p class="mt-1 text-sm leading-5 text-gray-500">
{{ ctrans('texts.enter_your_shipping_address') }} {{ ctrans('texts.enter_your_shipping_address') }}
</p> </p>
<div class="shadow overflow-hidden rounded mt-4"> <div class="shadow overflow-hidden rounded mt-4">
<div class="px-4 py-5 bg-white sm:p-6"> <div class="px-4 py-5 bg-white sm:p-6">
<div class="grid grid-cols-6 gap-6"> <div class="grid grid-cols-6 gap-6">
<div class="col-span-6 sm:col-span-4"> <div class="col-span-6 sm:col-span-4">
<label for="shipping_address1" class="input-label">{{ ctrans('texts.shipping_address1') }}</label> <label for="shipping_address1" class="input-label">{{ ctrans('texts.shipping_address1') }}</label>
<input id="shipping_address1" class="input w-full {{ in_array('shipping_address1', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" name="shipping_address1" /> <input id="shipping_address1"
@error('shipping_address1') class="input w-full {{ in_array('shipping_address1', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
<div class="validation validation-fail"> name="shipping_address1"/>
{{ $message }} @error('shipping_address1')
</div> <div class="validation validation-fail">
@enderror {{ $message }}
</div> </div>
<div class="col-span-6 sm:col-span-3"> @enderror
<label for="shipping_address2" class="input-label">{{ ctrans('texts.shipping_address2') }}</label> </div>
<input id="shipping_address2 {{ in_array('shipping_address2', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" class="input w-full" name="shipping_address2" /> <div class="col-span-6 sm:col-span-3">
@error('shipping_address2') <label for="shipping_address2" class="input-label">{{ ctrans('texts.shipping_address2') }}</label>
<div class="validation validation-fail"> <input
{{ $message }} id="shipping_address2 {{ in_array('shipping_address2', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
</div> class="input w-full" name="shipping_address2"/>
@enderror @error('shipping_address2')
</div> <div class="validation validation-fail">
<div class="col-span-6 sm:col-span-3"> {{ $message }}
<label for="shipping_city" class="input-label">{{ ctrans('texts.shipping_city') }}</label> </div>
<input id="shipping_city" class="input w-full {{ in_array('shipping_city', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" name="shipping_city" /> @enderror
@error('shipping_city') </div>
<div class="validation validation-fail"> <div class="col-span-6 sm:col-span-3">
{{ $message }} <label for="shipping_city" class="input-label">{{ ctrans('texts.shipping_city') }}</label>
</div> <input id="shipping_city"
@enderror class="input w-full {{ in_array('shipping_city', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
</div> name="shipping_city"/>
<div class="col-span-6 sm:col-span-2"> @error('shipping_city')
<label for="shipping_state" class="input-label">{{ ctrans('texts.shipping_state') }}</label> <div class="validation validation-fail">
<input id="shipping_state" class="input w-ful {{ in_array('shipping_state', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}l" name="shipping_state" /> {{ $message }}
@error('shipping_state') </div>
<div class="validation validation-fail"> @enderror
{{ $message }} </div>
</div> <div class="col-span-6 sm:col-span-2">
@enderror <label for="shipping_state" class="input-label">{{ ctrans('texts.shipping_state') }}</label>
</div> <input id="shipping_state"
<div class="col-span-6 sm:col-span-2"> class="input w-ful {{ in_array('shipping_state', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}l"
<label for="shipping_postal_code" class="input-label">{{ ctrans('texts.shipping_postal_code') }}</label> name="shipping_state"/>
<input id="shipping_postal_code" class="input w-full {{ in_array('shipping_postal_code', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" name="shipping_postal_code" /> @error('shipping_state')
@error('shipping_postal_code') <div class="validation validation-fail">
<div class="validation validation-fail"> {{ $message }}
{{ $message }} </div>
</div> @enderror
@enderror </div>
</div> <div class="col-span-6 sm:col-span-2">
<div class="col-span-4 sm:col-span-2"> <label for="shipping_postal_code" class="input-label">{{ ctrans('texts.shipping_postal_code') }}</label>
<label for="shipping_country" class="input-label">{{ ctrans('texts.shipping_country') }}</label> <input id="shipping_postal_code"
<select id="shipping_country" class="input w-full form-select {{ in_array('shipping_country', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" name="shipping_country"> class="input w-full {{ in_array('shipping_postal_code', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
@foreach(App\Utils\TranslationHelper::getCountries() as $country) name="shipping_postal_code"/>
<option {{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}"> @error('shipping_postal_code')
<div class="validation validation-fail">
{{ $message }}
</div>
@enderror
</div>
<div class="col-span-4 sm:col-span-2">
<label for="shipping_country" class="input-label">{{ ctrans('texts.shipping_country') }}</label>
<select id="shipping_country"
class="input w-full form-select {{ in_array('shipping_country', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
name="shipping_country">
@foreach(App\Utils\TranslationHelper::getCountries() as $country)
<option value="none"></option>
<option
{{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}">
{{ $country->iso_3166_2 }} {{ $country->iso_3166_2 }}
({{ $country->name }}) ({{ $country->name }})
</option> </option>
@endforeach @endforeach
</select> </select>
@error('country') @error('country')
<div class="validation validation-fail"> <div class="validation validation-fail">
{{ $message }} {{ $message }}
</div> </div>
@enderror @enderror
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/portal/ninja2020/auth/register.blade.php
View File

@ -3,7 +3,7 @@
@section('body') @section('body')
<div class="grid lg:grid-cols-12 py-8"> <div class="grid lg:grid-cols-12 py-8">
<div class="lg:col-span-4 lg:col-start-5 px-6"> <div class="col-span-12 lg:col-span-6 lg:col-start-4 xl:col-span-4 xl:col-start-5 px-6">
<div class="flex justify-center"> <div class="flex justify-center">
<img class="h-32 w-auto" src="{{ $company->present()->logo() }}" alt="{{ ctrans('texts.logo') }}"> <img class="h-32 w-auto" src="{{ $company->present()->logo() }}" alt="{{ ctrans('texts.logo') }}">
</div> </div>