- Formulierungen, Hilfetexte und Dokumentation erweitert

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

4 files changed, 13 insertions, 12 deletions

diff --git a/views/css/frontend.css b/views/css/frontend.css
index f4f68a8..e344714 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -195,6 +195,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_mod_abo_order_product_wrap .wpsg_mod_abo_order_product .duration_running { color:green; }

 .wpsg_mod_abo_order_product_wrap .wpsg_mod_abo_order_product .duration_expired { color:red; }

 .wpsg_mod_abo_order_product_wrap .wpsg_mod_abo_order_product .image { float:left; margin-right:15px; }

+.wpsg_mod_abo_order_product_wrap .wpsg_mod_abo_order_product .label { float:left; width:15rem; }

 

 /* Produktattribute */

 .wpsg_cell_produktattribute_value { text-align:right; }

diff --git a/views/mods/mod_abo/page_abo.phtml b/views/mods/mod_abo/page_abo.phtml
index e44fd22..7b33792 100644
--- a/views/mods/mod_abo/page_abo.phtml
+++ b/views/mods/mod_abo/page_abo.phtml
@@ -34,7 +34,7 @@
 					<div class="content">

 					

 						<div class="start">

-							<span class="label"><?php echo __('Erstkauf:', 'wpsg'); ?></span>

+							<span class="label"><?php echo __('Erstkauf (Startzeitpunkt):', 'wpsg'); ?></span>

 							<span class="value">

 								

 								<?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate)); ?>

@@ -46,7 +46,7 @@
 							<span class="value"><?php echo wpsg_ff($oOrderProduct->getProduct()->wpsg_mod_abo_price, $this->get_option('wpsg_currency')); ?></span>

 						</div>

 						<div class="duration">

-							<span class="label"><?php echo __('Laufzeit:', 'wpsg'); ?></span>

+							<span class="label"><?php echo __('Laufzeit (Endzeitpunkt):', 'wpsg'); ?></span>

 							<span class="value">

 								

 								<?php $exp = $this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id, $oOrderProduct->getProductKey())); ?>

diff --git a/views/mods/mod_abo/produkt_addedit_content.phtml b/views/mods/mod_abo/produkt_addedit_content.phtml
index 525b6bb..e1d0f0e 100644
--- a/views/mods/mod_abo/produkt_addedit_content.phtml
+++ b/views/mods/mod_abo/produkt_addedit_content.phtml
@@ -35,21 +35,21 @@
 	</div>	

 	<div class="panel-body">

 	

-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_activ', __('Abo Produkt', 'wpsg'), $this->view['product']['wpsg_mod_abo_activ']); ?>

+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_activ', __('Abo Produkt', 'wpsg'), $this->view['product']['wpsg_mod_abo_activ'], array ('help' => 'wpsg_mod_abo_activ')); ?>

 		

 		<div id="wpsg_mod_abo_layer">

 			

-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_resell', __('Anzahl beschränken', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell']); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_resell', __('Anzahl der Abo-Verlängerungen beschränken', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell'], array ('help' => 'wpsg_mod_abo_resell')); ?>

 			

 			<div id="wpsg_mod_abo_resell_layer">

 				

