Index: /changelog
===================================================================
--- /changelog	(revision 7061)
+++ /changelog	(revision 7065)
@@ -139,2 +139,3 @@
 - Feature: Satolo Newsletter-Registrierung mittels Double-OptIn
 - Feature: Satolo Newsletter-Abonnenten in gewÀhlte Liste integrieren
+- Feature: Trackinganbieter in Versandart auswÀhlbar
Index: /views/mods/mod_packagetracking/order_view_switchStatus.phtml
===================================================================
--- /views/mods/mod_packagetracking/order_view_switchStatus.phtml	(revision 7061)
+++ /views/mods/mod_packagetracking/order_view_switchStatus.phtml	(revision 7065)
@@ -10,5 +10,5 @@
 	$tcode = $this->view['wpsg_mod_packagetracking']['oOrder']->wpsg_mod_packagetracking_code;
 	$prov = array();
-	foreach ($this->view['wpsg_mod_packagetracking']['provider'] as $p) $prov[] = $p['name'];
+	foreach ($this->view['wpsg_mod_packagetracking']['provider'] as $p) $prov[$p['id']] = $p['name'];
 
 	echo wpsg_drawForm_Input('wpsg_mod_packagetracking_code', __('Tracking-ID', 'wpsg'), $tcode);
Index: /views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml
===================================================================
--- /views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml	(revision 7061)
+++ /views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml	(revision 7065)
@@ -8,5 +8,4 @@
 
 <tr class="wpsg_mod_versandarten_packagetracking">
-	<td class="wpsg_label"><?php echo __('Anbieter fÃŒr Paketverfolgung', 'wpsg'); ?>:</td>
 	<td class="wpsg_value">
 		<select name="wpsg_mod_packagetracking_provider" class="wpsg_mod_packagetracking_provider" id="wpsg_mod_packagetracking_providerselect_<?php echo $this->view['wpsg_mod_packagetracking']['va']['id']; ?>">
Index: /views/mods/mod_versandarten/list.phtml
===================================================================
--- /views/mods/mod_versandarten/list.phtml	(revision 7061)
+++ /views/mods/mod_versandarten/list.phtml	(revision 7065)
@@ -178,4 +178,12 @@
 			} );
         /* ]]> */</script>
+		
+		<?php /* Paketverfolgung */ ?>
+		<?php if ($this->hasMod('wpsg_mod_packagetracking') == '1') { ?>
+			<?php echo wpsg_drawForm_TextStart(); ?>
+				<?php $this->callMods('wpsg_mod_versandarten_listrow', [&$va]);  ?>
+       	 	<?php echo wpsg_drawForm_TextEnd(__('Paketverfolgung', 'wpsg')); ?>
+       	<?php } ?>
+        
 	</div>
 	<?php if ($i == sizeof($this->view['data'])) { ?><hr /><?php } ?>