0ct0pu5/b1gMail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

company+taxid contributed by SLM

Browse source
This commit is contained in:
Sebijk 2022-03-07 01:25:44 +01:00
parent facf6b3e96
commit fd11f48196
12 changed files with 1133 additions and 939 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/admin/templates/users.edit.tpl
View file

@ -35,6 +35,10 @@
<td class="td1">{lng p="lastname"}:</td>
<td class="td2"><input type="text" name="nachname" value="{text value=$user.nachname allowEmpty=true}" style="width:85%;" /></td>
</tr>
<tr>
<td class="td1">{lng p="company"}:</td>
<td class="td2"><input type="text" name="company" value="{text value=$user.company allowEmpty=true}" style="width:85%;" /></td>
</tr>
<tr>
<td class="td1">{lng p="streetno"}:</td>
<td class="td2"><input type="text" name="strasse" value="{text value=$user.strasse allowEmpty=true}" style="width:55%;" />
@ -69,6 +73,10 @@
<td class="td1">{lng p="altmail"}:</td>
<td class="td2"><input type="text" name="altmail" value="{email value=$user.altmail}" style="width:85%;" /></td>
</tr>
<tr>
<td class="td1">{lng p="taxid"}:</td>
<td class="td2"><input type="text" name="taxid" value="{text value=$user.taxid}" style="width:85%;" /></td>
</tr>
{foreach from=$profileFields item=profileField}
{assign var=fieldID value=$profileField.id}

4
src/admin/users.php
View file