-				<?php echo wpsg_drawForm_Input('wpsg_mod_abo_resell_count', __('Anzahl', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell_count']); ?>

+				<?php echo wpsg_drawForm_Input('wpsg_mod_abo_resell_count', __('max. Abo-Verlängerungen', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell_count'], array ('help' => 'wpsg_mod_abo_count')); ?>

 				

 			</div>

 			

-			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_price', wpsg_translate(__('Abo Preis (#1#)', 'wpsg'), (($this->get_option('wpsg_preisangaben') == WPSG_NETTO)?__('Netto', 'wpsg'):__('Brutto', 'wpsg'))), wpsg_ff($this->view['product']['wpsg_mod_abo_price']), array('unit' => $this->get_option('wpsg_currency'))); ?>		

-			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_durration', __('Abo Dauer (Tage)', 'wpsg'), $this->view['product']['wpsg_mod_abo_durration']); ?>

-			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_url', __('URL Benachrichtigung', 'wpsg'), $this->view['product']['wpsg_mod_abo_url'], array('hint' => wpsg_translate(__('nohspc_Wird hier nichts angegeben, so wird die URL aus der <a href="#1#">Modulkonfiguration</a> bei Ablauf/Verlängerung benachrichtigt.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo'))); ?>			 

+			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_price', wpsg_translate(__('Abo Preis (#1#)', 'wpsg'), (($this->get_option('wpsg_preisangaben') == WPSG_NETTO)?__('Netto', 'wpsg'):__('Brutto', 'wpsg'))), wpsg_ff($this->view['product']['wpsg_mod_abo_price']), array('unit' => $this->get_option('wpsg_currency'), 'help' => 'wpsg_mod_abo_price')); ?>		

+			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_durration', __('Abo Dauer (Tage)', 'wpsg'), $this->view['product']['wpsg_mod_abo_durration'], array('help' => 'wpsg_mod_abo_durration')); ?>

+			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_url', __('URL Benachrichtigung', 'wpsg'), $this->view['product']['wpsg_mod_abo_url'], array('hint' => wpsg_translate(__('nohspc_Wird hier nichts angegeben, so wird die URL aus der <a href="#1#">Modulkonfiguration</a> bei Ablauf/Verlängerung benachrichtigt.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo'), 'help' => 'wpsg_mod_abo_url')); ?>			 

 			

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

 			

diff --git a/views/mods/mod_abo/settings_edit.phtml b/views/mods/mod_abo/settings_edit.phtml
index 8b88bfb..253fb47 100644
--- a/views/mods/mod_abo/settings_edit.phtml
+++ b/views/mods/mod_abo/settings_edit.phtml
@@ -28,14 +28,14 @@
 

 <div class="wpsg_mod_expiremode wpsg_mod_expiremode_<?php echo wpsg_mod_abo::EXPIRE_AUTO; ?>" style="display:<?php echo (($this->get_option('wpsg_mod_abo_expiremode') == wpsg_mod_abo::EXPIRE_AUTO)?'block':'none'); ?>;">

 	

-	<?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_payment', __('Zahlungsart für automatische Verlängerung'), $arPaymentSelect, $this->get_option('wpsg_mod_abo_autoexpire_payment'), array()); ?>

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_autoexpire_customermail', __('Mail an Kunden'), $this->get_option('wpsg_mod_abo_autoexpire_customermail')); ?>

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_autoexpire_adminmail', __('Mail an Administrator'), $this->get_option('wpsg_mod_abo_autoexpire_adminmail')); ?>

+	<?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_payment', __('Zahlungsart für automatische Verlängerung'), $arPaymentSelect, $this->get_option('wpsg_mod_abo_autoexpire_payment'), array('help' => 'wpsg_mod_abo_autoexpire_payment')); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_autoexpire_customermail', __('Mail an Kunden'), $this->get_option('wpsg_mod_abo_autoexpire_customermail'), array ('help' => 'wpsg_mod_abo_autoexpire_customermail')); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_autoexpire_adminmail', __('Mail an Administrator'), $this->get_option('wpsg_mod_abo_autoexpire_adminmail'), array ('help' => 'wpsg_mod_abo_autoexpire_adminmail')); ?>

 	<?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_customer', __('Kunde kann im Frontend'), Array(

 		wpsg_mod_abo::CUSTOMER_AUTO_NOTHING => __('Nichts', 'wpsg'),

 		wpsg_mod_abo::CUSTOMER_AUTO_DIRECT => __('Verlängerung direkt stoppen', 'wpsg'),

 		wpsg_mod_abo::CUSTOMER_AUTO_MAIL => __('Verlängerung über Mail an Administrator stoppen', 'wpsg')

-	), $this->get_option('wpsg_mod_abo_autoexpire_customer'), array()); ?>	

+	), $this->get_option('wpsg_mod_abo_autoexpire_customer'), array('help' => 'wpsg_mod_abo_autoexpire_customer')); ?>	

 	

 </div>