Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

enhance address field

Browse Source
This commit is contained in:
Hobby-Student 2023-01-21 13:27:02 +01:00 committed by GitHub
parent f09ad72cbb
commit 14096c92e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/DataMapper/CompanySettings.php
View File

@ -822,6 +822,7 @@ class CompanySettings extends BaseSettings
'$client.address1',
'$client.address2',
'$client.city_state_postal',
'$client.postal_city',
'$client.country',
'$client.phone',
'$contact.email',
@ -833,6 +834,7 @@ class CompanySettings extends BaseSettings
'$vendor.address1',
'$vendor.address2',
'$vendor.city_state_postal',
'$vendor.postal_city',
'$vendor.country',
'$vendor.phone',
'$contact.email',
@ -857,6 +859,7 @@ class CompanySettings extends BaseSettings
'$company.address1',
'$company.address2',
'$company.city_state_postal',
'$company.postal_city',
'$company.country',
],
'invoice_details' => [

3
app/Mail/Engine/PaymentEmailEngine.php
View File

@ -190,6 +190,8 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$client.city_state_postal'] = &$data['$city_state_postal'];
$data['$postal_city_state'] = ['value' => $this->client->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$client.postal_city_state'] = &$data['$postal_city_state'];
$data['$postal_city'] = ['value' => $this->client->present()->cityStateZip($this->client->city, null, $this->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$client.postal_city'] = &$data['$postal_city'];
$data['$client.country'] = &$data['$country'];
$data['$client.email'] = &$data['$email'];
@ -213,6 +215,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
$data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$company.postal_city'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, null, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$company.name'] = ['value' => $this->company->present()->name() ?: ' ', 'label' => ctrans('texts.company_name')];
$data['$company.address1'] = ['value' => $this->settings->address1 ?: ' ', 'label' => ctrans('texts.address1')];
$data['$company.address2'] = ['value' => $this->settings->address2 ?: ' ', 'label' => ctrans('texts.address2')];

8
app/Models/Presenters/EntityPresenter.php
View File

@ -84,14 +84,14 @@ class EntityPresenter extends Presenter
}
}
public function getShippingCityState()
public function getShippingCityState($printCity = true, $printState = true, $printPostalCode = true)
{
$client = $this->entity;
$swap = $client->shipping_country && $client->shipping_country->swap_postal_code;
$city = e($client->shipping_city);
$state = e($client->shipping_state);
$postalCode = e($client->shipping_postal_code);
$city = ($printCity) ? e($client->shipping_city) : null;
$state = ($printState) ? e($client->shipping_state) : null;
$postalCode = ($printPostalCode) ? e($client->shipping_postal_code) : null;
if ($city || $state || $postalCode) {
return $this->cityStateZip($city, $state, $postalCode, $swap);

3
app/Utils/HtmlEngine.php
View File

@ -414,6 +414,8 @@ class HtmlEngine
$data['$client.city_state_postal'] = &$data['$city_state_postal'];
$data['$postal_city_state'] = ['value' => $this->entity->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$client.postal_city_state'] = &$data['$postal_city_state'];
$data['$postal_city'] = ['value' => $this->entity->present()->cityStateZip($this->client->city, null, $this->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$client.postal_city'] = &$data['$postal_city'];
$data['$client.country'] = &$data['$country'];
$data['$client.email'] = &$data['$email'];
@ -464,6 +466,7 @@ class HtmlEngine
$data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
$data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$company.postal_city'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, null, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$company.name'] = ['value' => $this->settings->name ?: ctrans('texts.untitled_account'), 'label' => ctrans('texts.company_name')];
$data['$account'] = &$data['$company.name'];

4
app/Utils/Traits/MakesTemplateData.php
View File

@ -149,6 +149,8 @@ trait MakesTemplateData
$data['$client.city_state_postal'] = &$data['$city_state_postal'];
$data['$postal_city_state'] = ['value' => '90210, Los Angeles, CA', 'label' => ctrans('texts.postal_city_state')];
$data['$client.postal_city_state'] = &$data['$postal_city_state'];
$data['$postal_city'] = ['value' => '10178 Berlin', 'label' => ctrans('texts.postal_city')];
$data['$client.postal_city'] = &$data['$postal_city'];
$data['$client.country'] = &$data['$country'];
$data['$client.email'] = &$data['$email'];
$data['$contact_name'] = ['value' => 'Jimmy Nadel', 'label' => ctrans('texts.contact_name')];
@ -159,6 +161,7 @@ trait MakesTemplateData
$data['$contact4'] = ['value' => 'Custom Contact Values', 'label' => 'contact 4'];
$data['$company.city_state_postal'] = ['value' => 'Los Angeles, CA, 90210', 'label' => ctrans('texts.city_state_postal')];
$data['$company.postal_city_state'] = ['value' => '90210, Los Angeles, CA', 'label' => ctrans('texts.postal_city_state')];
$data['$company.postal_city'] = ['value' => '10178 Berlin', 'label' => ctrans('texts.postal_city')];
$data['$company.name'] = ['value' => 'ACME co', 'label' => ctrans('texts.company_name')];
$data['$company.company_name'] = &$data['$company.name'];
$data['$company.address1'] = ['value' => '5 Jimbuckeroo Way', 'label' => ctrans('texts.address1')];
@ -218,6 +221,7 @@ trait MakesTemplateData
$data['$vendor.phone'] = &$data['$phone'];
$data['$vendor.city_state_postal'] = &$data['$city_state_postal'];
$data['$vendor.postal_city_state'] = &$data['$postal_city_state'];
$data['$vendor.postal_city'] = &$data['$postal_city'];
$data['$vendor.country'] = &$data['$country'];
$data['$vendor.email'] = &$data['$email'];

5
app/Utils/VendorHtmlEngine.php
View File

@ -275,6 +275,8 @@ class VendorHtmlEngine
$data['$vendor.city_state_postal'] = &$data['$city_state_postal'];
$data['$postal_city_state'] = ['value' => $this->vendor->present()->cityStateZip($this->vendor->city, $this->vendor->state, $this->vendor->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$vendor.postal_city_state'] = &$data['$postal_city_state'];
$data['$postal_city'] = ['value' => $this->vendor->present()->cityStateZip($this->vendor->city, null, $this->vendor->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$vendor.postal_city'] = &$data['$postal_city'];
$data['$vendor.country'] = &$data['$country'];
$data['$vendor.email'] = &$data['$email'];
@ -309,6 +311,7 @@ class VendorHtmlEngine
$data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
$data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$company.postal_city'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, null, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$company.name'] = ['value' => $this->settings->name ?: ctrans('texts.untitled_account'), 'label' => ctrans('texts.company_name')];
$data['$account'] = &$data['$company.name'];
@ -453,6 +456,8 @@ class VendorHtmlEngine
$data['$client.city_state_postal'] = &$data['$city_state_postal'];
$data['$postal_city_state'] = ['value' => $this->entity->client->present()->cityStateZip($this->entity->client->city, $this->entity->client->state, $this->entity->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
$data['$client.postal_city_state'] = &$data['$postal_city_state'];
$data['$postal_city'] = ['value' => $this->entity->client->present()->cityStateZip($this->entity->client->city, null, $this->entity->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city')];
$data['$client.postal_city'] = &$data['$postal_city'];
$data['$client.country'] = &$data['$country'];
$data['$client.email'] = &$data['$email'];

1
lang/de/texts.php
View File

@ -1902,6 +1902,7 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
'task' => 'Aufgabe',
'contact_name' => 'Name des Kontakts',
'city_state_postal' => 'Stadt/Bundesland/PLZ',
'postal_city' => 'PLZ/Stadt',
'custom_field' => 'Benutzerdefinierte Felder',
'account_fields' => 'Unternehmensfelder',
'facebook_and_twitter' => 'Facebook und Twitter',

1
lang/en/texts.php
View File

@ -1901,6 +1901,7 @@ $LANG = array(
'task' => 'Task',
'contact_name' => 'Contact Name',
'city_state_postal' => 'City/State/Postal',
'postal_city' => 'Postal/City',
'custom_field' => 'Custom Field',
'account_fields' => 'Company Fields',
'facebook_and_twitter' => 'Facebook and Twitter',

1
lang/en_GB/texts.php
View File

@ -1901,6 +1901,7 @@ $LANG = array(
'task' => 'Task',
'contact_name' => 'Contact Name',
'city_state_postal' => 'City/State/Postal',
'postal_city' => 'Postal/City',
'custom_field' => 'Custom Field',
'account_fields' => 'Company Fields',
'facebook_and_twitter' => 'Facebook and Twitter',