Anpassungen Shop V3 an V4

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5877 0d5edaf7-2b12-4e95-93f4-047927463d4b

13 files changed, 73 insertions, 168 deletions

diff --git a/views/admin/customerpreset.phtml b/views/admin/customerpreset.phtml
deleted file mode 100644
index 128c2ac..0000000
--- a/views/admin/customerpreset.phtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php

-

-	/**

-	 * Template für die Kundenvoreinstellungen im Backend

-	 */

-

-?>

-<div class="wpsg_admin_submenu">

-	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

-		<?php } ?>

-	</ul>

-			

-</div>

-

-<div class="wpsg_admin_content">

-	

-	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;noheader=1&amp;subaction=<?php echo $_REQUEST['subaction']; ?>">

-

-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_shipping', __('Standard Versandart', 'wpsg'), $this->view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?>

-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_payment', __('Standard Zahlungsart', 'wpsg'), $this->view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?>

-		<?php echo wpsg_drawForm_Select('wpsg_defaultland', __('Standardland', 'wpsg'), $this->view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => 

-			'nohspc_'.wpsg_translate(__('Die Länder können in der <a href="#1#">Länderverwaltung</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender')		

-		)); ?>

-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_title', __('Standardanrede', 'wpsg'), $this->view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title',

-			'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den <a href="#1#">Kundendaten</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'),

-			'noIndex' => true 

-		)); ?>

-		

-		<br />

-				

-		<input class="button-primary" type="submit" name="wpsg-submit" value="<?php echo __('Speichern', 'wpsg'); ?>" />

-	

-	</form>

-	

-</div>
\ No newline at end of file
diff --git a/views/css/admin.css b/views/css/admin.css
index 89707d1..b402cf3 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -209,6 +209,7 @@
 

 /* Modul Gutschein */

 #wpsg-bs.wpsg_voucher .col_checkbox { width:20px; }

+.wpsg_mod_voucher_fieldtable { font-size:12px; }

 

 /* Modul Lieferschein */

 .wpsg_mod_deliverynote_fieldtable { font-size:12px; }

diff --git a/views/mods/mod_ordercondition/list.phtml b/views/mods/mod_ordercondition/list.phtml
index 6fd5051..e254e93 100644
--- a/views/mods/mod_ordercondition/list.phtml
+++ b/views/mods/mod_ordercondition/list.phtml
@@ -118,7 +118,7 @@
     

         <?php echo wpsg_drawForm_TextStart(); ?>

         <span class="wpsg_editable" id="oc_text_<?php echo $oc['id']; ?>"><?php echo wpsg_hspc($oc['text']); ?></span>

-        <?php echo wpsg_drawForm_TextEnd(__('Bedinungstext', 'wpsg')); ?>

+        <?php echo wpsg_drawForm_TextEnd(__('Bedingungstext', 'wpsg')); ?>

         <script type="text/javascript">/* <![CDATA[ */

 

             jQuery('#oc_text_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {

diff --git a/views/mods/mod_prepayment/settings_edit.phtml b/views/mods/mod_prepayment/settings_edit.phtml
index bb9dc1f..636e181 100644
--- a/views/mods/mod_prepayment/settings_edit.phtml
+++ b/views/mods/mod_prepayment/settings_edit.phtml
@@ -6,16 +6,9 @@
 

 ?>

 

-<div class="wpsg_form_field">

-	<div class="wpsg_form_left">

-		<?php echo __("Bezeichnung", "wpsg"); ?>:

-	</div>

-	<div class="wpsg_form_right">

-		<input type="text" name="wpsg_mod_prepayment_bezeichnung" value="<?php echo $this->get_option('wpsg_mod_prepayment_bezeichnung'); ?>" />	

-	</div>

-	<div class="wpsg_clear"></div>

-</div>

+<?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_prepayment_bezeichnung'), array('help' => 'wpsg_mod_prepayment_bezeichnung')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_prepayment_aktiv'), array('help' => 'wpsg_mod_prepayment_aktiv')); ?>

