Index: /changelog
===================================================================
--- /changelog	(revision 6681)
+++ /changelog	(revision 6683)
@@ -18,2 +18,6 @@
 - Feature - Anzeige von angepassten Templates auf der "Über" Seite (Wenn Userviews aktiv)
 - Feature - Produkttemplates werden jetzt auch im Child Theme gesucht und verwendet
+- Feature - Darstellung PayPalPlus Bestellbackend
+- Feature - Darstellung Trusted Shops Bestellbackend
+- Feature - Bestelldaten in Kopf der Bestellansicht
+- Feature - Kundenkommentar in Bestallansicht
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6681)
+++ /controller/wpsg_ShopController.class.php	(revision 6683)
@@ -1261,4 +1261,19 @@
                             __('<b>wpShopGermany:</b> Sprachdatei kann nicht geschrieben werden! PrÃŒfen Sie die Schreibrechte auf folgender Datei:<br /><b>#1#</b>', 'wpsg'),
                             WPSG_PATH_TRANSLATION
+                        )
+                    );
+
+                }
+
+                // WÀhrungscode
+                if ($this->get_option('wpsg_currency') === '')
+                {
+
+                    $arData[] = array(
+                        'wpsg_currency',
+                        self::CHECK_ERROR,
+                        wpsg_translate(
+                            __('Kein WÀhrungscode definiert, dies kann zu Darstellungsproblemen und möglicherweise Abmahnungen fÌhren. Sie können dies <a href="#1#">hier</a> konfigurieren.', 'wpsg'),
+                            WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin'
                         )
                     );
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 6681)
+++ /views/css/admin.css	(revision 6683)
@@ -192,5 +192,6 @@
 .wpsg_productview_backend-sold-out { color:#dc3232; font-weight:700; }
 .wpsg_productview_backend-available { color:#7ad03a; font-weight:700; float:left; margin-right:5px; }
-.wpsg_top_productname { line-height:50px; margin-left:15px; }
+.wpsg_top_extend { line-height:50px; margin-left:15px; }
+.wpsg_top_extend .commenticon { cursor:default; display:inline-block; margin:0px !important; padding-right:0px; }
 
 /* Bewertung */
@@ -218,4 +219,5 @@
 .wpsg_order .col_nr .glyphicon { margin-top:5px; font-size:1.2em; margin-right:5px; text-decoration:none; }
 .wpsg_order .col_nr .glyphicon.shippingadress { color:red; }
+.wpsg_top_extend .commenticon.admincomment,
 .wpsg_order .col_nr .glyphicon.admincomment { color:red; }
 .wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; }
Index: /views/mods/mod_paypalapi/order_view_afterpayment.phtml
===================================================================
--- /views/mods/mod_paypalapi/order_view_afterpayment.phtml	(revision 6681)
+++ /views/mods/mod_paypalapi/order_view_afterpayment.phtml	(revision 6683)
@@ -8,32 +8,22 @@
 
 <?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'))) { ?>
-	
-	<div class="wpsg_form_field ">
-		<div class="wpsg_form_left">
-			<label for=""><?php echo __('PaymentID', 'wpsg'); ?>: [<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refresh&edit_id=<?php echo $this->view['oOrder']->id; ?>"><?php echo __('Status Aktualisieren', 'wpsg'); ?></a>]</label>
-		</div>
-		<div class="wpsg_form_right">
-			<p class="" id=""><?php echo wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentstate')); ?></p>
-		</div>
-		<div class="wpsg_clear"></div>
-	</div>
-		
+
+	<?php echo wpsg_drawForm_Text(
+		wpsg_translate(
+			__('PaymentID [<a href="#1#">Status Aktualisieren</a>]', 'wpsg'),
+			WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refresh&edit_id='.$this->view['oOrder']->id
+		),
+		wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentstate'))
+	); ?>
+
 <?php } ?>
 
 <?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'))) { ?>
 
-	<div class="wpsg_form_field ">
-		<div class="wpsg_form_left">
-			<label for=""><?php echo __('SaleID', 'wpsg'); ?>:</label>
-		</div>
-		<div class="wpsg_form_right">
-			<p class="" id=""><?php echo wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate')); ?></p>
-		</div>
-		<div class="wpsg_clear"></div>
-	</div>
+	<?php echo wpsg_drawForm_Text(__('SaleID', 'wpsg'), wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate'))); ?>
 	
 	<?php if ($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate') != 'refunded') { ?>
 	<br />
-	<a onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refund&edit_id=<?php echo $this->view['data']['id']; ?>"><?php echo __('Zahlung rÃŒckerstatten (Refund Call)', 'wpsg'); ?></a>
+	<a onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refund&edit_id=<?php echo $this->view['data']['id']; ?>"><?php echo __('Zahlung rÃŒckerstatten', 'wpsg'); ?></a>
 	<?php } ?> 	
 	 	
Index: /views/mods/mod_trustedshops/order_view_sidebar.phtml
===================================================================
--- /views/mods/mod_trustedshops/order_view_sidebar.phtml	(revision 6681)
+++ /views/mods/mod_trustedshops/order_view_sidebar.phtml	(revision 6683)
@@ -5,24 +5,13 @@
 	 */
 
-?> 
-<div class="postbox" id="wpsg_trustedshops">
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Trusted Shops', 'wpsg'); ?></span>
-	</h3> 
-	<div class="inside">
-		
-		<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_set', __('Einwilligung', 'wpsg'), (($this->view['data']['wpsg_mod_trustedshops_set'] == '1')?__('Ja', 'wpsg'):__('Nein', 'wpsg')), array('text' => true, 'help' => 'wpsg_mod_trustedshops_set')); ?>
-		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				
-			</div>
-			<div class="wpsg_form_right">
-				<a onclick="if (!confirm('<?php echo __('Der Kunde erhÀlt eine Mail mit einem Link zur Bewertung der Bestellung. Sind Sie sich sicher?', 'wpsg'); ?>')) return false;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_trustedshops&edit_id=<?php echo $this->view['data']['id']; ?>&do=mail"><?php echo __('E-Mail mit Bewertungslink senden', 'wpsg'); ?></a>										
-			</div>
-		</div>
-		<div class="wpsg_clear"></div>
-		
-	</div>
-</div>
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Trusted Shps', 'wpsg')); ?>
+
+	<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_set', __('Einwilligung', 'wpsg'), (($this->view['data']['wpsg_mod_trustedshops_set'] == '1')?__('Ja', 'wpsg'):__('Nein', 'wpsg')), array('text' => true, 'help' => 'wpsg_mod_trustedshops_set')); ?>
+
+	<br />
+
+	<a onclick="if (!confirm('<?php echo __('Der Kunde erhÀlt eine Mail mit einem Link zur Bewertung der Bestellung. Sind Sie sich sicher?', 'wpsg'); ?>')) return false;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_trustedshops&edit_id=<?php echo $this->view['data']['id']; ?>&do=mail"><?php echo __('E-Mail mit Bewertungslink senden', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
Index: /views/order/view.phtml
===================================================================
--- /views/order/view.phtml	(revision 6681)
+++ /views/order/view.phtml	(revision 6683)
@@ -15,6 +15,19 @@
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav">
-					<li role="presentation" class="active <?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __("BestellÃŒbersicht", "wpsg"); ?></a></li>
+					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __("BestellÃŒbersicht", "wpsg"); ?></a></li>
 					<li role="presentation" class="wpsg_showhide_filter active"><a onclick="return false;"><?php echo __("Bestellansicht (Detail)", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg_top_extend">
+
+						<?php echo $this->view['oOrder']->getInvoiceFirstName().' '.$this->view['oOrder']->getInvoiceName().' / '.wpsg_ff($this->view['oOrder']->getAmount($this->getBackendTaxview()), $this->get_option('wpsg_currency')); ?>
+
+						<?php if (trim($this->view['oOrder']->admincomment) != "") { ?>
+							<a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($this->view['oOrder']->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign commenticon admincomment" href="#"></a>
+						<?php } ?>
+
+						<?php if (trim($this->view['oOrder']->comment) != "") { ?>
+							<a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($this->view['oOrder']->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign commenticon customercomment" href="#"></a>
+						<?php } ?>
+
+					</li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
Index: /views/order/view_general.phtml
===================================================================
--- /views/order/view_general.phtml	(revision 6681)
+++ /views/order/view_general.phtml	(revision 6683)
@@ -16,4 +16,16 @@
 
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<?php $comment = $this->view['oOrder']->comment; if (wpsg_isSizedString($comment)) { ?>
+
+	<?php echo wpsg_drawForm_AdminboxStart(__('Bestellkommentar (Kunde)', 'wpsg')); ?>
+
+	<p>
+		<?php echo $comment; ?>
+	</p>
+
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<?php } ?>
 
 <?php echo wpsg_drawForm_AdminboxStart(__('StatusÀnderung', 'wpsg')); ?>
Index: /views/produkt/addedit.phtml
===================================================================
--- /views/produkt/addedit.phtml	(revision 6681)
+++ /views/produkt/addedit.phtml	(revision 6683)
@@ -19,5 +19,5 @@
 					<li role="presentation" class="active"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("ProduktÃŒbersicht", "wpsg"); ?></a></li>
 					<li role="presentation" class="wpsg_showhide_filter active"><a href="#" onclick="return false;"><?php echo __("Produkte anlegen/bearbeiten", "wpsg"); ?></a></li>
-					<li role="presentation" class="wpsg_top_productname">
+					<li role="presentation" class="wpsg_top_extend">
 						<?php echo $this->view['oProduct']->getProductName(); ?>
 					</li>