From 650506b12320fc150a5b667f7e8434e7e318ee76 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Fri, 29 Sep 2017 12:33:26 +0000
Subject: - Rechtschreibkorrektur, Vereinfachung, Bugfix

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6559 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_kundenverwaltung/index.phtml |  2 +-
 views/order/index.phtml                     |  2 +-
 views/warenkorb/ajaxDialog.phtml            | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index 37c11c5..32980d7 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -15,7 +15,7 @@
 			</div>
 			<div class="collapse navbar-collapse" id="bs-customer-navbar-collapse-1">
 				<ul class="nav navbar-nav">
-					<li role="presentation" class="wpsg-customer-tab-a active"><a href="#" onclick="return false;"><?php echo wpsg_translate(__("Kundenverwaltung (#1# Kunden)", "wpsg"), $this->view['countAll']); ?></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-Customer" onclick="return false;"><?php echo wpsg_translate(__("Kundenverwaltung (#1# Kunden)", "wpsg"), $this->view['countAll']); ?></a></li>
 					<li role="presentation" class="wpsg-customer-tab-a wpsg_showhide_filter <?php echo ((wpsg_isTrue($this->view['hasFilter']))?'activexxxx':''); ?>" id="wpsg-customer-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
                     <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
                     
diff --git a/views/order/index.phtml b/views/order/index.phtml
index 042590e..982a131 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -18,7 +18,7 @@
 			</div>
 			<div class="collapse navbar-collapse" id="wpsg-bs-headermenu">
 				<ul class="nav navbar-nav">
-					<li role="presentation" class="wpsg-order-tab-a active"><a href="#" onclick="return false;"><?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" onclick="return false;"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
 					<li role="presentation" class="wpsg_showhide_filter wpsg-order-tab-a <?php echo (($this->view['hasFilter'] === true)?'activexxxx':''); ?>" id="wpsg-order-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
                     <?php foreach ($this->view['tabs']['left'] as $k => $tab) { ?>
                     <li role="presentation" class="wpsg-order-tab-a wpsg-order-tab-mods" id="wpsg-order-tab-<?php echo $k; ?>"><a href="#" onclick="return false;"><span class="<?php echo $tab['tab_icon']; ?>"></span><?php echo $tab['tab_title']; ?></a></li>
diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml
index 02a2941..eea0f7c 100644
--- a/views/warenkorb/ajaxDialog.phtml
+++ b/views/warenkorb/ajaxDialog.phtml
@@ -39,10 +39,15 @@
 			); ?>
 			<br />
 			<?php echo wpsg_translate(
-				__('Im Warenkorb befinden sich jetzt #1# Produkt(e) zu #2#.', 'wpsg'),
-				$arBasket['menge'],
+				__('Im Warenkorb befinden sich jetzt #1# Produkt(e).', 'wpsg'),
+				$arBasket['menge']
+			); ?>
+			<br />
+			<?php echo wpsg_translate(
+				__('Der Gesamtpreis (inkl. Versand) bebeträgt jetzt #1#.', 'wpsg'),
 				wpsg_ff($arBasket['sum']['preis_gesamt'], $this->get_option('wpsg_currency'))
 			); ?>
+			
 		</div>
 		<div class="wpsg_clear"></div>
 		<?php /* Preisanzeige ENDE */ ?>
@@ -102,6 +107,4 @@
 	<?php /* Zubehörprodukte ENDE*/?>
 	
 	<div class="wpsg_clear"></div>
-</div>
-
- 
\ No newline at end of file
+</div>
\ No newline at end of file
-- 
cgit v1.2.3