+

 <?php echo wpsg_drawForm_Textarea('wpsg_mod_prepayment_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_prepayment_hint'), array('help' => 'wpsg_mod_prepayment_hint')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_subject', __('Betreff für Überweisungen', 'wpsg'), $this->get_option('wpsg_mod_prepayment_subject'), array('help' => 'mod_prepayment_subject')); ?>

 

diff --git a/views/mods/mod_productgroups/admin_setcapabilities.phtml b/views/mods/mod_productgroups/admin_setcapabilities.phtml
index 95bcd8d..6c245d5 100644
--- a/views/mods/mod_productgroups/admin_setcapabilities.phtml
+++ b/views/mods/mod_productgroups/admin_setcapabilities.phtml
@@ -8,7 +8,7 @@
 

 ?>

 <tr>

-	<td class="wpsg_col_capname"><?php echo __('Statistik', 'wpsg'); ?></td>

+	<td class="wpsg_col_capname"><?php echo __('Produktgruppen', 'wpsg'); ?></td>

 	<?php foreach ($arRoles as $role_key => $r) { ?>

 	<td class="wpsg_col_cap">

 		<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_productgroup]" value="0" />

diff --git a/views/mods/mod_shs/settings_edit.phtml b/views/mods/mod_shs/settings_edit.phtml
index f546b3f..f9d9410 100644
--- a/views/mods/mod_shs/settings_edit.phtml
+++ b/views/mods/mod_shs/settings_edit.phtml
@@ -36,35 +36,15 @@
 <?php echo wpsg_drawForm_Select('wpsg_mod_shs_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_shs_mwst'), array('help' => 'wpsg_mod_shs_mwst')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_shs_mwstland'), array('help' => 'wpsg_mod_shs_mwstland')); ?>

 <br />

-<div class="wpsg_form_field">

-	<div class="wpsg_form_left">

-		<label><?php echo __('Formularoptionen', 'wpsg'); ?>:</label>

-	</div>

-	<div class="wpsg_form_right">

-		<label> 

