diff --git a/includes/imagelist_update.html b/includes/imagelist_update.html
index 2f68a31..75833f9 100644
--- a/includes/imagelist_update.html
+++ b/includes/imagelist_update.html
@@ -32,7 +32,7 @@
{{vtItem}}
- {{vtCalc: makeThumbnail( utf8_encode('{vtGet:Verzeichnis}/{vtItem}') ) }}
+ {{vtCalc: makeThumbnail( '{vtGet:Verzeichnis}/{vtItem}' ) }}
{{vtSet: Title="", Keywords="", Description="" }}
@@ -73,4 +73,4 @@
{{vtCalc: getFileInfo('{vtGet:pfad}', 'mtime') }}
{{vtDo: -act="update", -obj="{vtID}", Timestamp="{vtResult}", istKategorie="{vtGet:istKategorie}"}}
-
\ No newline at end of file
+
diff --git a/includes/initialize.html b/includes/initialize.html
index 891cae7..420dc24 100644
--- a/includes/initialize.html
+++ b/includes/initialize.html
@@ -3,14 +3,26 @@
{{vtLoad: templates/pixtacy/resources/functions.php}}
- {{vtSet: CurrentVersionNumber="51"}}
+ {{vtSet: CurrentVersionNumber="53"}}
{{vtSet: ID_Current="{vtID}"}}
{{vtSet: thumbnailUrl="{vtConfig:baseURLData}pixtacy_thumbnails"}}
{{vtSet: thumbnailPath="{vtConfig:pathToData}pixtacy_thumbnails"}}
- {{vtUse:/}}
+ {{vtIf: {vtGlobal:pxtcHomePageId} .gt. 0 }}
+ {{vtSet: ID_Home = "{vtGlobal:pxtcHomePageId}" }}
+ {{vtElse}}
+ {{vtUse: //}}
+ {{vtLoop}}
+ {{vtIf: {vtPackage} .eq. pixtacy }}
+ {{vtSet: ID_Home = "{vtId}" }}
+ {{vtDo: -act="update", -obj="70", pxtcHomePageId="{vtId}" }}
+ {{vtExit}}
+ {{vtEndIf}}
+ {{vtEndLoop}}
+ {{vtEndUse}}
+ {{vtEndIf}}
- {{vtSet: ID_Home="{vtID}"}}
+ {{vtUse: {vtGet:ID_Home} }}
{{vtIf: userhasadminprivileges .or. {vtGlobal:pxtc_version_number} .neq. {vtGet:CurrentVersionNumber} }}
diff --git a/languages/de.txt b/languages/de.txt
index adc2ecd..9d0f21e 100644
--- a/languages/de.txt
+++ b/languages/de.txt
@@ -302,12 +302,14 @@ Viele Grüße
{{vtSet: s_txt_0070 = "inkl."}}
{{vtSet: s_txt_0071 = "zzgl."}}
{{vtSet: s_txt_0072 = "MwSt."}}
+{{vtSet: s_txt_0073 = "Hallo %1$s %2$s,"}}
{{vtSet: s_payment_vorkasse = "Vorkasse"}}
{{vtSet: s_payment_sepa = "SEPA-Lastschrift"}}
{{vtSet: s_payment_rechnung = "Rechnung"}}
{{vtSet: s_payment_sofortueberweisung = "sofortüberweisung.de"}}
{{vtSet: s_payment_paypal = "PayPal"}}
+{{vtSet: s_payment_payrexx = "Payrexx"}}
{{vtSet: s_invoice_text_vorkasse = "Bitte überweisen Sie den Rechnungsbetrag auf unser unten angegebenes Konto." }}
{{vtSet: s_invoice_text_sepa = "Der Rechnungsbetrag wird wie vereinbart von Ihrem Konto eingezogen." }}
diff --git a/languages/en.txt b/languages/en.txt
index 97cff76..7505253 100644
--- a/languages/en.txt
+++ b/languages/en.txt
@@ -302,12 +302,14 @@ Regards,
{{vtSet: s_txt_0070 = "incl."}}
{{vtSet: s_txt_0071 = "plus"}}
{{vtSet: s_txt_0072 = "VAT"}}
+{{vtSet: s_txt_0073 = "Hello %1$s %2$s,"}}
{{vtSet: s_payment_vorkasse = "Prepayment"}}
{{vtSet: s_payment_sepa = "SEPA Direct Debit"}}
{{vtSet: s_payment_rechnung = "Invoice"}}
{{vtSet: s_payment_sofortueberweisung = "sofortüberweisung.de"}}
{{vtSet: s_payment_paypal = "PayPal"}}
+{{vtSet: s_payment_payrexx = "Payrexx"}}
{{vtSet: s_invoice_text_vorkasse = "Please transfer the invoiced amount to our bank account (see below)." }}
{{vtSet: s_invoice_text_sepa = "The invoiced amount will be debited from your bank account." }}
diff --git a/lib/image_processor.class.php b/lib/image_processor.class.php
index 9f2a67b..0c59ed1 100644
--- a/lib/image_processor.class.php
+++ b/lib/image_processor.class.php
@@ -131,12 +131,13 @@ class Image_Processor {
if ( $exif && isset( $exif['Orientation'] ) && isset( $angles[ $exif['Orientation'] ] ) )
{
- $imageNew = imagerotate( $imageNew, $angles[ $exif['Orientation'] ], 0 );
+ $imageRotated = imagerotate( $imageNew, $angles[ $exif['Orientation'] ], 0 );
}
}
imagedestroy( $this->image );
- $this->image = $imageNew;
+ unset( $this->image );
+ $this->image = isset( $imageRotated ) ? $imageRotated : $imageNew;
}
diff --git a/lib/pxtc_products.class.php b/lib/pxtc_products.class.php
new file mode 100644
index 0000000..2dedd27
--- /dev/null
+++ b/lib/pxtc_products.class.php
@@ -0,0 +1,270 @@
+query( $sql );
+ while ( $assortment = $result->fetch_assoc() ) {
+ $elements = json_decode( $assortment['liste'], TRUE );
+ self::$assortments[ $assortment['id'] ] = $elements;
+ foreach ( $elements as $element ) {
+ if ( ! empty( $element['product_id'] ) ) {
+ self::$productAssortments[ $element['product_id'] ][] = $assortment['id'];
+ }
+ }
+ }
+
+ // build lists of buyable products and assortments
+ $groups = empty( self::$options['userGroups'] ) ? array () : explode( ',', self::$options['userGroups'] );
+ $sql = "SELECT c.id, p.`benutzer`, p.`kennung`, p.`preis:num`, p.`zuordnung:num`, p.`typ`,
+ p.`bezeichnung`, p.`bezeichnung_en`, p.`beschreibung`, p.`beschreibung_en`, p.`preisanpassung`, p.`steuersatz`
+ FROM `%data_product` p LEFT JOIN `%content` c ON c.id = p.vtid
+ WHERE c.containerID = {$pageIdProducts}
+ ORDER BY IF( c.sortValue > 0, 0, 1 ), c.sortValue, p.bezeichnung";
+ $result = $db->query( $sql );
+ //if ( ! $result ){
+ // die( $db->error );
+ //}
+
+ while ( $product = $result->fetch_assoc() ) {
+ if ( ( empty( self::$options['paymentsPossible'] ) && $product['preis:num'] )
+ || ( empty( self::$options['deliveryPossible'] ) && strtolower( $product['typ'] ) == 'print' )
+ || ( ! empty( $product['benutzer'] ) && ! in_array( $product['benutzer'], $groups )
+ && ! ( $product['benutzer'] == 'guest' && empty( self::$options['userName'] ) )
+ && ! ( $product['benutzer'] == 'Alle' && ! empty( self::$options['userName'] ) ) )
+ ) {
+ continue; // Produkt ist generell nicht kaufbar
+ }
+ $prodId = (int) $product['id'];
+ self::$globalProducts[ $prodId ] = $product;
+ if ( $product['zuordnung:num'] ) {
+ // es ist ein automatisch zugeordnetes Produkt
+ self::$autoProducts[] = $prodId;
+ if ( empty( $product['kennung'] ) ) {
+ // es ist nicht von High-res-Datei abhängig
+ self::$allImagesBuyable = TRUE;
+ }
+ }
+ elseif ( ! isset( self::$productAssortments[ $prodId ] ) ) {
+ // Produkt ist keinem Sortiment zugeordnet
+ continue;
+ }
+ elseif ( empty( $product['kennung'] ) ) {
+ // Produkt ist nicht von High-res-Datei abhängig
+ // setze alle Sortimente, denen das Produkt zugeordnet ist, auf "generell kaufbar"
+ foreach ( self::$productAssortments[ $prodId ] as $assortmentId ) {
+ self::$assortmentsAlwaysBuyable[] = $assortmentId;
+ }
+ }
+ }
+ return array ( 'assortments' => self::$assortments, 'assortmentsAlwaysBuyable' => self::$assortmentsAlwaysBuyable,
+ 'globalProducts' => self::$globalProducts, 'autoProducts' => self::$autoProducts );
+ }
+
+ public static function get_offerings( $imageAssortment, $imageProducts, $galleryAssortment, $galleryProducts ){
+ $assortment = $imageAssortment == -1 ? NULL : (int) $imageAssortment;
+ $products = $imageProducts ? explode( "\n", $imageProducts ) : array ();
+ // Automatisch zugeordnete Produkte
+ if ( ! empty( self::$autoProducts ) ){
+ $products = array_merge( $products, self::$autoProducts );
+ }
+ // Galeriesortiment
+ if ( $imageAssortment == 0 ){
+ if ( $galleryAssortment == 0 ){
+ // Galerie hat kein Sortiment, sondern eigene Produktauswahl
+ $products = array_merge( $products, explode( "\n", $galleryProducts ) );
+ }
+ else {
+ $assortment = $galleryAssortment == -1 ? NULL : (int) $galleryAssortment;
+ }
+ }
+ return compact( 'assortment', 'products' );
+ }
+
+ public static function is_image_buyable( $imagePath, $imageAssortment, $imageProducts,
+ $galleryAssortment, $galleryProducts )
+ {
+ if ( self::$allImagesBuyable ) {
+ return TRUE;
+ }
+ if ( self::$noImageBuyable ) {
+ return FALSE;
+ }
+ $offerings = self::get_offerings( $imageAssortment, $imageProducts, $galleryAssortment, $galleryProducts );
+ $products = array ();
+ if ( isset( self::$assortments[ $offerings['assortment'] ] ) ){
+ if ( in_array( $offerings['assortment'], self::$assortmentsAlwaysBuyable ) ){
+ return TRUE;
+ }
+ foreach ( self::$assortments[ $offerings['assortment'] ] as $item ){
+ if ( ! empty( $item['product_id'] ) ){
+ $products[] = $item['product_id'];
+ }
+ }
+ }
+ $products = array_merge( $products, $offerings['products'] );
+ foreach ( $products as $product ) {
+ if ( isset( self::$globalProducts[ $product ] )
+ && ( self::$globalProducts[ $product ]['kennung'] == ''
+ || hires_file_exists( $imagePath, self::$globalProducts[ $product ]['kennung'] ) )
+ ) {
+ return TRUE;
+ }
+ }
+ return FALSE;
+ }
+
+
+ public static function get_products( $imageId, $imagePath, $imageAssortment, $imageProducts, $galleryAssortment, $galleryProducts ){
+ $products = array ();
+ $productIds = array ();
+ $offerings = self::get_offerings( $imageAssortment, $imageProducts, $galleryAssortment, $galleryProducts );
+ // prüfe Produkte des zugeordneten Sortiments
+ if ( isset( self::$assortments[ $offerings['assortment'] ] ) ) {
+ foreach ( self::$assortments[ $offerings['assortment'] ] as $item ){
+ if ( empty( $item['product_id'] ) && ! empty( $item['text'] ) ){
+ $products[] = array ( 'id' => 0, 'name' => $item['text'], 'name_en' => $item['text_en'] );
+ }
+ elseif ( empty( self::$globalProducts[ $item['product_id'] ]['kennung'] )
+ || hires_file_exists( $imagePath, self::$globalProducts[ $item['product_id'] ]['kennung'] )
+ ){
+ $products[] = self::get_product_record( $item['product_id'], $imageId );
+ $productIds[] = $item['product_id'];
+ }
+ }
+ }
+ // prüfe individuell zugeordnete Produkte
+ foreach ( $offerings['products'] as $productId ) {
+ if ( isset( self::$globalProducts[ $productId ] )
+ && ! in_array( $productId, $productIds )
+ && ( empty( self::$globalProducts[ $productId ]['kennung'] )
+ || hires_file_exists( $imagePath, self::$globalProducts[ $productId ]['kennung'] ) )
+ ) {
+ $products[] = self::get_product_record( $productId, $imageId );
+ $productIds[] = $productId;
+ }
+ }
+ // liefere Produktliste zurück
+ self::$lastProductsCount = count( $products );
+ return $products;
+ }
+
+
+ public static function get_cart_price( $prodId ){
+ if ( empty( self::$globalProducts[ $prodId ] ) ){
+ return FALSE;
+ }
+ if ( empty( self::$cart ) ){
+ return 0;
+ }
+ if ( is_null( self::$productQuantities ) ){
+ self::$productQuantities = array ();
+ foreach ( self::$cart as $item ){
+ self::$productQuantities[ $item['product'] ] =
+ isset( self::$productQuantities[ $item['product'] ] )
+ ? self::$productQuantities[ $item['product'] ] + $item['quantity']
+ : $item['quantity'];
+ }
+ }
+ $quantity = isset( self::$productQuantities[ $prodId ] )
+ ? self::$productQuantities[ $prodId ]
+ : 1;
+ $product = self::$globalProducts[ $prodId ];
+ $price = (float) $product['price'];
+ $factor = empty( self::$options['userPriceFactor'] )
+ ? 1
+ : (float) str_replace( ',', '.', self::$options['userPriceFactor'] );
+ if ( ! empty( $product['applyDiscount'] ) && ! empty( $product['discountScale'] ) ){
+ foreach ( $product['discountScale'] as $level ){
+ if ( $quantity >= $level['quantity'] ){
+ $price = (float) $level['price'];
+ }
+ }
+ }
+ if ( $product['applyUserPriceFactor'] && $factor != 1 ){
+ $price = $price * $factor;
+ }
+ if ( empty( self::$options['vatHandling'] ) || self::$options['vatHandling'] == 'excluded' ){
+ return $price;
+ }
+ $vatrate = self::$options[ $product['vatRate1'] == 2 ? 'vatRate2' : 'vatRate1' ];
+ return round( $price / ( 1 + $vatrate / 100 ), 2 );
+ }
+
+
+ public static function get_cart_quantity( $imageId, $prodId ){
+ if ( ! isset( self::$imageQuantities ) && ! empty( self::$cart ) ){
+ self::$imageQuantities = array ();
+ foreach ( self::$cart as $item ){
+ self::$imageQuantities[ $item['image'] ][ $item['product'] ] = $item['quantity'];
+ }
+ }
+ if ( isset( self::$imageQuantities[ $imageId ][ $prodId ] ) ){
+ return self::$imageQuantities[ $imageId ][ $prodId ];
+ }
+ return 0;
+ }
+
+
+ private static function get_product_record( $prodId, $imageId ){
+ if ( ! isset( self::$globalProducts[ $prodId ] ) ){
+ return FALSE;
+ }
+ $p = self::$globalProducts[ $prodId ];
+ return array (
+ 'id' => (int) $prodId,
+ 'name' => ! empty( self::$options['preferEnglish'] ) && ! empty( $p['bezeichnung_en'] ) ? $p['bezeichnung_en'] : $p['bezeichnung'],
+ 'type' => $p['typ'],
+ 'description' => ! empty( self::$options['preferEnglish'] ) && ! empty( $p['beschreibung_en'] ) ? $p['beschreibung_en'] : $p['beschreibung'],
+ 'price' => $p['preis:num'],
+ 'applyUserPriceFactor' => ! empty( $p['preisanpassung'] ),
+ 'vatRate' => (int) $p['steuersatz'],
+ 'applyDiscount' => ! empty( $p['rabatt_anwenden'] ),
+ 'discountScale' => empty( $p['rabattstaffel'] )
+ ? NULL
+ : json_decode( $p['rabattstaffel'] ),
+ 'cartVatRate' => self::$options[ $p['steuersatz'] == 2 ? 'vatrate2' : 'vatrate1' ],
+ 'cartQuantity' => self::get_cart_quantity( $imageId, $prodId ),
+ );
+ }
+}
+
+// end of file pxtc_products.class.php
+
diff --git a/lightbox.download.html b/lightbox.download.html
index 65fb3b4..324a4ba 100644
--- a/lightbox.download.html
+++ b/lightbox.download.html
@@ -88,7 +88,7 @@
{{vtEndIf}}
{{vtIf: {vtGet:File} .neq. .and. {vtGetValue:rule} .eq. }}
- {{vtCalc: substr( '{vtGet:File,raw}', 0, -3 ) }}
+ {{vtCalc: substr( '{vtGet:File,raw}', 0, strrpos( '{vtGet:File,raw}', '.' ) ) . '.' }}
{{vtSet: BaseName }}
{{vtIf: {vtConfig:pxtcHiresSuffixes} .neq. }}
{{vtSet: Suffixes = "{vtConfig:pxtcHiresSuffixes}" }}
diff --git a/modules/PmConnector.class.php b/modules/PmConnector.class.php
index b4493e3..03e2868 100644
--- a/modules/PmConnector.class.php
+++ b/modules/PmConnector.class.php
@@ -609,7 +609,14 @@ class PmConnector {
$value = str_replace( array( 'oe', 'ö' ), '(oe|ö)', $value );
$value = str_replace( array( 'ue', 'ü' ), '(ue|ü)', $value );
$value = str_replace( array( 'ss', 'ß' ), '(ss|ß)', $value );
- $str .= " REGEXP '[[:<:]]{$value}[[:>:]]' ";
+ if ( $this->db->server_version < 80000 )
+ {
+ $str .= " REGEXP '[[:<:]]{$value}[[:>:]]' ";
+ }
+ else
+ {
+ $str .= " REGEXP '\\\\b{$value}\\\\b' ";
+ }
break;
case 'equal':
$str = " = '$value' ";
@@ -731,7 +738,7 @@ class PmConnector {
}
$row = $result->fetch_assoc();
- $data = unserialize( $row['data'] );
+ $data = $row['data'][0] == '{' ? json_decode( $row['data'], TRUE ) : unserialize( $row['data'] );
$this->globals = $data['globals'];
return TRUE;
}
diff --git a/modules/PmConnector_xml3.class.php b/modules/PmConnector_xml3.class.php
index a555b8b..b83a722 100644
--- a/modules/PmConnector_xml3.class.php
+++ b/modules/PmConnector_xml3.class.php
@@ -72,6 +72,8 @@ class PmConnector {
function connect( $request )
{
+ $this->request = $request;
+
if ( is_object( $this->db ) && get_class( $this->db ) == 'mysqli' )
{
return TRUE;
@@ -97,7 +99,6 @@ class PmConnector {
return FALSE;
}
- $this->request = $request;
return TRUE;
}
@@ -340,16 +341,12 @@ class PmConnector {
$result->free();
$resArray = array( '1' => 'thumb', '2' => 'preview', '3' => 'highres' );
- if ( ! in_array( $resolution, $resArray ) )
+ if ( ! isset( $resArray[ $resolution ] ) )
{
- if ( ! isset( $resArray[ $resolution ] ) )
- {
- return -3;
- }
-
- $resolution = $resArray[ $resolution ];
+ return -3;
}
+ $resolution = $resArray[ $resolution ];
$type = $download ? 'download' : 'view';
if ( ! $this->get_permission( $ref, $resolution, $type ) )
@@ -653,7 +650,14 @@ class PmConnector {
$value = str_replace( array( 'oe', 'ö' ), '(oe|ö)', $value );
$value = str_replace( array( 'ue', 'ü' ), '(ue|ü)', $value );
$value = str_replace( array( 'ss', 'ß' ), '(ss|ß)', $value );
- $str .= " REGEXP '[[:<:]]{$value}[[:>:]]' ";
+ if ( $this->db->server_version < 80000 )
+ {
+ $str .= " REGEXP '[[:<:]]{$value}[[:>:]]' ";
+ }
+ else
+ {
+ $str .= " REGEXP '\\\\b{$value}\\\\b' ";
+ }
break;
case 'equal':
$str = " = '$value' ";
@@ -775,7 +779,7 @@ class PmConnector {
}
$row = $result->fetch_assoc();
- $data = unserialize( $row['data'] );
+ $data = $row['data'][0] == '{' ? json_decode( $row['data'], TRUE ) : unserialize( $row['data'] );
$this->globals = $data['globals'];
return TRUE;
}
diff --git a/order._onchange.html b/order._onchange.html
index cb1124c..2df7672 100644
--- a/order._onchange.html
+++ b/order._onchange.html
@@ -48,8 +48,10 @@
{{vtInclude: includes/initialize.html }}
{{vtIf: {Anrede} .eq. Frau }}
{{vtCalc: sprintf( '{vtGet:s_txt_0055,escaped}', '{Vorname:escaped}', '{Name:escaped}' ) }}
- {{vtElse}}
+ {{vtElseIf: {Anrede} .eq. Herr }}
{{vtCalc: sprintf( '{vtGet:s_txt_0054,escaped}', '{Vorname:escaped}', '{Name:escaped}' ) }}
+ {{vtElse}}
+ {{vtCalc: sprintf( '{vtGet:s_txt_0073,escaped}', '{Vorname:escaped}', '{Name:escaped}' ) }}
{{vtEndIf}}
{{vtSet: Anredezeile }}
{{vtIf: {vtGet:Language} .eq. en}}
diff --git a/order.html b/order.html
index 1de736f..1931ad0 100644
--- a/order.html
+++ b/order.html
@@ -4,7 +4,7 @@
-
+
Bestellung {{Nummer}} | {{vtGlobal:siteName}}
{{vtInclude: includes/html_headers_internal.html }}
@@ -35,7 +35,7 @@
- Bearbeitung fortsetzen |
+ Bearbeitung fortsetzen |
Bearbeitung beenden
@@ -303,7 +306,7 @@
| Anschrift |
- {{Anrede}} {{Vorname}} {{Name}}
+ {{Anrede}} {{Vorname}} {{Name}}
{{Firma}}
@@ -366,7 +369,7 @@
|
{{vtItem:filename}}
- {{vtItem:folder}}
+ {{vtItem:folder}}
{{vtItem:title}}
{{vtItem:quantity}} Stck. à {{vtItem:price|num-en:2}} {{Waehrung}}
|
@@ -406,7 +409,7 @@
{{vtItem:filename}}
- {{vtItem:folder}}
+ {{vtItem:folder}}
{{vtItem:title}}
|
diff --git a/order.invoice_pdf.html b/order.invoice_pdf.html
index ebd1da7..f517b67 100644
--- a/order.invoice_pdf.html
+++ b/order.invoice_pdf.html
@@ -6,6 +6,7 @@
$dompdf = new Dompdf\Dompdf();
$dompdf->loadHtml( v::vtget('HTML,raw') );
$dompdf->setPaper('A4');
+ $dompdf->getOptions()->setChroot( v::vtconfig('pathToVirthos') );
$dompdf->render();
$dompdf->stream( 'Rechnung-' . v::vtpage('Rechnungsnummer') . '.pdf', array( 'Attachment' => 0 ) );
?>
diff --git a/order.pxprint.html b/order.pxprint.html
index 7d9d2bf..a3a05c9 100644
--- a/order.pxprint.html
+++ b/order.pxprint.html
@@ -1,3 +1,23 @@
+
{{vtScript}}
## Bestelldaten an pxprint.net übertragen, falls noch nicht geschehen
@@ -16,10 +36,10 @@
## stelle Liste der Produkte zusammen, die über pxprint.net produziert werden sollen
- {{vtSet: Items = "" }}
+ {{vtSet: Items = "", Item = "" }}
{{vtRepeat:{Warenkorb:raw} }}
- {{vtIf: {vtItem:pxprint_id} .gt. 0 }}
+ {{vtIf: {vtItem:pxprint_id} .neq. }}
{{vtSet: Item[copies]="{vtItem:quantity}"}}
{{vtSet: Item[filename]="{vtItem:filename}"}}
@@ -34,7 +54,12 @@
{{vtEndIf}}
{{vtRepeat: ,{vtItem:pxprint_id} }}
- {{vtSet: Item[product_id]="{vtItem}"}}
+ {{vtIf: {vtItem} .cn. | }}
+ {{vtCalc: getPreferredProduct( '{vtItem:escaped}' ) }}
+ {{vtSet: Item[product_id]="{vtResult}"}}
+ {{vtElse}}
+ {{vtSet: Item[product_id]="{vtItem}"}}
+ {{vtEndIf}}
{{vtSet: Items[]="{vtGet:Item}"}}
{{vtEndRepeat}}
diff --git a/order.send_confirmation.html b/order.send_confirmation.html
index d3a386d..fed9302 100644
--- a/order.send_confirmation.html
+++ b/order.send_confirmation.html
@@ -13,8 +13,10 @@
{{vtIf: {Order_Confirmation_Salutation} .eq. 1 }}
{{vtIf: {vtGet:Anrede} .eq. Frau }}
{{vtCalc: sprintf( '{vtGet:s_txt_0055,escaped}', '{vtGet:Vorname,escaped}', '{vtGet:Name,escaped}' ) }}
- {{vtElse}}
+ {{vtElseIf: {vtGet:Anrede} .eq. Herr }}
{{vtCalc: sprintf( '{vtGet:s_txt_0054,escaped}', '{vtGet:Vorname,escaped}', '{vtGet:Name,escaped}' ) }}
+ {{vtElse}}
+ {{vtCalc: sprintf( '{vtGet:s_txt_0073,escaped}', '{vtGet:Vorname,escaped}', '{vtGet:Name,escaped}' ) }}
{{vtEndIf}}
{{vtSet: Anredezeile }}
{{vtEndIf}}
diff --git a/orderlist.html b/orderlist.html
index 32668c2..9593e4f 100644
--- a/orderlist.html
+++ b/orderlist.html
@@ -4,8 +4,10 @@
+
+
- Liste der Bestellungen | {{vtGlobal:siteName}}
+ {{Titel:short}} | {{vtGlobal:siteName}}
{{vtInclude: includes/html_headers_internal.html }}
-
+
|
+
+ | |
+
|
+ | |
+
+ | Payrexx |
+
+
+ |
+
+
+ | |
+
+
+ |
+
+
| |
|
diff --git a/setup_privileges.vtedit.html b/setup_privileges.vtedit.html
index 6a807a0..505e9bb 100644
--- a/setup_privileges.vtedit.html
+++ b/setup_privileges.vtedit.html
@@ -357,7 +357,7 @@
Selbstregistrierung
Wenn Sie die Selbstregistrierung für eine bestimmte Gruppe aktivieren, blendet Pixtacy auf jeder Seite einen Link zum
- Registrierungsformular ein. Über dieses Formular können sich Besucher selbst
+ Registrierungsformular ein. Über dieses Formular können sich Besucher selbst
ein Benutzerkonto mit eigenem Anmeldenamen und Passwort anlegen.
Das Konto wird automatisch der gewählten Gruppe zugeordnet, und Sie werden per E-Mail benachrichtigt.
Die automatische Freigabe sorgt dafür, dass sich ein Besucher sofort nach der Registrierung
diff --git a/setup_search.html b/setup_search.html
index dd2a7ee..f9ad11b 100644
--- a/setup_search.html
+++ b/setup_search.html
@@ -103,6 +103,10 @@
nach Titel
nach Aufnahmedatum
+
+ nach Bewertung
+
+ nach Aufnahmetag + Bewertung
manuell
diff --git a/setup_search.vtedit.html b/setup_search.vtedit.html
index dc86179..32285cb 100644
--- a/setup_search.vtedit.html
+++ b/setup_search.vtedit.html
@@ -195,6 +195,8 @@
+
+