@ -378,11 +378,12 @@ if($_REQUEST['action'] == 'users')
$res->Free();
// update common stuff
$db->Query('UPDATE {pre}users SET profilfelder=?, email=?, vorname=?, nachname=?, strasse=?, hnr=?, plz=?, ort=?, land=?, tel=?, fax=?, mail2sms_nummer=?, altmail=?, gruppe=?, gesperrt=?, notes=?, re=?, fwd=?, mail2sms=?, forward=?, forward_to=?, `newsletter_optin`=?, datumsformat=?, absendername=?, anrede=?, saliase=?, mailspace_add=?, diskspace_add=?, traffic_add=? WHERE id=?',
$db->Query('UPDATE {pre}users SET profilfelder=?, email=?, vorname=?, nachname=?, company=?, strasse=?, hnr=?, plz=?, ort=?, land=?, tel=?, fax=?, taxid=?, mail2sms_nummer=?, altmail=?, gruppe=?, gesperrt=?, notes=?, re=?, fwd=?, mail2sms=?, forward=?, forward_to=?, `newsletter_optin`=?, datumsformat=?, absendername=?, anrede=?, saliase=?, mailspace_add=?, diskspace_add=?, traffic_add=? WHERE id=?',
serialize($profileData),
EncodeEMail($_REQUEST['email']),
$_REQUEST['vorname'],
$_REQUEST['nachname'],
$_REQUEST['company'],
$_REQUEST['strasse'],
$_REQUEST['hnr'],
$_REQUEST['plz'],
@ -390,6 +391,7 @@ if($_REQUEST['action'] == 'users')
$_REQUEST['land'],
$_REQUEST['tel'],
$_REQUEST['fax'],
$_REQUEST['taxid'],
$_REQUEST['mail2sms_nummer'],
EncodeEMail($_REQUEST['altmail']),
$_REQUEST['gruppe'],

21
src/languages/deutsch.lang.php
View file

@ -221,6 +221,8 @@ $lang_custom['notify_date'] = 'Termin: <strong>%s</strong>';
$lang_custom['notify_newemail'] = '<strong>%d</strong> neue E-Mail(s): %s';
$lang_custom['notify_email'] = 'E-Mail eingetroffen von <strong>%s</strong>: %s';
$lang_custom['notify_birthday'] = '<strong>%s</strong> wird heute <strong>%d Jahre</strong> alt!';
$lang_custom['deref'] = 'Den Link, den Sie angeklickt haben, leitet Sie auf <br /><br /> %s <br /><br />weiter. <br /><br />
Falls Sie diese Seite nicht besuchen m&ouml;chten, schlie&szlig;en Sie dieses Fenster.';
/**
* User phrases
@ -235,11 +237,11 @@ $lang_user['pleasechose'] = 'Bitte wählen';
$lang_user['home'] = 'Home';
$lang_user['plans'] = 'Tarife';
$lang_user['required'] = 'erforderlich';
$lang_user['street'] = 'Stra&szlig;e';
$lang_user['street'] = 'Straße';
$lang_user['nr'] = 'Nr.';
$lang_user['wishaddressandpw'] = 'Name, Wunschadresse und Passwort';
$lang_user['accepttos'] = 'Ich akzeptiere die';
$lang_user['completesignup'] = 'Registrierung abschlie&szlig;en';
$lang_user['completesignup'] = 'Registrierung abschließen';
$lang_user['next'] = 'Weiter';
$lang_user['pleasewait'] = 'Bitte warten...';
$lang_user['readcertmail'] = 'Einschreiben lesen';
@ -311,7 +313,7 @@ $lang_user['notmembertxt'] = 'Sichern Sie sich Ihre kostenlose E-Mail-Adresse m
$lang_user['contactinfo'] = 'Kontaktinformationen';
$lang_user['firstname'] = 'Vorname';
$lang_user['surname'] = 'Nachname';
$lang_user['streetnr'] = 'Stra&szlig;e/Nr.';
$lang_user['streetnr'] = 'Straße/Nr.';
$lang_user['zipcity'] = 'PLZ/Ort';
$lang_user['zip'] = 'PLZ';
$lang_user['city'] = 'Ort';
@ -1064,7 +1066,7 @@ $lang_user['times'] = 'mal';
$lang_user['endless'] = 'endlos';
$lang_user['repeatcount'] = 'Wiederholen';
$lang_user['interval'] = 'Intervall';
$lang_user['besides'] = 'au&szlig;er';
$lang_user['besides'] = 'außer';
$lang_user['at'] = 'am';
$lang_user['ofthemonth'] = 'des Monats';
$lang_user['first'] = 'ersten';
@ -1098,6 +1100,10 @@ $lang_user['smsvalidation2_text'] = 'Bitte geben Sie den Freischalt-Code ein, de
$lang_user['pleasevalidate'] = 'Bitte hinterlegen Sie in Ihren Kontakt-Informationen im Bereich &quot;Einstellungen&quot; Ihre Handy-Nummer, um die SMS-Funktion freizuschalten.';
$lang_user['invalidsmscode'] = 'Der eingegebene Freischalt-Code ist nicht korrekt. Bitte versuchen Sie es erneut.';
// other
$lang_user['taxid'] = 'USt-ID';
$lang_user['yourtaxid'] = 'Ihre USt-ID';
$lang_user['redirect_note'] = 'Weiterleitungshinweis';
/**
* Admin phrases
*/
@ -1535,7 +1541,7 @@ $lang_admin['usage'] = 'Nutzung';
$lang_admin['aliases'] = 'Aliase';
$lang_admin['firstname'] = 'Vorname';
$lang_admin['lastname'] = 'Nachname';
$lang_admin['streetno'] = 'Stra&szlig;e/Nr.';
$lang_admin['streetno'] = 'Straße/Nr.';
$lang_admin['zipcity'] = 'PLZ/Ort';
$lang_admin['tel'] = 'Telefon';
$lang_admin['fax'] = 'Fax';
@ -2137,3 +2143,8 @@ $lang_admin['sum'] = 'Summe';
$lang_admin['invoice'] = 'Rechnung';
$lang_admin['at_activation'] = 'Erstellen bei Aktivierung';
$lang_admin['at_order'] = 'Erstellen bei Bestellung';
$lang_admin['exturl'] = 'externer Link';
$lang_admin['exturl_warning'] = 'Vor Betreten eines externen Links warnen';
$lang_admin['text_deref'] = 'Warnung, wenn externer Link besucht wird';
$lang_admin['company'] = 'Firma';
$lang_admin['taxid'] = 'USt-ID';

11
src/languages/english.lang.php
View file

@ -225,6 +225,8 @@ $lang_custom['notify_date'] = 'Appointment: <strong>%s</strong>';
$lang_custom['notify_newemail'] = '<strong>%d</strong> new email(s): %s';
$lang_custom['notify_email'] = 'Email received from <strong>%s</strong>: %s';
$lang_custom['notify_birthday'] = 'Today <strong>%s</strong> turned <strong>%d years</strong>!';
$lang_custom['deref'] = 'The page you were on is trying to send you to <br /><br /> %s. <br /><br />
If you do not want to visit that page, you can close this window.';
/**
* User phrases
@ -1102,6 +1104,10 @@ $lang_user['smsvalidation2_text'] = 'Please enter the activation code we sent to
$lang_user['pleasevalidate'] = 'Please enter your cellphone number at your contact details (at &quot;Preferences&quot;) in order to activate the SMS functions.';
$lang_user['invalidsmscode'] = 'The activation code is invalid. Please double-check your input and try again.';
// other
$lang_user['taxid'] = 'VAT';
$lang_user['yourtaxid'] = 'Your VAT';
$lang_user['redirect_note'] = 'Redirect notice';
/**
* Admin phrases
*/
@ -2142,3 +2148,8 @@ $lang_admin['cert_caerr_format'] = 'Certificate or key file are in an invalid fo
$lang_admin['cert_caerr_purpose'] = 'The certificate is not suitable for issuing S/MIME certificates.';
$lang_admin['cert_caerr_pkcheck'] = 'The private key does not fit to the certificate or the password is wrong.';
$lang_admin['sum'] = 'Sum';
$lang_admin['exturl'] = 'external Link';
$lang_admin['exturl_warning'] = 'Show a Warning site before access an external Link';
$lang_admin['text_deref'] = 'Warning, if external url is visited';
$lang_admin['company'] = 'Company';
$lang_admin['taxid'] = 'VAT';

21
src/plugins/templates/pacc.nli.order.tpl
View file

@ -83,6 +83,27 @@
</div>
</div>
<hr />
<!-- firma + taxid -->
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label" for="company">
{lng p="company"}
</label>
<input type="text" class="form-control" required="true" name="company" id="company" value="{text value=$_pf.company allowEmpty=true}" />
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label" for="taxid">
{lng p="taxid"}
</label>
<input type="text" class="form-control" required="true" name="taxid" id="taxid" value="{text value=$_pf.taxid allowEmpty=true}" />
</div>
</div>
</div>
<!-- firma + taxid -->
<hr />
<div class="row">

12
src/plugins/templates/pacc.user.order.tpl
View file

@ -67,6 +67,12 @@
<td class="listTableLeftDesc"><i class="fa fa-address-card-o" aria-hidden="true"></i></td>
<td class="listTableRightDesc">{lng p="invoiceaddress"}</td>
</tr>
<tr>
<td class="listTableLeft">* <label for="company">{lng p="company"}</label>:</td>
<td class="listTableRight">
<input type="text" name="company" id="company" value="{text value=$_pf.company allowEmpty=true}" size="35" />
</td>
</tr>
<tr>
<td class="listTableLeft">* <label for="vorname">{lng p="firstname"}</label>/<label for="nachname">{lng p="surname"}</label>:</td>
<td class="listTableRight">
@ -98,6 +104,12 @@
</select>
</td>
</tr>
<tr>
<td class="listTableLeft">* <label for="taxid">{lng p="taxid"}</label>:</td>
<td class="listTableRight">
<input type="text" name="taxid" id="taxid" value="{text value=$_pf.taxid allowEmpty=true}" size="35" />
</td>
</tr>
{/if}
<tr>

6
src/prefs.php
View file

@ -258,6 +258,10 @@ else if($_REQUEST['action'] == 'contact')
if(strlen($userRow['nachname']) < 2)
$invalidFields[] = 'nachname';
// firma + taxid
$userRow['company'] = trim($_POST['company']);
$userRow['taxid'] = trim($_POST['taxid']);
// salutation
if($bm_prefs['f_anrede'] != 'n')
{
@ -527,6 +531,8 @@ else if($_REQUEST['action'] == 'contact')
$tpl->assign('fax', $userRow['fax']);
$tpl->assign('altmail', $userRow['altmail']);
$tpl->assign('mail2sms_nummer', $userRow['mail2sms_nummer']);
$tpl->assign('company', $userRow['company']);
$tpl->assign('taxid', $userRow['taxid']);
// profile fields
$profileFields = array();

1849
src/serverlib/database.struct.php
View file

File diff suppressed because it is too large Load diff

6
src/setup/index.php
View file

@ -1,7 +1,7 @@
<?php
/*
* b1gMail
* Copyright (c) 2021 Patrick Schlangen et al
* Copyright (c) 2021 Patrick Schlangen et al, 2022 b1gMail.eu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -108,10 +108,10 @@ define('STEP_UPDATE_DONE', 109);
define('DB_INSTALL_PREFIX', 'bm60_');
// target version
$target_version = '7.4.1-Beta2';
$target_version = '7.4.1-Beta3';
// invoice
$defaultInvoice = '<table width=\"100%\">\n <tbody>\n <tr>\n <td style=\"font-family: Arial;\" align=\"left\">\n <h2>{$service_title}</h2>\n </td>\n <td style=\"font-family: Arial;\" align=\"right\">\n {$service_title}<br>Bitte passen<br>Sie die Absender-Adresse<br>in der Rechnungsvorlage an.<br>\n </td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"><br></td>\n </tr>\n <tr>\n <td style=\"font-family: Arial;\" align=\"left\">\n <table style=\"border: 1px solid rgb(0, 0, 0);\" bgcolor=\"#666666\" cellpadding=\"10\" cellspacing=\"0\" width=\"100%\">\n <tbody>\n <tr>\n\n <td bgcolor=\"#ffffff\">{$vorname} {$nachname}<br>{$strasse} {$nr}<br>{$plz} {$ort}<br>{$land}</td>\n </tr>\n </tbody>\n </table>\n </td>\n <td style=\"font-family: Arial;\" align=\"right\">\n <b style=\"font-family: Arial;\">{lng p=\"date\"}: </b><span style=\"font-family: Arial;\">{$datum}</span><br style=\"font-family: Arial;\">\n <b style=\"font-family: Arial;\">{lng p=\"invoiceno\"}: </b><span style=\"font-family: Arial;\">{$rgnr}</span><br style=\"font-family: Arial;\">\n <b style=\"font-family: Arial;\">{lng p=\"customerno\"}: </b><span style=\"font-family: Arial;\">{$kdnr}</span><br>\n </td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\">\n <p>&nbsp;</p>\n <b><br>{lng p=\"yourinvoice\"}</b>\n <p>{lng p=\"dearsirormadam\"},</p>\n <p>{lng p=\"invtext\"}:</p>\n\n <p>\n <table cellpadding=\"4\" cellspacing=\"0\" width=\"100%\">\n <tbody>\n <tr>\n <td width=\"10%\">{lng p=\"pos\"}</td>\n <td width=\"10%\">{lng p=\"count\"}</td>\n <td width=\"50%\">{lng p=\"descr\"}</td>\n <td width=\"15%\">{lng p=\"ep\"} ({$currency})</td>\n <td width=\"15%\">{lng p=\"gp\"} ({$currency})</td>\n </tr>\n <tr>\n <td colspan=\"5\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n </tr>\n{foreach from=$cart item=pos}\n <tr>\n <td>{$pos.pos}</td>\n <td>{$pos.count}</td>\n <td>{text value=$pos.text}</td>\n <td>{$pos.amount}</td>\n <td>{$pos.total}</td>\n </tr>\n{/foreach}\n <tr>\n <td colspan=\"5\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"gb\"} ({lng p=\"net\"}):</td>\n <td>{$netto}</td>\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"vat\"} {$mwstsatz}%:</td>\n\n <td>{$mwst}</td>\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"gb\"} ({lng p=\"gross\"}):</td>\n <td>{$brutto}</td>\n </tr>\n </tbody>\n\n </table>\n </p>\n <p>{$zahlungshinweis}<br></p>\n <p>{lng p=\"kindregards\"}</p>\n <p>{$service_title}</p>\n <p>&nbsp;</p>\n </td>\n\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><small>{lng p=\"invfooter\"}<br><br>{if $ktonr}<b>{lng p=\"bankacc\"}: </b>{lng p=\"kto_nr\"} {$ktonr} ({lng p=\"kto_inh\"} {$ktoinhaber}), {lng p=\"kto_blz\"} {$ktoblz} ({$ktoinstitut}){if $ktoiban}, {lng p=\"kto_iban\"} {$ktoiban}, {lng p=\"kto_bic\"} {$ktobic}{/if}{/if}<br></small></td>\n </tr>\n\n </tbody>\n</table>\n\n';
$defaultInvoice = file_get_contents("./rgtemplate.tpl");
// step?
if (!isset($_REQUEST['step'])) {

93
src/setup/rgtemplate.tpl Normal file
View file

@ -0,0 +1,93 @@
<table width="100%">
<tbody>
<tr>
<td style="font-family:Arial" align="left">{$service_title}</td>
<td style="font-family:Arial" align="right">{$service_title}<br />Bitte passen<br />Sie die
Absender-Adresse<br />in der Rechnungsvorlage an.</td>
</tr>
<tr style="font-family:Arial">
<td colspan="2">
<hr style="height:1px" width="100%" noshade="noshade" color="#666666" />
</td>
</tr>
<tr>
<td style="font-family:Arial" align="left">
<table style="border:1px solid #000000" width="100%" cellspacing="0" cellpadding="10">
<tbody>
<tr>
<td>{$vorname} {$nachname}<br />{if $firma}{$firma}<br />{/if}{$strasse} {$nr}<br />{$plz}
{$ort}<br />{$land}</td>
</tr>
</tbody>
</table>
</td>
<td style="font-family:Arial" align="right"><strong>{lng p="date"}: </strong><span
style="font-family:Arial">{$datum}</span><br /><strong>{lng p="invoiceno"}: </strong><span
style="font-family:Arial">{$rgnr}</span><br /><strong>{lng p="customerno"}: </strong><span
style="font-family:Arial">{$kdnr}</span>{if $taxid}<br /><strong>{lng p="yourtaxid"}:</strong>
{$taxid}{/if}</td>
</tr>
<tr style="font-family:Arial">
<td colspan="2">
<p> </p><br /><strong>{lng p="yourinvoice"}</strong>
<p>{lng p="dearsirormadam"},</p>
<p>{lng p="invtext"}:</p>
<p>{foreach from=$cart item=pos} {/foreach}</p>
<table width="100%" cellspacing="0" cellpadding="4">
<tbody>
<tr>
<td width="10%">{lng p="pos"}</td>
<td width="10%">{lng p="count"}</td>
<td width="50%">{lng p="descr"}</td>
<td width="15%">{lng p="ep"} ({$currency})</td>
<td width="15%">{lng p="gp"} ({$currency})</td>
</tr>
<tr>
<td colspan="5">
<hr style="height:1px" width="100%" noshade="noshade" color="#666666" />
</td>
</tr>
<tr>
<td>{$pos.pos}</td>
<td>{$pos.count}</td>
<td>{text value=$pos.text}</td>
<td>{$pos.amount}</td>
<td>{$pos.total}</td>
</tr>
<tr>
<td colspan="5">
<hr style="height:1px" width="100%" noshade="noshade" color="#666666" />
</td>
</tr>
<tr>
<td colspan="4" align="right">{lng p="gb"} ({lng p="net"}):</td>
<td>{$netto}</td>
</tr>
<tr>
<td colspan="4" align="right">{lng p="vat"} {$mwstsatz}%:</td>
<td>{$mwst}</td>
</tr>
<tr>
<td colspan="4" align="right">{lng p="gb"} ({lng p="gross"}):</td>
<td>{$brutto}</td>
</tr>
</tbody>
</table>
<p>{$zahlungshinweis}</p>
<p>{lng p="kindregards"}</p>
<p>{$service_title}</p>
<p> </p>
</td>
</tr>
<tr style="font-family:Arial">
<td colspan="2">
<hr style="height:1px" width="100%" noshade="noshade" color="#666666" />
</td>
</tr>
<tr style="font-family:Arial">
<td colspan="2">{lng p="invfooter"}<br /><br />{if $ktonr}<strong>{lng p="bankacc"}: </strong>{lng
p="kto_nr"} {$ktonr} ({lng p="kto_inh"} {$ktoinhaber}), {lng p="kto_blz"} {$ktoblz} ({$ktoinstitut}){if
$ktoiban}, {lng p="kto_iban"} {$ktoiban}, {lng p="kto_bic"} {$ktobic}{/if}{/if}</td>
</tr>
</tbody>
</table>

23
src/setup/update.php
View file

@ -1,7 +1,7 @@
<?php
/*
* b1gMail
* Copyright (c) 2021 Patrick Schlangen et al
* Copyright (c) 2021 Patrick Schlangen et al, 2022 b1gMail.eu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -25,7 +25,7 @@ require '../serverlib/config.inc.php';
require '../serverlib/version.inc.php';
// target version
$target_version = '7.4.1-Beta2';
$target_version = '7.4.1-Beta3';
// known versions
$knownVersions = ['7.0.0-Beta1', '7.0.0-Beta2', '7.0.0-Beta3', '7.0.0-RC1', '7.0.0',
@ -33,7 +33,7 @@ $knownVersions = ['7.0.0-Beta1', '7.0.0-Beta2', '7.0.0-Beta3', '7.0.0-RC1', '7.0
'7.2.0-Beta1', '7.2.0-Beta2', '7.2.0-Beta3', '7.2.0',
'7.3.0-Beta1', '7.3.0-Beta2', '7.3.0-Beta3', '7.3.0-Beta4',
'7.3.0-Beta5', '7.3.0-Beta6', '7.3.0',
'7.4.0-Beta1', '7.4.0-Beta2', '7.4.0-Beta3', '7.4.0-Beta4', '7.4.0', '7.4.1-Beta1'];
'7.4.0-Beta1', '7.4.0-Beta2', '7.4.0-Beta3', '7.4.0-Beta4', '7.4.0', '7.4.1-Beta1', '7.4.1-Beta2'];
// steps
define('STEP_SELECT_LANGUAGE', 0);
@ -43,7 +43,7 @@ define('STEP_UPDATE', 3);
define('STEP_UPDATE_STEP', 4);
// invoice
$defaultInvoice = '<table width=\"100%\">\n <tbody>\n <tr>\n <td style=\"font-family: Arial;\" align=\"left\">\n <h2>{$service_title}</h2>\n </td>\n <td style=\"font-family: Arial;\" align=\"right\">\n {$service_title}<br>Bitte passen<br>Sie die Absender-Adresse<br>in der Rechnungsvorlage an.<br>\n </td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"><br></td>\n </tr>\n <tr>\n <td style=\"font-family: Arial;\" align=\"left\">\n <table style=\"border: 1px solid rgb(0, 0, 0);\" bgcolor=\"#666666\" cellpadding=\"10\" cellspacing=\"0\" width=\"100%\">\n <tbody>\n <tr>\n\n <td bgcolor=\"#ffffff\">{$vorname} {$nachname}<br>{$strasse} {$nr}<br>{$plz} {$ort}<br>{$land}</td>\n </tr>\n </tbody>\n </table>\n </td>\n <td style=\"font-family: Arial;\" align=\"right\">\n <b style=\"font-family: Arial;\">{lng p=\"date\"}: </b><span style=\"font-family: Arial;\">{$datum}</span><br style=\"font-family: Arial;\">\n <b style=\"font-family: Arial;\">{lng p=\"invoiceno\"}: </b><span style=\"font-family: Arial;\">{$rgnr}</span><br style=\"font-family: Arial;\">\n <b style=\"font-family: Arial;\">{lng p=\"customerno\"}: </b><span style=\"font-family: Arial;\">{$kdnr}</span><br>\n </td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\">\n <p>&nbsp;</p>\n <b><br>{lng p=\"yourinvoice\"}</b>\n <p>{lng p=\"dearsirormadam\"},</p>\n <p>{lng p=\"invtext\"}:</p>\n\n <p>\n <table cellpadding=\"4\" cellspacing=\"0\" width=\"100%\">\n <tbody>\n <tr>\n <td width=\"10%\">{lng p=\"pos\"}</td>\n <td width=\"10%\">{lng p=\"count\"}</td>\n <td width=\"50%\">{lng p=\"descr\"}</td>\n <td width=\"15%\">{lng p=\"ep\"} ({$currency})</td>\n <td width=\"15%\">{lng p=\"gp\"} ({$currency})</td>\n </tr>\n <tr>\n <td colspan=\"5\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n </tr>\n{foreach from=$cart item=pos}\n <tr>\n <td>{$pos.pos}</td>\n <td>{$pos.count}</td>\n <td>{text value=$pos.text}</td>\n <td>{$pos.amount}</td>\n <td>{$pos.total}</td>\n </tr>\n{/foreach}\n <tr>\n <td colspan=\"5\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"gb\"} ({lng p=\"net\"}):</td>\n <td>{$netto}</td>\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"vat\"} {$mwstsatz}%:</td>\n\n <td>{$mwst}</td>\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"gb\"} ({lng p=\"gross\"}):</td>\n <td>{$brutto}</td>\n </tr>\n </tbody>\n\n </table>\n </p>\n <p>{$zahlungshinweis}<br></p>\n <p>{lng p=\"kindregards\"}</p>\n <p>{$service_title}</p>\n <p>&nbsp;</p>\n </td>\n\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><small>{lng p=\"invfooter\"}<br><br>{if $ktonr}<b>{lng p=\"bankacc\"}: </b>{lng p=\"kto_nr\"} {$ktonr} ({lng p=\"kto_inh\"} {$ktoinhaber}), {lng p=\"kto_blz\"} {$ktoblz} ({$ktoinstitut}){if $ktoiban}, {lng p=\"kto_iban\"} {$ktoiban}, {lng p=\"kto_bic\"} {$ktobic}{/if}{/if}<br></small></td>\n </tr>\n\n </tbody>\n</table>\n\n';
$defaultInvoice = file_get_contents("./rgtemplate.tpl");
// connect to mysql db
if (!($connection = CheckMySQLLogin($mysql['host'], $mysql['user'], $mysql['pass'],
@ -661,6 +661,18 @@ elseif ($step == STEP_UPDATE_STEP) {
mysqli_query($connection, 'ALTER TABLE '.$mysql['prefix'].'users DROP sms_kontigent');
}
if ($numVersion <= 7412) {
$old_defaultInvoice = '<table width=\"100%\">\n <tbody>\n <tr>\n <td style=\"font-family: Arial;\" align=\"left\">\n <h2>{$service_title}</h2>\n </td>\n <td style=\"font-family: Arial;\" align=\"right\">\n {$service_title}<br>Bitte passen<br>Sie die Absender-Adresse<br>in der Rechnungsvorlage an.<br>\n </td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"><br></td>\n </tr>\n <tr>\n <td style=\"font-family: Arial;\" align=\"left\">\n <table style=\"border: 1px solid rgb(0, 0, 0);\" bgcolor=\"#666666\" cellpadding=\"10\" cellspacing=\"0\" width=\"100%\">\n <tbody>\n <tr>\n\n <td bgcolor=\"#ffffff\">{$vorname} {$nachname}<br>{$strasse} {$nr}<br>{$plz} {$ort}<br>{$land}</td>\n </tr>\n </tbody>\n </table>\n </td>\n <td style=\"font-family: Arial;\" align=\"right\">\n <b style=\"font-family: Arial;\">{lng p=\"date\"}: </b><span style=\"font-family: Arial;\">{$datum}</span><br style=\"font-family: Arial;\">\n <b style=\"font-family: Arial;\">{lng p=\"invoiceno\"}: </b><span style=\"font-family: Arial;\">{$rgnr}</span><br style=\"font-family: Arial;\">\n <b style=\"font-family: Arial;\">{lng p=\"customerno\"}: </b><span style=\"font-family: Arial;\">{$kdnr}</span><br>\n </td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\">\n <p>&nbsp;</p>\n <b><br>{lng p=\"yourinvoice\"}</b>\n <p>{lng p=\"dearsirormadam\"},</p>\n <p>{lng p=\"invtext\"}:</p>\n\n <p>\n <table cellpadding=\"4\" cellspacing=\"0\" width=\"100%\">\n <tbody>\n <tr>\n <td width=\"10%\">{lng p=\"pos\"}</td>\n <td width=\"10%\">{lng p=\"count\"}</td>\n <td width=\"50%\">{lng p=\"descr\"}</td>\n <td width=\"15%\">{lng p=\"ep\"} ({$currency})</td>\n <td width=\"15%\">{lng p=\"gp\"} ({$currency})</td>\n </tr>\n <tr>\n <td colspan=\"5\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n </tr>\n{foreach from=$cart item=pos}\n <tr>\n <td>{$pos.pos}</td>\n <td>{$pos.count}</td>\n <td>{text value=$pos.text}</td>\n <td>{$pos.amount}</td>\n <td>{$pos.total}</td>\n </tr>\n{/foreach}\n <tr>\n <td colspan=\"5\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"gb\"} ({lng p=\"net\"}):</td>\n <td>{$netto}</td>\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"vat\"} {$mwstsatz}%:</td>\n\n <td>{$mwst}</td>\n </tr>\n <tr>\n <td colspan=\"4\" align=\"right\">{lng p=\"gb\"} ({lng p=\"gross\"}):</td>\n <td>{$brutto}</td>\n </tr>\n </tbody>\n\n </table>\n </p>\n <p>{$zahlungshinweis}<br></p>\n <p>{lng p=\"kindregards\"}</p>\n <p>{$service_title}</p>\n <p>&nbsp;</p>\n </td>\n\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><hr style=\"height: 1px;\" color=\"#666666\" noshade=\"noshade\" width=\"100%\"></td>\n </tr>\n <tr style=\"font-family: Arial;\">\n <td colspan=\"2\"><small>{lng p=\"invfooter\"}<br><br>{if $ktonr}<b>{lng p=\"bankacc\"}: </b>{lng p=\"kto_nr\"} {$ktonr} ({lng p=\"kto_inh\"} {$ktoinhaber}), {lng p=\"kto_blz\"} {$ktoblz} ({$ktoinstitut}){if $ktoiban}, {lng p=\"kto_iban\"} {$ktoiban}, {lng p=\"kto_bic\"} {$ktobic}{/if}{/if}<br></small></td>\n </tr>\n\n </tbody>\n</table>\n\n';
$res = mysqli_query($connection, 'SELECT rgtemplate FROM '.$mysql['prefix'].'prefs');
$row = mysqli_fetch_array($res, MYSQLI_ASSOC);
if($row['rgtemplate']==$old_defaultInvoice) {
mysqli_query($connection, sprintf('UPDATE '.$mysql['prefix'].'prefs SET rgtemplate=\'%s\'',
$defaultInvoice));
}
mysqli_query($connection, 'UPDATE '.$mysql['prefix'].'staaten SET is_eu = \'no\' WHERE id = 37'); // GB is not in EU anymore
mysqli_query($connection, 'UPDATE '.$mysql['prefix'].'staaten SET land = \'Eswatini\' WHERE id = 117'); // Rename Swasiland to Eswatini
}
// add new root certificates
if (!isset($rootCertsData)) {
include './data/rootcerts.data.php';
@ -827,5 +839,4 @@ elseif ($step == STEP_UPDATE_STEP) {
pageFooter(true);
// disconnect
mysqli_close($connection);
?>
mysqli_close($connection);

18
src/templates/modern/li/prefs.contact.tpl
View file

@ -37,13 +37,19 @@
<tr>
<td class="listTableLeft">* <label for="vorname">{lng p="firstname"}</label>:</td>
<td class="listTableRight">
<input type="text" name="vorname" id="vorname" value="{text value=$vorname allowEmpty=true}" size="35" />
<input type="text" name="vorname" id="vorname" value="{text value=$vorname allowEmpty=true}" size="35" required />
</td>
</tr>
<tr>
<td class="listTableLeft">* <label for="nachname">{lng p="surname"}</label>:</td>
<td class="listTableRight">
<input type="text" name="nachname" id="nachname" value="{text value=$nachname allowEmpty=true}" size="35" />
<input type="text" name="nachname" id="nachname" value="{text value=$nachname allowEmpty=true}" size="35" required />
</td>
</tr>
<tr>
<td class="listTableLeft"><label for="company">{lng p="company"}</label>:</td>
<td class="listTableRight">
<input type="text" name="company" id="company" value="{text value=$company allowEmpty=true}" size="35" />
</td>
</tr>
@ -101,9 +107,15 @@
{if $f_alternativ!="n"}<tr>
<td class="listTableLeft">{if $f_alternativ=="p"}*{/if} <label for="altmail">{lng p="altmail2"}:</label></td>
<td class="listTableRight">
<input type="text" name="altmail" id="altmail" value="{text value=$altmail allowEmpty=true}" size="35" />
<input type="email" name="altmail" id="altmail" value="{text value=$altmail allowEmpty=true}" size="35" {if $f_alternativ=="p"}required{/if} />
</td>
</tr>{/if}
<tr>
<td class="listTableLeft"><label for="taxid">{lng p="taxid"}</label>:</td>
<td class="listTableRight">
<input type="text" name="taxid" id="taxid" value="{text value=$taxid allowEmpty=true}" size="35" />
</td>
</tr>
{foreach from=$profileFields item=profileField}
{assign var=fieldID value=$profileField.id}
<tr>