-			<input <?php echo (($this->get_option('wpsg_mod_shs_mobileversion') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_mobileversion" name="wpsg_mod_shs_mobileversion" /><?php echo __('Mobile Version nutzen', 'wpsg'); ?>			

-		</label><br />

-		<label>

-			<input <?php echo (($this->get_option('wpsg_mod_shs_creditcard_cardholder') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_creditcard_cardholder" name="wpsg_mod_shs_creditcard_cardholder" /><?php echo __('Kartenhinhaber ist Pflichtfeld (Nur Kreditkarte)', 'wpsg'); ?>			

-		</label><br />

-		<label>

-			<input <?php echo (($this->get_option('wpsg_mod_shs_creditcard_optionalcardholder') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_creditcard_optionalcardholder" name="wpsg_mod_shs_creditcard_optionalcardholder" /><?php echo __('Kartenhinhaber ist Optional (Nur Kreditkarte)', 'wpsg'); ?>			

-		</label><br />

-		<label>

-			<input <?php echo (($this->get_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_creditcard_sslifvisaenrolledu" name="wpsg_mod_shs_creditcard_sslifvisaenrolledu" /><?php echo __('Bei VISA ohne Autorisierung zahlung erlauben (Nur Kreditkarte / VISA)', 'wpsg'); ?>			

-		</label><br />

-		<label>

-			<input <?php echo (($this->get_option('wpsg_mod_shs_directdebit_accountholder') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_directdebit_accountholder" name="wpsg_mod_shs_directdebit_accountholder" /><?php echo __('Kontoinhaber ist Pflichtfeld (Nur Lastschrift)', 'wpsg'); ?>			

-		</label><br />

-		<label>

-			<input <?php echo (($this->get_option('wpsg_mod_shs_directdebit_optionalaccountholder') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_directdebit_optionalaccountholder" name="wpsg_mod_shs_directdebit_optionalaccountholder" /><?php echo __('Kontoinhaber ist Optional (Nur Lastschrift)', 'wpsg'); ?>			

-		</label><br />

-		<label>

-			<input <?php echo (($this->get_option('wpsg_mod_shs_directdebit_checklist') == '1')?'checked="checked"':''); ?> style="margin-right:5px; margin-top:0px; float:none;" type="checkbox" class="checkbox" value="1" id="wpsg_mod_shs_directdebit_checklist" name="wpsg_mod_shs_directdebit_checklist" /><?php echo __('Sperrlistenabfrage (Nur Lastschrift, muss freigeschaltet sein)', 'wpsg'); ?>			

-		</label>

-	</div>

-	<div class="wpsg_clear"></div>

-</div>

+

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_mobileversion', __('Mobile Version nutzen', 'wpsg'), $this->get_option('wpsg_mod_shs_mobileversion')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_cardholder', __('Kartenhinhaber ist Pflichtfeld (Nur Kreditkarte)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_cardholder')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_optionalcardholder', __('Karteninhaber ist Optional (Nur Kreditkarte)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_optionalcardholder')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_creditcard_sslifvisaenrolledu', __('Bei VISA ohne Autorisierung Zahlung erlauben (Nur Kreditkarte / VISA)', 'wpsg'), $this->get_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_directdebit_accountholder', __('Kontoinhaber ist Pflichtfeld (Nur Lastschrift)', 'wpsg'), $this->get_option('wpsg_mod_shs_directdebit_accountholder')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_directdebit_optionalaccountholder', __('Kontoinhaber ist Optional (Nur Lastschrift)', 'wpsg'), $this->get_option('wpsg_mod_shs_directdebit_optionalaccountholder')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_directdebit_checklist', __('Sperrlistenabfrage (Nur Lastschrift, muss freigeschaltet sein)', 'wpsg'), $this->get_option('wpsg_mod_shs_directdebit_checklist')); ?>

+

 <br />

 <?php echo wpsg_drawForm_Select('wpsg_mod_shs_transactiontype', __('Autorisierung', 'wpsg'), array('preauthorization', 'authorization'), $this->get_option('wpsg_mod_shs_transactiontype'), array('help' => 'wpsg_mod_shs_transactiontype')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_shs_autostart'), array('help' => 'wpsg_mod_shs_autostart')); ?>

diff --git a/views/mods/mod_statistics/admin_setcapabilities.phtml b/views/mods/mod_statistics/admin_setcapabilities.phtml
index cf31ee6..a015b7e 100644
--- a/views/mods/mod_statistics/admin_setcapabilities.phtml
+++ b/views/mods/mod_statistics/admin_setcapabilities.phtml
@@ -12,7 +12,7 @@
 	<?php foreach ($arRoles as $role_key => $r) { ?>

 	<td class="wpsg_col_cap">

 		<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_statistics]" value="0" />

-		<input type="checkbox" <?php echo (($r['capabilities']['wpsg_statistics'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_statistics]" value="1" /> 

+		<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_statistics']))?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_statistics]" value="1" /> 

 	</td>

 	<?php } ?>

 	<td></td>

diff --git a/views/mods/mod_su/settings_edit.phtml b/views/mods/mod_su/settings_edit.phtml
index 1dfc1b7..a3d146e 100644
--- a/views/mods/mod_su/settings_edit.phtml
+++ b/views/mods/mod_su/settings_edit.phtml
@@ -55,14 +55,8 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_su_noticepassword', __('Benachrichtigungs Passwort', 'wpsg'), $this->get_option('wpsg_mod_su_noticepassword'), array('help' => 'wpsg_mod_su_noticepassword')); ?>

 <?php echo wpsg_drawForm_Select('wpsg_mod_su_language', __('Sprache bei Sofortüberweisung.de', 'wpsg'), array('DE' => __('deutsch', 'wpsg'), 'EN' => __('englisch', 'wpsg'), 'FR' => __('französisch', 'wpsg'), 'NL' => __('niederländisch', 'wpsg')), $this->get_option('wpsg_mod_su_language'), array('help' => 'wpsg_mod_su_language')); ?>

 <?php echo wpsg_drawForm_Select('wpsg_mod_su_hash', __('Verwendetes HASH Verfahren', 'wpsg'), array('md5' => 'MD5', 'sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512'), $this->get_option('wpsg_mod_su_hash'), array('help' => 'wpsg_mod_su_hash')); ?>

-<div class="wpsg_form_field">

-	<div class="wpsg_form_left">

-		<label for="wpsg_mod_su_confirmurl"><?php echo __('URL für HTTP Benachrichtigung', 'wpsg'); ?>:</label>

-	</div>

-	<div class="wpsg_form_right">

-		<input id="wpsg_mod_su_confirmurl" type="text" class="text" name="" value="<?php echo wpsg_hspc($this->view['wpsg_mod_su_confirmurl']); ?>" />		

-	</div>

-	<div class="wpsg_clear"></div>

-</div>

+

+<?php echo wpsg_drawForm_Input('wpsg_mod_su_confirmurl', __('URL für HTTP Benachrichtigung', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_su_confirmurl']), array('help' => 'wpsg_mod_su_confirmurl', 'readonly' => true)); ?>

+

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_su_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_su_autostart')); ?>

 

diff --git a/views/mods/mod_targo/order_done.phtml b/views/mods/mod_targo/order_done.phtml
index d5dbde6..eb7be78 100644
--- a/views/mods/mod_targo/order_done.phtml
+++ b/views/mods/mod_targo/order_done.phtml
@@ -1,21 +1,28 @@
 <?php

 

-/**

- * Dieses Template wird nach einer Targo Zahlung angezeigt

-*/

+	/**

+ 	* Dieses Template wird nach einer Targo Zahlung angezeigt

+	*/

 

-$url = $this->get_option('wpsg_mod_targo_url');

+	if ($this->get_option('wpsg_mod_targo_url_use') == 0)

+	{

+		$url = $this->get_option('wpsg_mod_targo_url_test');

+	}

+	else

+	{

+		$url = $this->get_option('wpsg_mod_targo_url_live');

+	}

 ?>

 

 <p><?php echo __('Um den Betrag mit Targo zu bezahlen klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p> 

 <p>

-	<a title="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" href="<?php echo $this->get_option('wpsg_mod_targo_url'); ?>">

+	<a title="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" href="<?php echo $url; ?>">

 		<img src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" align="left" alt="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" style="margin-right:7px;">

 	 

 	</a>

 </p>

 

-<form hidden class="wpsg_productform" id="wpsg_produktform" method="post" action="<?php echo $this->get_option('wpsg_mod_targo_url'); ?>">

+<form hidden class="wpsg_productform" id="wpsg_produktform" method="post" action="<?php echo $url ?>">

 <?php $o_id = $this->view['o_id'];

 	  $k_id = $this->view['k_id'];

 	  $oOrder = wpsg_order::getInstance($o_id);

@@ -82,8 +89,7 @@ $url = $this->get_option('wpsg_mod_targo_url');
  

 	jQuery(document).ready(function() { 

 		window.setTimeout(function() {

-    		//location.href = "<?php echo $this->view['targoLink']; ?>";

-			location.href = "<?php echo $this->get_option('wpsg_mod_targo_url');?>";

+			location.href = "<?php echo $url;?>";

 		}, 1000);

 	} );

 	

diff --git a/views/mods/mod_targo/order_view_afterpayment.phtml b/views/mods/mod_targo/order_view_afterpayment.phtml
index 147de14..c2964d8 100644
--- a/views/mods/mod_targo/order_view_afterpayment.phtml
+++ b/views/mods/mod_targo/order_view_afterpayment.phtml
@@ -1,27 +1,21 @@
 <?php

 

 	/**

-	 * Template für die Integration der PayPal Zahlungsart in die Bestellverwaltung

+	 * Template für die Integration der Targo Zahlungsart in die Bestellverwaltung

 	 */

 

 ?>

 

-<?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypal_paymentid'))) { ?>

+<?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_targo_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_paypal&do=refresh&edit_id=<?php echo $this->view['oOrder']->id; ?>"><?php echo __('Status Aktualisieren', 'wpsg'); ?></a>]</label>

+			<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_targo&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_paypal_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypal_paymentstate')); ?></p>

+			<p class="" id=""><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_targo_paymentid')); ?></p>

 		</div>

 		<div class="wpsg_clear"></div>

 	</div>

 		

 <?php } ?>

-

-<?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypal_saleid'))) { ?>

-

-	<?php echo wpsg_drawForm_Input('', __('SaleID', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypal_saleid'), array('text' => true)); ?>

-		

-<?php } ?>

diff --git a/views/mods/mod_targo/settings_edit.phtml b/views/mods/mod_targo/settings_edit.phtml
index 091a5f5..f0c4fbf 100644
--- a/views/mods/mod_targo/settings_edit.phtml
+++ b/views/mods/mod_targo/settings_edit.phtml
@@ -11,45 +11,27 @@
 

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_targo_aktiv'), array('help' => 'wpsg_mod_targo_activ')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_autostart', __('Autostart', 'wpsg'), $this->get_option('wpsg_mod_targo_autostart'), array('help' => 'wpsg_mod_targo_autostart')); ?>

+

+<br />

+

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_summe_min', __('Mindestfinanzierungssumme', 'wpsg'), $this->get_option('wpsg_mod_targo_summe_min'), array('help' => 'wpsg_mod_targo_summe_min')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_summe_max', __('Maximale Finanzierungssumme', 'wpsg'), $this->get_option('wpsg_mod_targo_summe_max'), array('help' => 'wpsg_mod_targo_summe_max')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_laufzeit_min', __('Mindestlaufzeit (Monate)', 'wpsg'), $this->get_option('wpsg_mod_targo_laufzeit_min'), array('help' => 'wpsg_mod_targo_laufzeit_min')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_laufzeit_max', __('Maximale Laufzeit (Monate)', 'wpsg'), $this->get_option('wpsg_mod_targo_laufzeit_max'), array('help' => 'wpsg_mod_targo_laufzeit_max')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_rate_min', __('Mindestrate', 'wpsg'), $this->get_option('wpsg_mod_targo_rate_min'), array('help' => 'wpsg_mod_targo_rate_min')); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_targo_url', __('Targo-URL', 'wpsg'), $this->get_option('wpsg_mod_targo_url'), array('help' => 'wpsg_mod_targo_url')); ?>

+

+<br />

+

+<?php echo wpsg_drawForm_Input('wpsg_mod_targo_url_test', __('Targo-URL-Testsystem', 'wpsg'), $this->get_option('wpsg_mod_targo_url_test'), array('help' => 'wpsg_mod_targo_url_test')); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_targo_url_live', __('Targo-URL-Livesystem', 'wpsg'), $this->get_option('wpsg_mod_targo_url_live'), array('help' => 'wpsg_mod_targo_url_live')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_url_use', __('Targo-URL-Livesystem benutzen', 'wpsg'), $this->get_option('wpsg_mod_targo_url_use'), array('help' => 'wpsg_mod_targo_url_use')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_koop_id', __('Targo-Koop-ID', 'wpsg'), $this->get_option('wpsg_mod_targo_koop_id'), array('help' => 'wpsg_mod_targo_koop_id')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_dealerid', __('Targo-Dealer-ID', 'wpsg'), $this->get_option('wpsg_mod_targo_dealerid'), array('help' => 'wpsg_mod_targo_dealerid')); ?>

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_hashkey', __('Targo-Hash-Key', 'wpsg'), $this->get_option('wpsg_mod_targo_hashkey'), array('help' => 'wpsg_mod_targo_hashkey')); ?>

 

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_createwebhook',  __('Beim speichern versuchen den WebHook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_targo_createwebhook')); ?>

+<br />

+

 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_targo_gebuehr'), true), array('help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %')); ?>

 <?php echo wpsg_drawForm_Select('wpsg_mod_targo_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_targo_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_targo_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>

-

-<?php echo wpsg_drawForm_Select('wpsg_mod_targo_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_mod_targo_success'), array('help' => 'wpsg_mod_targo_success')); ?>

-<?php echo wpsg_drawForm_Select('wpsg_mod_targo_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_mod_targo_error'), array('help' => 'wpsg_mod_targo_error')); ?>

-

-<br />

-

-<div class="wpsg_mod_targo_mode_layer wpsg_mod_targo_mode_1">

-	

-</div>

-

-<script type="text/javascript">/* <![CDATA[ */

-

-	jQuery(document).ready(function() {

- 

-		jQuery('#wpsg_mod_targo_mode').bind('change', function() {

-

-			jQuery('.wpsg_mod_targo_mode_layer').hide();

-			jQuery('.wpsg_mod_targo_mode_' + jQuery(this).val()).show();

-			

-		}).change();

-

-		

-	});

-

-/* ]]> */</script>

-

-

-<br />

+  

diff --git a/views/mods/mod_videodownload/settings_edit.phtml b/views/mods/mod_videodownload/settings_edit.phtml
index befe61e..2e3e448 100644
--- a/views/mods/mod_videodownload/settings_edit.phtml
+++ b/views/mods/mod_videodownload/settings_edit.phtml
@@ -7,17 +7,16 @@
 ?>

 <br />

 <div class="wpsg_admin_box" id="wpsg_tab">	

-	<div class="head">

-		<div class="title">

-			<div class="tab" id="tab1"><?php echo __('Einstellungen', 'wpsg'); ?></div>

-			<div class="tab" id="tab2"><?php echo __('Textfelder', 'wpsg'); ?></div>

-			<div class="tab tabright tabright-last" id="tab3"><?php echo __('Info', 'wpsg'); ?></div>

-			<div class="wpsg_clear"></div>

-		</div>

-	</div>

-	<div class="content">

+    <ul class="nav nav-tabs" role="tablist">

+        <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Einstellungen', 'wpsg'); ?></a></li>

+        <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Textfelder', 'wpsg'); ?></a></li>

+        <li role="presentation"><a href="#tab3" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Info', 'wpsg'); ?></a></li>

+    </ul>

+

+

+	<div class="tab-content">

 		

-		<div id="tabcontent1" class="tabcontent">			

+		<div role="tabpanel" class="tab-pane active" id="tab1" >			

 			<?php echo wpsg_drawForm_Input('wpsg_mod_videodownload_command', __('Programmaufruf', 'wpsg'), $this->get_option('wpsg_mod_videodownload_command'), array('help' => 'mod_videodownload_einstellungen_programmaufruf')); ?>

 			<?php echo wpsg_drawForm_Input('wpsg_mod_videodownload_infocommand', __('Programmaufruf (ffmpeg -i)', 'wpsg'), $this->get_option('wpsg_mod_videodownload_infocommand'), array('help' => 'mod_videodownload_einstellungen_programminfoaufruf')); ?>		

 			<?php echo wpsg_drawForm_Input('wpsg_mod_videodownload_filename', __('Personalisierter Dateiname', 'wpsg'), $this->get_option('wpsg_mod_videodownload_filename'), array('help' => 'mod_videodownload_einstellungen_filename')); ?>

@@ -62,16 +61,16 @@
 			</div>

 		</div>

 		

-		<div id="tabcontent2" class="tabcontent">

+		<div role="tabpanel" class="tab-pane" id="tab2" >

 		

 			<table class="wpsg_mod_videodownload_fieldtable">

 				<tr>

 					<th class="col_bezeichnung"></th>

 					<th class="col_font"><?php echo __('Schriftart', 'wpsg'); ?></th>

-					<th class="col_x"><?php echo __('X', 'wpsg'); ?></th>

-					<th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>

+					<th class="col_x"><?php echo __(' X', 'wpsg'); ?></th>

+					<th class="col_y"><?php echo __(' Y', 'wpsg'); ?></th>

 					<th class="col_align"><?php echo __('Zentriert', 'wpsg'); ?></th>

-					<th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>

+					<th class="col_color"><?php echo __(' Farbe', 'wpsg'); ?></th>

 					<th class="col_alpha"><?php echo __('Opaque', 'wpsg'); ?></th>

 					<th class="col_angle"><?php echo __('Winkel', 'wpsg'); ?></th>

 					<th class="col_groesse"><?php echo __('Größe', 'wpsg'); ?></th>

@@ -143,7 +142,7 @@
 			

 		</div>

 		

-		<div id="tabcontent3" class="tabcontent">

+		<div role="tabpanel" class="tab-pane" id="tab3" >

 		

 			<p><?php echo __('Mit dem Videodownload Modul ist es möglich Videos zu verkaufen die pro Bestellung individuell angepasst werden.', 'wpsg'); ?>

 		

diff --git a/views/mods/mod_voucherproduct/settings_edit.phtml b/views/mods/mod_voucherproduct/settings_edit.phtml
index d32b42b..351909e 100644
--- a/views/mods/mod_voucherproduct/settings_edit.phtml
+++ b/views/mods/mod_voucherproduct/settings_edit.phtml
@@ -8,17 +8,16 @@
 <?php if (!$this->hasMod('wpsg_mod_gutschein')) { ?>

 <p class="wpsg_error"><?php echo __('Bitte aktivieren Sie das Gutscheinmodul, damit dieses Modul korrekt funktioniert!', 'wpsg'); ?></p>

 <?php } ?>

-<div class="wpsg_admin_box" id="wpsg_tab">	

-	<div class="head">

-		<div class="title">

-			<div class="tab" id="tab1"><?php echo __('Einstellungen', 'wpsg'); ?></div>

-			<div class="tab" id="tab2"><?php echo __('Textfelder', 'wpsg'); ?></div>

-			<div class="wpsg_clear"></div>

-		</div>

-	</div>

-	<div class="content">

+

+<div class="wpsg_admin_box" id="wpsg_tab">

+    <ul class="nav nav-tabs" role="tablist">

+        <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Einstellungen', 'wpsg'); ?></a></li>

+        <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Textfelder', 'wpsg'); ?></a></li>

+    </ul>

+	

+	<div class="tab-content">

 		

-		<div id="tabcontent1" class="tabcontent">	

+		<div role="tabpanel" class="tab-pane active" id="tab1" >	

 			<div class="wpsg_form_field">

 				<div class="wpsg_form_left">

 					<label><?php echo __('Briefpapier (PDF/JPG)', 'wpsg'); ?>:</label><br />

@@ -54,8 +53,8 @@
 		

 		</div>

 		

-		<div id="tabcontent2" class="tabcontent">

-			<table class="wpsg_mod_downloadplus_fieldtable">

+		<div role="tabpanel" class="tab-pane" id="tab2" >

+			<table class="wpsg_mod_voucher_fieldtable">

 				<tr>

 					<th class="col_bezeichnung"></th>					

 					<th class="col_x"><?php echo __('X', 'wpsg'); ?></th>