Skip to content

Commit

Permalink
add fallback contact
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias authored and tobias committed Dec 23, 2021
1 parent 941b83e commit 9ed9f30
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 111 deletions.
2 changes: 1 addition & 1 deletion lib/address.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ static public function getAll($clang_id, $address_type = FALSE, $online_only = T
if(count($where) > 0) {
$query .= 'WHERE '. implode(' AND ', $where);
}
$query .= ' ORDER BY company, priority';
$query .= ' ORDER BY company, contact_name, priority';
$result = \rex_sql::factory();
$result->setQuery($query);

Expand Down
78 changes: 0 additions & 78 deletions lib/d2u_address_lang_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_english = [
'd2u_address_contact' => 'Contact',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'Please enter your country.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Your local Service partner',
'd2u_address_mobile' => 'Mobile',
'd2u_address_nearby' => 'Close to you',
'd2u_address_other_countries' => 'Other Countries',
'd2u_address_phone' => 'Phone',
'd2u_address_specialists' => 'Our specialists worldwide are available by telephone to offer advice and support.',
'd2u_address_zip_code' => 'Postal Code'
];

/**
Expand All @@ -27,16 +24,13 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_german = [
'd2u_address_contact' => 'Kontakt',
'd2u_address_email' => 'E-Mail',
'd2u_address_failure_country' => 'Bitte geben Sie Ihr Land ein.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Ihr lokaler Ansprechpartner',
'd2u_address_mobile' => 'Mobil',
'd2u_address_nearby' => 'In Ihrer Nähe',
'd2u_address_other_countries' => 'Weitere Länder',
'd2u_address_phone' => 'Telefon',
'd2u_address_specialists' => 'Unsere Spezialisten sind weltweit telefonisch für Sie erreichbar und beraten Sie gerne bezüglich Ihrer individuellen Anliegen.',
'd2u_address_zip_code' => 'PLZ'
];

/**
Expand All @@ -45,16 +39,13 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_french = [
'd2u_address_contact' => 'Contact',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'Veuillez indiquer votre pays.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Votre interlocuteur local',
'd2u_address_mobile' => 'Mobile',
'd2u_address_nearby' => 'A proximité',
'd2u_address_other_countries' => 'Autres pays',
'd2u_address_phone' => 'Téléphone',
'd2u_address_specialists' => 'Nos spécialistes sont joignable téléphoniquement pour vous à travers le monde entier et ils vous conseilleront volontiers sur vos propres demandes.',
'd2u_address_zip_code' => 'Code postal'
];

/**
Expand All @@ -63,88 +54,28 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_spanish = [
'd2u_address_contact' => 'Contacto',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'Por favor, introduzca su país.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Su interlocutor local',
'd2u_address_mobile' => 'Móvil',
'd2u_address_nearby' => 'Cerca de usted',
'd2u_address_other_countries' => 'Otros países',
'd2u_address_phone' => 'Teléfono',
'd2u_address_specialists' => 'Nuestros especialistas están disponibles en todo el mundo por teléfono y estarán encantados de asesorarle en sus necesidades individuales.',
'd2u_address_zip_code' => 'Código Postal'
];

/**
* @var string[] Array with italian replacements. Key is the wildcard,
* value the replacement.
*/
protected $replacements_italian = [
'd2u_address_contact' => 'Contatto',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'La si prega di digitare il Suo paese.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Il Vostro interlocutore locale',
'd2u_address_mobile' => 'Mobile',
'd2u_address_nearby' => 'Vicino a te',
'd2u_address_other_countries' => 'Altri paesi',
'd2u_address_phone' => 'Telefono',
'd2u_address_specialists' => 'I nostri specialisti sono disponibili a livello mondiale per telefono e saranno lieti di consigliarvi sulle tue esigenze individuali.',
'd2u_address_zip_code' => 'CAP'
];

/**
* @var string[] Array with polish replacements. Key is the wildcard,
* value the replacement.
*/
protected $replacements_polish = [
'd2u_address_contact' => 'Kontakt',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'Prosimy o wybranie swojego kraju.',
'd2u_address_fax' => 'Faks',
'd2u_address_local_servicepartner' => 'Osoba do kontaktów z Państwem na miejscu ',
'd2u_address_mobile' => 'Mobilny',
'd2u_address_nearby' => 'Blisko ciebie',
'd2u_address_other_countries' => 'Inne kraje',
'd2u_address_phone' => 'Telefon',
'd2u_address_specialists' => 'Nasi specjaliści są dostępni na całym świecie przez telefon i chętnie doradzą Ci indywidualnie.',
'd2u_address_zip_code' => 'Kod pocztowy'
];

/**
* @var string[] Array with dutch replacements. Key is the wildcard,
* value the replacement.
*/
protected $replacements_dutch = [
'd2u_address_contact' => 'Contact',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'Voer uw land.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Uw plaatselijke contactpersoon',
'd2u_address_mobile' => 'Mobiel',
'd2u_address_nearby' => 'Dicht bij jou',
'd2u_address_other_countries' => 'Andere landen',
'd2u_address_phone' => 'Telefoon',
'd2u_address_specialists' => 'Onze specialisten zijn wereldwijd telefonisch verkrijgbaar en adviseren u graag op uw individuele wensen.',
'd2u_address_zip_code' => 'Postcode'
];

/**
* @var string[] Array with czech replacements. Key is the wildcard,
* value the replacement.
*/
protected $replacements_czech = [
'd2u_address_contact' => 'Kontakt',
'd2u_address_email' => 'E-Mail',
'd2u_address_failure_country' => 'Prosím zvolte zemi.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'Vaše kontaktní osoba',
'd2u_address_mobile' => 'Mobilní',
'd2u_address_nearby' => 'Vám blízké',
'd2u_address_other_countries' => 'Jiné země',
'd2u_address_phone' => 'Telefon',
'd2u_address_specialists' => 'Naši odborníci po celém světě jsou k dispozici na telefonu a jsou ochotni Vám poradit.',
'd2u_address_zip_code' => 'PSČ',
];

/**
Expand All @@ -153,16 +84,13 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_russian = [
'd2u_address_contact' => 'контакт',
'd2u_address_email' => 'Электронная почта',
'd2u_address_failure_country' => 'Пожалуйста, введите название страны.',
'd2u_address_fax' => 'факс',
'd2u_address_local_servicepartner' => 'Ваш региональный сервисный партнер',
'd2u_address_mobile' => 'Mобильный',
'd2u_address_nearby' => 'Ближайший сервисный центр',
'd2u_address_other_countries' => 'Другие страны',
'd2u_address_phone' => 'Телефон',
'd2u_address_specialists' => 'Наши специалисты доступны по всему миру по телефону и всегда готовы проконсультировать Вас по техническим вопросам.',
'd2u_address_zip_code' => 'Почтовый код'
];

/**
Expand All @@ -171,16 +99,13 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_portuguese = [
'd2u_address_contact' => 'Contato',
'd2u_address_email' => 'E-mail',
'd2u_address_failure_country' => 'Introduza o seu país.',
'd2u_address_fax' => 'Fax',
'd2u_address_local_servicepartner' => 'O seu parceiro de contacto local',
'd2u_address_mobile' => 'Móvel',
'd2u_address_nearby' => 'Perto de você',
'd2u_address_other_countries' => 'Outros países',
'd2u_address_phone' => 'Telefone',
'd2u_address_specialists' => 'Nossos especialistas estão disponíveis em todo o mundo por telefone e ficarão satisfeitos em informá-lo sobre seus requisitos individuais.',
'd2u_address_zip_code' => 'Código Postal'
];

/**
Expand All @@ -189,16 +114,13 @@ class d2u_address_lang_helper extends \D2U_Helper\ALangHelper {
*/
protected $replacements_chinese = [
'd2u_address_contact' => '联系方式',
'd2u_address_email' => '电子邮件',
'd2u_address_failure_country' => '请输入您所在的国家。',
'd2u_address_fax' => '传真',
'd2u_address_local_servicepartner' => '您的当地联系人',
'd2u_address_mobile' => '移动',
'd2u_address_nearby' => '您的附近',
'd2u_address_other_countries' => '其他国家',
'd2u_address_phone' => '电话',
'd2u_address_specialists' => '您可以在全球范围内致电我们的客服专员，就您个人感兴趣的话题进行咨询。',
'd2u_address_zip_code' => '邮编'
];

/**
Expand Down
27 changes: 25 additions & 2 deletions modules/20/1/input.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<?php
$address_types = \D2U_Address\AddressType::getAll(rex_clang::getCurrentId());

if(count($address_types) > 0) {
print ' <select name="REX_INPUT_VALUE[1]" class="form-control">';
if($address_types) {
print '<select name="REX_INPUT_VALUE[1]" class="form-control">';
foreach ($address_types as $address_type) {
echo '<option value="'. $address_type->address_type_id .'" ';

Expand All @@ -23,6 +23,29 @@
<div class="col-xs-12">&nbsp;</div>
</div>
<div class="row">
<div class="col-xs-4">Standardkontakt für Option "weitere Länder"</div>
<div class="col-xs-8">
<?php
$addresses = \D2U_Address\Address::getAll(rex_clang::getCurrentId());
print '<select name="REX_INPUT_VALUE[4]" class="form-control">';
print '<option value="0">Adressen des Standardlandes aus den Einstellungen anzeigen</option>';
if($addresses) {
foreach ($addresses as $address) {
echo '<option value="'. $address->address_id .'" ';

if ("REX_VALUE[4]" == $address->address_id) {
echo 'selected="selected" ';
}
echo '>'. $address->company .' - '. $address->contact_name .'</option>';
}
print '</select>';
}
?>
</div>
</div>
<div class="row">
<div class="col-xs-12">&nbsp;</div>
</div><div class="row">
<div class="col-xs-4">Art der Karte:</div>
<div class="col-xs-8">
<?php
Expand Down
49 changes: 25 additions & 24 deletions modules/20/1/output.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
$address_type = new D2U_Address\AddressType($address_type_id, rex_clang::getCurrentId());
$show_fax = "REX_VALUE[2]" == 'true' ? TRUE : FALSE;
$map_type = "REX_VALUE[3]" == '' ? 'google' : "REX_VALUE[3]"; // Backward compatibility
$default_contact = "REX_VALUE[4]" > 0 ? new D2U_Address\Address("REX_VALUE[4]", rex_clang::getCurrentId()) : false;

if(\rex::isBackend()) {
// BACKEND
print '<h1 style="font-size: 1.5em;">Adressliste</h1>';
print "Adressart: ". $address_type->name ."<br>";
print "Standardkontakt: ". ($default_contact instanceof D2U_Address\Address && $default_contact->address_id > 0 ? $default_contact->company .' - '. $default_contact->contact_name : "Adressen des Standardlandes aus den Einstellungen anzeigen") ."<br>";
print "Faxnummer anzeigen: ". ($show_fax ? "Ja" : "Nein") ."<br>";
}
else {
Expand All @@ -28,7 +30,10 @@
// Form selections
$addresses = [];
if($address_type->show_country_select == "yes") {
if($zip_code !== FALSE) {
if(rex_request('country_id', 'int') == -1 && $default_contact instanceof D2U_Address\Address && $default_contact->address_id > 0) {
$addresses[] = $default_contact;
}
else if($zip_code !== FALSE) {
$addresses = $zip_code->getAdresses(TRUE);
}
else if($country !== FALSE) {
Expand Down Expand Up @@ -78,38 +83,34 @@
print '<div class="col-12 col-md-6">';
print '<select name="country_id" class="country_select" onChange="this.form.submit()">';
$countries = $address_type->getCountries();
$already_selected = FALSE;
foreach($countries as $cur_country) {
$selected = "";
if($country->country_id == $cur_country->country_id) {
$selected = ' selected="selected"';
$already_selected = TRUE;
}
else if($country === FALSE && $cur_country->country_id == $default_country_id) {
if(rex_request('country_id', 'int') > -1 && ($country->country_id == $cur_country->country_id || ($country === FALSE && $cur_country->country_id == $default_country_id))) {
$selected = ' selected="selected"';
$already_selected = TRUE;
}
print '<option value="'. $cur_country->country_id .'" '. $selected .'>'. $cur_country->name .'</option>';
}
print '<option value="-1" '. ($already_selected ? '' : 'selected="selected"') .'>'. $tag_open .'d2u_address_other_countries'. $tag_close .'</option>';
print '<option value="-1" '. (rex_request('country_id', 'int') == -1 ? 'selected="selected"' : '') .'>'. $tag_open .'d2u_address_other_countries'. $tag_close .'</option>';
print '</select>';
print '</div>';

$country_zip_codes = $country->getZipCodes();
if($country !== FALSE && count($country_zip_codes) > 0) {
$show_zip_code_field = FALSE;
foreach($country_zip_codes as $country_zip_code) {
if($country_zip_code->isOnline()) {
$show_zip_code_field = TRUE;
break;
if(rex_request('country_id', 'int') > -1 && $country !== FALSE) {
$country_zip_codes = $country->getZipCodes();
if(count($country_zip_codes) > 0) {
$show_zip_code_field = FALSE;
foreach($country_zip_codes as $country_zip_code) {
if($country_zip_code->isOnline()) {
$show_zip_code_field = TRUE;
break;
}
}
if($show_zip_code_field) {
print '<div class="col-12 col-md-6">';
$placeholder = $zip_code === FALSE ? $tag_open .'d2u_helper_module_form_zip'. $tag_close : rex_request('zip_code', 'int');
print '<input type="text" value="'. ($zip_code !== FALSE ? rex_request('zip_code', 'int') : '') .'" name="zip_code" placeholder="'. $placeholder .'">';
print '<input type="submit" value="»" class="zip_code">';
print '</div>';
}
}
if($show_zip_code_field) {
print '<div class="col-12 col-md-6">';
$placeholder = $zip_code === FALSE ? $tag_open .'d2u_address_zip_code'. $tag_close : rex_request('zip_code', 'int');
print '<input type="text" value="'. ($zip_code !== FALSE ? rex_request('zip_code', 'int') : '') .'" name="zip_code" placeholder="'. $placeholder .'">';
print '<input type="submit" value="»" class="zip_code">';
print '</div>';
}
}

Expand Down Expand Up @@ -157,7 +158,7 @@
print $tag_open .'d2u_address_mobile'. $tag_close .' '. $address->mobile .'<br>';
}
if($address->phone != "") {
print $tag_open .'d2u_address_phone'. $tag_close .' '. $address->phone .'<br>';
print $tag_open .'d2u_helper_module_form_phone'. $tag_close .' '. $address->phone .'<br>';
}
if($show_fax && $address->fax != "") {
print $tag_open .'d2u_address_fax'. $tag_close .' '. $address->fax .'<br>';
Expand Down
2 changes: 1 addition & 1 deletion modules/20/2/ouput.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
if($address->adress_id > 0) {
print '<br><br>';
print '<h4>'. $tag_open .'d2u_address_email'. $tag_close .'</h4>';
print '<h4>'. $tag_open .'d2u_helper_module_form_email'. $tag_close .'</h4>';
// Google Analytics Event
$google_analytics = "";
if(rex_config::get('d2u_address', 'analytics_emailevent_activate', 'false') == 'true' &&
Expand Down
2 changes: 1 addition & 1 deletion package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ page:

requires:
packages:
d2u_helper: '>=1.8.4'
d2u_helper: '>=1.8.8'
sprog: '>=1.0.0'
9 changes: 5 additions & 4 deletions pages/setup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
<h2>Support</h2>
<p>Fehlermeldungen bitte im <a href="https://github.com/TobiasKrais/d2u_address" target="_blank">GitHub Repository</a> melden.</p>
<h2>Changelog</h2>
<p>1.2-DEV:</p>
<p>1.2:</p>
<ul>
<li>Kontinente hinzugefügt. Ländern können Kontinenten zugeordnet werden.</li>
<li>Kontinente hinzugefügt. Ländern können Kontinenten zugeordnet werden (nicht im Beispielmodul verfügbar).</li>
<li>Einige Frontendübersetzungen ins D2U Helper Addon umgezogen.</li>
<li>Bugfix: beim Löschen der Adresse wurde in der Fehlermeldung der Link zur PLZ nicht korrekt gesetzt.</li>
<li>Bugfix: bei Adressarten wurden die beiden Checkbo Felder nicht korrekt aus der Datenbank ausgelesen.</li>
<li>Bugfix: bei Adressarten wurden die beiden Checkbox Felder nicht korrekt aus der Datenbank ausgelesen.</li>
<li>Bugfix: beim Ändern einer Priorität einer Adresse wurden die anderen Prioritäten nicht korrekt angepasst.</li>
<li>Notice entfernt.</li>
<li>Modul 20-1 "D2U Adressen - Adressausgabe": PHP Warnungen entfernt.</li>
<li>Modul 20-1 "D2U Adressen - Adressausgabe": Adresse für Option "Weitere Länder" wählbar und PHP Warnungen entfernt.</li>
</ul>
<p>1.1.3:</p>
<ul>
Expand Down

0 comments on commit 9ed9f30

Please sign in to comment.