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

Make state field optional

Browse Source
This commit is contained in:
Hillel Coren 2018-03-13 16:04:02 +02:00
parent a4215a6fbe
commit ca3ff553e5
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortalController.php
View File

@ -988,7 +988,7 @@ class ClientPortalController extends BaseController
'email' => 'required', 'email' => 'required',
'address1' => 'required', 'address1' => 'required',
'city' => 'required', 'city' => 'required',
'state' => 'required', 'state' => $account->requiresAddressState() ? 'required' : '',
'postal_code' => 'required', 'postal_code' => 'required',
'country_id' => 'required', 'country_id' => 'required',
]; ];

5
app/Models/Account.php
View File

@ -1791,6 +1791,11 @@ class Account extends Eloquent
return url('/'); return url('/');
} }
} }
public function requiresAddressState() {
return true;
//return ! $this->country_id || $this->country_id == DEFAULT_COUNTRY;
}
} }
Account::creating(function ($account) Account::creating(function ($account)

5
app/Ninja/PaymentDrivers/BasePaymentDriver.php
View File

@ -242,10 +242,13 @@ class BasePaymentDriver
$rules = array_merge($rules, [ $rules = array_merge($rules, [
'address1' => 'required', 'address1' => 'required',
'city' => 'required', 'city' => 'required',
'state' => 'required',
'postal_code' => 'required', 'postal_code' => 'required',
'country_id' => 'required', 'country_id' => 'required',
]); ]);
if ($this->account()->requiresAddressState()) {
$rules['state'] = 'required';
}
} }
} }

2
resources/views/invited/details.blade.php
View File

@ -25,7 +25,7 @@
'vat_number' => 'required', 'vat_number' => 'required',
'address1' => 'required', 'address1' => 'required',
'city' => 'required', 'city' => 'required',
'state' => 'required', 'state' => $account->requiresAddressState() ? 'required' : '',
'postal_code' => 'required', 'postal_code' => 'required',
'country_id' => 'required', 'country_id' => 'required',
)) !!} )) !!}

4
resources/views/payments/credit_card.blade.php
View File

@ -133,7 +133,7 @@
'cvv' => 'required', 'cvv' => 'required',
'address1' => 'required', 'address1' => 'required',
'city' => 'required', 'city' => 'required',
'state' => 'required', 'state' => $account->requiresAddressState() ? 'required' : '',
'postal_code' => 'required', 'postal_code' => 'required',
'country_id' => 'required', 'country_id' => 'required',
'phone' => 'required', 'phone' => 'required',
@ -146,7 +146,7 @@
'account_holder_type' => 'required', 'account_holder_type' => 'required',
'shipping_address1' => 'required', 'shipping_address1' => 'required',
'shipping_city' => 'required', 'shipping_city' => 'required',
'shipping_state' => 'required', 'shipping_state' => $account->requiresAddressState() ? 'required' : '',
'shipping_postal_code' => 'required', 'shipping_postal_code' => 'required',
'shipping_country_id' => 'required', 'shipping_country_id' => 'required',
)) !!} )) !!}