Index: /mods/mod_gutschein/wpsg_voucher.php
===================================================================
--- /mods/mod_gutschein/wpsg_voucher.php	(revision 6673)
+++ /mods/mod_gutschein/wpsg_voucher.php	(revision 6675)
@@ -70,4 +70,36 @@
         }
 
+        public function getStatus()
+        {
+        	
+        	if ($this->multi === '1')
+        	{
+        		
+        		if (current_time('timestamp') < strtotime($this->start_date) || current_time('timestamp') > strtotime($this->end_date))
+        		{
+        			
+        			if ($this->getUsed() > 0) return 2;   //('Verbraucht', 'wpsg');
+        			else return 1; 	//('Inaktiv', 'wpsg');
+        			
+        		}
+        		else return 0;	//__('Aktiv', 'wpsg');
+        		
+        	}
+        	else
+        	{
+        		
+        		if ($this->getUsed() > 0) return 2;	//('Verbraucht', 'wpsg');
+        		else
+        		{
+        			
+        			if (current_time('timestamp') < strtotime($this->start_date) || current_time('timestamp') > strtotime($this->end_date)) return 1; 	//('Inaktiv', 'wpsg');
+        			else return 0; 	//('Aktiv', 'wpsg');
+        			
+        		}
+        		
+        	}
+        	
+        }
+        
         public function delete()
         {
Index: /mods/wpsg_mod_gutschein.class.php
===================================================================
--- /mods/wpsg_mod_gutschein.class.php	(revision 6673)
+++ /mods/wpsg_mod_gutschein.class.php	(revision 6675)
@@ -60,5 +60,6 @@
 			$this->shop->checkDefault('wpsg_mod_gutschein_size', '10');
 			$this->shop->checkDefault('wpsg_mod_gutschein_perPage', '25');
-
+			$this->shop->checkDefault('wpsg_mod_gutschein_active', '1');
+			
 		} // public function install()
 
@@ -1156,5 +1157,6 @@
 			$this->shop->update_option('wpsg_mod_gutschein_size', $_REQUEST['wpsg_mod_gutschein_size']);
 			$this->shop->update_option('wpsg_mod_gutschein_perPage', $_REQUEST['wpsg_mod_gutschein_perPage']);
-
+			$this->shop->update_option('wpsg_mod_gutschein_active', $_REQUEST['wpsg_mod_gutschein_active']);
+			
 		} // public function settings_save()
 
Index: /views/mods/mod_gutschein/index.phtml
===================================================================
--- /views/mods/mod_gutschein/index.phtml	(revision 6673)
+++ /views/mods/mod_gutschein/index.phtml	(revision 6675)
@@ -17,5 +17,14 @@
 			<div class="collapse navbar-collapse" id="bs-customer-navbar-collapse-1">
 				<ul class="nav navbar-nav">
-					<li role="presentation" class="wpsg-voucher-tab-a active"><a href="#" onclick="return false;"><?php echo wpsg_translate(__("Gutscheinverwaltung (#1# Gutscheine)", "wpsg"), $this->view['countAll']); ?></a></li>
+					<?php
+						$cnt = 0;
+						if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) {
+	                        foreach ($this->view['arData'] as $oVoucher) {
+	                        	if (($this->get_option('wpsg_mod_gutschein_active') == '1') && ($oVoucher->getStatus() > 0)) $cnt=$cnt;
+	                        	else $cnt++;
+	                        }
+						}
+					?>
+					<li role="presentation" class="wpsg-voucher-tab-a active"><a href="#" onclick="return false;"><?php echo wpsg_translate(__("Gutscheinverwaltung (#1# Gutscheine)", "wpsg"), $cnt); ?></a></li>
 					<li role="presentation" class="wpsg-voucher-tab-a wpsg_showhide_filter <?php echo (($this->view['hasFilter'])?'active':''); ?>" id="wpsg-voucher-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-Voucher&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("HinzufÃŒgen", "wpsg"); ?></a></li>
@@ -72,4 +81,5 @@
                     <tbody>
                         <?php foreach ($this->view['arData'] as $oVoucher) { ?>
+                        <?php if (($this->get_option('wpsg_mod_gutschein_active') == '1') && ($oVoucher->getStatus() > 0)) continue; ?>
                         <tr>
                             <td class="col_checkbox">
Index: /views/mods/mod_gutschein/settings_edit.phtml
===================================================================
--- /views/mods/mod_gutschein/settings_edit.phtml	(revision 6673)
+++ /views/mods/mod_gutschein/settings_edit.phtml	(revision 6675)
@@ -8,2 +8,3 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_size', __('LÀnge der Gutscheincodes', 'wpsg'), $this->get_option('wpsg_mod_gutschein_size'), array ('help' => 'wpsg_mod_gutschein_size')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_perPage', __('Gutscheine pro Seite (Backend)', 'wpsg'), $this->get_option('wpsg_mod_gutschein_perPage'), array ('help' => 'wpsg_mod_gutschein_perPage')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_active', __('Nur aktive Gutscheine anzeigen (Backend)', 'wpsg'), $this->get_option('wpsg_mod_gutschein_active'), array ('help' => 'wpsg_mod_gutschein_active')); ?>
Index: /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
===================================================================
--- /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml	(revision 6673)
+++ /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml	(revision 6675)
@@ -73,6 +73,6 @@
     ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
     <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?><br />
-    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($this->view['shipping_country']['kuerzel']); ?><br />
-
+	<?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
+    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($lk); ?><br />
     <a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_shipping_edit" href="#" title="<?php echo __('Lieferanschrift Àndern', 'wpsg'); ?>">
         <span class="glyphicon glyphicon-pencil"></span>
Index: /views/order/view_orderdata.phtml
===================================================================
--- /views/order/view_orderdata.phtml	(revision 6673)
+++ /views/order/view_orderdata.phtml	(revision 6675)
@@ -596,5 +596,5 @@
 			productinfos : <?php  echo json_encode($this->view['basket']['produkte'], JSON_FORCE_OBJECT); ?>,
 			mwstinfos : <?php  echo json_encode(wpsg_tax_groups(true), JSON_FORCE_OBJECT); ?>,
-			allproductinfos : <?php echo json_encode($this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_PRODUCTS)."` WHERE `deleted` != '1'"), JSON_FORCE_OBJECT); ?>,
+			allproductinfos : <?php echo json_encode($this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_PRODUCTS)."` WHERE `deleted` != '1' ORDER BY `name`"), JSON_FORCE_OBJECT); ?>,
 			mwst1 : <?php  echo json_encode($this->view['basket']['mwst'], JSON_FORCE_OBJECT); ?>,
         	noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>',