- Abo Einstellungen ins Produkt

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

9 files changed, 151 insertions, 18 deletions

diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
index 14177e2..7ba124a 100644
--- a/views/admin/form/select.phtml
+++ b/views/admin/form/select.phtml
@@ -99,7 +99,11 @@
 			<?php } ?>

 			

 		</div>

-	

+

+        <?php if (wpsg_isSizedString($this->view['field_config']['hint'])) { ?>

+			<div class="hint info"><?php echo $this->view['field_config']['hint']; ?></div>

+        <?php } ?>

+		

 	</div>

 	

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

diff --git a/views/css/admin.css b/views/css/admin.css
index 43af405..5f30ba2 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -57,7 +57,7 @@
 #wpsg-bs .table-bordered thead { background-color:#FFFFFF; }

 #wpsg-bs .table-body-striped > tbody:nth-of-type(odd) { background-color:#f9f9f9; }

 #wpsg-bs .checkbox input { margin-top:1px; }

-#wpsg-bs .info { font-style:italic; }

+#wpsg-bs .info { font-style:italic; font-size:12px; line-height:16px; margin-top:5px; margin-bottom:5px;  }

 #wpsg-bs .tab-pane { padding-top:15px; }

 #wpsg-bs fieldset > legend { padding-top:2rem; text-align:left; }

 #wpsg-bs fieldset > legend > div { padding-left:25px; }

diff --git a/views/css/frontend.css b/views/css/frontend.css
index 3bac8a7..dc75059 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -209,6 +209,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_mod_abo_order_product_wrap .wpsg_mod_abo_order_product .status_inactiv { color:red; }

 .wpsg_mod_abo_order_product_wrap .wpsg_mod_abo_order_product .value { margin-left:10px; }

 .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_inextension { color:orange; }

 .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; }

diff --git a/views/mods/mod_abo/mail_autoinformation.phtml b/views/mods/mod_abo/mail_autoinformation.phtml
index e309e02..38c53fe 100644
--- a/views/mods/mod_abo/mail_autoinformation.phtml
+++ b/views/mods/mod_abo/mail_autoinformation.phtml
@@ -6,7 +6,7 @@
 

 ?><?php echo __('Hallo', 'wpsg'); ?> <?php echo wpsg_hspc($this->view['customer']['vname']); ?> <?php echo wpsg_hspc($this->view['customer']['name']); ?>,

  

-<?php echo wpsg_translate(__('Ihr Abonnement von Produkt "#1#" wird in #2# Tagen automatisch verlängert.', 'wpsg'), $this->view['oProduct']->getProductName(), $this->get_option('wpsg_mod_abo_autoexpire_informationtime')); ?>  

+<?php echo wpsg_translate(__('Ihr Abonnement von Produkt "#1#" wird in #2# Tagen automatisch verlängert.', 'wpsg'), $this->view['oProduct']->getProductName(), $this->view['wpsg_mod_abo_autoexpire_informationtime']); ?>  

  

 <?php echo __('Viele Grüße', 'wpsg'); ?> 

  

diff --git a/views/mods/mod_abo/mail_autoinformation_html.phtml b/views/mods/mod_abo/mail_autoinformation_html.phtml
index 784e27d..c5d0498 100644
--- a/views/mods/mod_abo/mail_autoinformation_html.phtml
+++ b/views/mods/mod_abo/mail_autoinformation_html.phtml
@@ -6,7 +6,7 @@
 

 ?><p><?php echo __('Hallo', 'wpsg'); ?> <?php echo wpsg_hspc($this->view['customer']['vname']); ?> <?php echo wpsg_hspc($this->view['customer']['name']); ?>,</p>

  

-<p><?php echo wpsg_translate(__('Ihr Abonnement von Produkt "#1#" wird in #2# Tagen automatisch verlängert.', 'wpsg'), $this->view['oProduct']->getProductName(), $this->get_option('wpsg_mod_abo_autoexpire_informationtime')); ?></p> 

+<p><?php echo wpsg_translate(__('Ihr Abonnement von Produkt "#1#" wird in #2# Tagen automatisch verlängert.', 'wpsg'), $this->view['oProduct']->getProductName(), $this->view['wpsg_mod_abo_autoexpire_informationtime']); ?></p> 

  

 <p><?php echo __('Viele Grüße', 'wpsg'); ?></p> 

  

diff --git a/views/mods/mod_abo/order_view.phtml b/views/mods/mod_abo/order_view.phtml
index 3242993..0dca512 100644
--- a/views/mods/mod_abo/order_view.phtml
+++ b/views/mods/mod_abo/order_view.phtml
@@ -16,7 +16,11 @@
 		

 		?>

 	

-		<?php echo wpsg_drawForm_AdminboxStart($oOrderProduct->getProduct()->getProductName()); ?>

+		<?php echo wpsg_drawForm_AdminboxStart(

+			'<a href="'.wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(), 'wpsg-product-edit-'.$oOrderProduct->getProductId()).'">'.

+			$oOrderProduct->getProduct()->getProductName().

+			'</a>'

+		); ?>

 	

 			<?php $tExpire = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', Array($_REQUEST['edit_id'], $oOrderProduct->getProductKey()))); ?>

 			<?php echo wpsg_drawForm_Text(__('Laufzeit', 'wpsg'), wpsg_formatTimestamp($tExpire), 'wpsg_mod_abo_duration', Array('class_content_wrap' => 'wpsg_abo_state wpsg_abo_state_class_'.$oAbo->getState())); ?>

diff --git a/views/mods/mod_abo/page_abo.phtml b/views/mods/mod_abo/page_abo.phtml
index 7b33792..a562ef9 100644
--- a/views/mods/mod_abo/page_abo.phtml
+++ b/views/mods/mod_abo/page_abo.phtml
@@ -15,7 +15,22 @@
 		<div class="wpsg_mod_abo_order_product_wrap">

 		<?php foreach ($this->view['arOrder'] as $oOrder) { ?>

 		

-			<?php foreach ($this->callMod('wpsg_mod_abo', 'getAboProductsFromOrder', Array($oOrder->id)) as $oOrderProduct) { $aboStatus = $this->callMod('wpsg_mod_abo', 'getAboProductStatus', Array($oOrder->id, $oOrderProduct->getProductKey())); ?>

+			<?php foreach ($this->callMod('wpsg_mod_abo', 'getAboProductsFromOrder', Array($oOrder->id)) as $oOrderProduct) { 

+				

+				$product_id = $oOrderProduct->getProductId();

+				$aboStatus = $this->callMod('wpsg_mod_abo', 'getAboProductStatus', Array($oOrder->id, $oOrderProduct->getProductKey())); 

+				 

+				try {

+				

+					$oAbo = wpsg_abo::getFromOrderAndProduct($oOrder->getId(), $oOrderProduct->getId());

+					

+				} catch (\Exception $e) {

+					

+					continue;

+					

+                }

+				

+				?>

 			

 				<div class="wpsg_mod_abo_order_product">

 

@@ -51,16 +66,18 @@
 								

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

 								

-								<?php if (strtotime($exp) > time()) { ?>

+								<?php if ($oAbo->getState() === wpsg_abo::STATE_RUNNING) { ?>

 									<span class="duration_running"><?php echo $exp; ?></span>

-								<?php } else { ?>

+                                <?php } else if ($oAbo->getState() === wpsg_abo::STATE_INEXTENSION) { ?>

+									<span class="duration_inextension"><?php echo $exp; ?></span>

+								<?php } else if ($oAbo->getState() === wpsg_abo::STATE_EXTEND) { ?>

 									<span class="duration_expired"><?php echo $exp; ?></span>

 								<?php }  ?>

 								

 							</span>

 						</div>					

 						<div class="status">

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

+							<span class="label"><?php echo __('automatische Verlängerung:', 'wpsg'); ?></span>

 							<span class="value">

 													

 								<?php if ($aboStatus['status'] === wpsg_mod_abo::STATUS_ACTIVE) { ?>

@@ -73,7 +90,7 @@
 										

 									<?php } else { ?>

 									

-										<?php if (in_array($this->get_option('wpsg_mod_abo_autoexpire_customer'), Array(wpsg_mod_abo::CUSTOMER_AUTO_MAIL, wpsg_mod_abo::CUSTOMER_AUTO_DIRECT))) { ?>

+										<?php if (in_array($this->callMod('wpsg_mod_abo', 'getSetting', ['wpsg_mod_abo_autoexpire_customer', $product_id]), Array(wpsg_mod_abo::CUSTOMER_AUTO_MAIL, wpsg_mod_abo::CUSTOMER_AUTO_DIRECT))) { ?>

 										<span class="link_wrap"><a href="<?php echo $this->getUrl(wpsg_ShopController::URL_ABO, 'wpsg_mod_abo', 'stoprenewal', Array('order_id' => $oOrder->id, 'product_key' => $oOrderProduct->getProductKey())); ?>"><?php echo __('Deaktivieren'); ?></a></span>

 										<?php } ?>

 							

diff --git a/views/mods/mod_abo/produkt_addedit_content.phtml b/views/mods/mod_abo/produkt_addedit_content.phtml
index d6e0acd..e4060fd 100644
--- a/views/mods/mod_abo/produkt_addedit_content.phtml
+++ b/views/mods/mod_abo/produkt_addedit_content.phtml
@@ -3,6 +3,9 @@
 	/**

 	 * Integriert die Abo-Einstellungen in das Produkt

 	 */

+

+    $arPaymentSelect = Array();

+    foreach ($this->arPayment as $p) { $arPaymentSelect[$p['id']] = $p['name']; }

 	

 ?>

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

@@ -53,8 +56,90 @@
 			

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

 					

+			<br />

+

+            <?php echo wpsg_drawForm_Select('wpsg_mod_abo_expiremode', __('Nach Ablauf des Abos', 'wpsg'), Array(

+            	wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),

+                wpsg_mod_abo::EXPIRE_MAIL => __('Mail versenden', 'wpsg'),

+                wpsg_mod_abo::EXPIRE_AUTO => __('Automatisch verlängern', 'wpsg')

+            ), $this->view['product']['wpsg_mod_abo_expiremode'], array('help' => 'wpsg_mod_abo_expiremode')); ?>

+

+			<br />

+			

+			<div class="wpsg_mod_abo_expiremode wpsg_mod_abo_expiremode_<?php echo wpsg_mod_abo::EXPIRE_MAIL; ?>" style="display:none;">

+			 

+				<?php echo wpsg_drawForm_Select('wpsg_mod_abo_wpsgmodaboexpiration', __('Mail bei Auslauf eines Abos', 'wpsg'), [

+					wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),

+					'0' => __('Nein', 'wpsg'),

+					'1' => __('Ja', 'wpsg')

+				], $this->view['product']['wpsg_mod_abo_wpsgmodaboexpiration'], array('hint' => wpsg_translate(__('Mail wird bei Auslauf eines Abos versendet. (mail_expiration.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodaboexpiration'), 'help' => 'wpsg_mod_abo_wpsgmodaboexpiration',)); ?>

+

+			</div>

+			

+			<div class="wpsg_mod_abo_expiremode wpsg_mod_abo_expiremode_<?php echo wpsg_mod_abo::EXPIRE_AUTO; ?>" style="display:none;">

+ 

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

+                

+				<?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_customermail', __('Mail an Kunden', 'wpsg'), [

+                    wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),

+                    '0' => __('Nein', 'wpsg'),

+                    '1' => __('Ja', 'wpsg')

+                ], $this->view['product']['wpsg_mod_abo_autoexpire_customermail'], ['help' => 'wpsg_mod_abo_autoexpire_customermail']); ?>

+

+                <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_adminmail', __('Mail an Administrator', 'wpsg'), [

+                    wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),

+                    '0' => __('Nein', 'wpsg'),

+                    '1' => __('Ja', 'wpsg')

+                ], $this->view['product']['wpsg_mod_abo_autoexpire_adminmail'], ['help' => 'wpsg_mod_abo_autoexpire_adminmail']); ?>

+

+                <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_information', __('Mail vor automatischer Verlängerung versenden', 'wpsg'), [

+                    wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),

+                    '0' => __('Nein', 'wpsg'),

+                    '1' => __('Ja', 'wpsg')

+                ], $this->view['product']['wpsg_mod_abo_autoexpire_information'], [

+                    'help' => 'wpsg_mod_abo_autoexpire_information',

+                    'hint' => wpsg_translate(__('Mail wird X-Tage vor einer automatischen Verlängerung versendet. (mail_autoinformation.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodabautoinfo')

+                ]); ?>

+				

+				<div class="wpsg_mod_abo_autoexpire_information wpsg_mod_abo_autoexpire_information_1" style="display:none;">

+

+                    <?php echo wpsg_drawForm_Input('wpsg_mod_abo_autoexpire_informationtime', __('Zeitspanne zum Versenden der Informationsmail in Tagen', 'wpsg'), $this->view['product']['wpsg_mod_abo_autoexpire_informationtime'], [

+                    	'help' => 'wpsg_mod_abo_autoexpire_informationtime'

+					]); ?>

+					

+				</div>

+				

+                <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_customer', __('Kunde kann im Frontend', 'wpsg'), [

+                    wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),

+                    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->view['product']['wpsg_mod_abo_autoexpire_customer'], array('help' => 'wpsg_mod_abo_autoexpire_customer')); ?>

+				

+			</div>

+			

+			<script>

+				

+				jQuery('#wpsg_mod_abo_expiremode').on('change', function() {

+				    

+				    jQuery('.wpsg_mod_abo_expiremode').hide();

+				    jQuery('.wpsg_mod_abo_expiremode_' + jQuery(this).val()).show();

+				    

+				}).change();

+				

+				jQuery('#wpsg_mod_abo_autoexpire_information').on('change', function() {

+

+                    jQuery('.wpsg_mod_abo_autoexpire_information').hide();

+                    jQuery('.wpsg_mod_abo_autoexpire_information_' + jQuery(this).val()).show();

+				    

+				}).change();

+				

+			</script>

+

 		</div>

 		

+		<br />

+		

 		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Abo-Moduls', 'wpsg'); ?></a>

 		

 	</div>

diff --git a/views/mods/mod_abo/settings_edit.phtml b/views/mods/mod_abo/settings_edit.phtml
index d134aaf..d9f88c1 100644
--- a/views/mods/mod_abo/settings_edit.phtml
+++ b/views/mods/mod_abo/settings_edit.phtml
@@ -24,9 +24,14 @@
 	wpsg_mod_abo::EXPIRE_AUTO => __('Automatisch verlängern', 'wpsg')

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

 

+<br />

+

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

 

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_wpsgmodaboexpiration', __('Mail bei Auslauf eines Abos', 'wpsg'), $this->get_option('wpsg_mod_abo_wpsgmodaboexpiration'), array('hint' => wpsg_translate(__('nohspc_Mail wird bei Auslauf eines Abos versendet. (mail_expiration.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodaboexpiration'), 'help' => 'wpsg_mod_abo_wpsgmodaboexpiration',)); ?>

+	<?php echo wpsg_drawForm_Select('wpsg_mod_abo_wpsgmodaboexpiration', __('Mail bei Auslauf eines Abos', 'wpsg'), [

+    	'0' => __('Nein', 'wpsg'),

+		'1' => __('Ja', 'wpsg')

+    ], $this->get_option('wpsg_mod_abo_wpsgmodaboexpiration'), array('hint' => wpsg_translate(__('Mail wird bei Auslauf eines Abos versendet. (mail_expiration.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodaboexpiration'), 'help' => 'wpsg_mod_abo_wpsgmodaboexpiration',)); ?>

 

 </div>

 

@@ -34,15 +39,32 @@
 	

 	<?php /* TODO: Mehrfachauswahl von Zahlungsarten */ ?>

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

-<br />		

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_autoexpire_customermail', __('Mail an Kunden', 'wpsg'), $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', 'wpsg'), $this->get_option('wpsg_mod_abo_autoexpire_adminmail'), array ('help' => 'wpsg_mod_abo_autoexpire_adminmail')); ?>

-<br />	

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_autoexpire_information', __('Mail vor automatischer Verlängerung versenden', 'wpsg'), $this->get_option('wpsg_mod_abo_autoexpire_information'), array('hint' => wpsg_translate(__('Mail wird X-Tage vor einer automatischen Verlängerung versendet. (mail_autoinformation.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodabautoinfo'), 'help' => 'wpsg_mod_abo_autoexpire_information')); ?>

+

+	<?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_customermail', __('Mail an Kunden', 'wpsg'), [

+        '0' => __('Nein', 'wpsg'),

+        '1' => __('Ja', 'wpsg')

+    ], $this->get_option('wpsg_mod_abo_autoexpire_customermail'), ['help' => 'wpsg_mod_abo_autoexpire_customermail']); ?>

+

+    <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_adminmail', __('Mail an Administrator', 'wpsg'), [

+        '0' => __('Nein', 'wpsg'),

+        '1' => __('Ja', 'wpsg')

+    ], $this->get_option('wpsg_mod_abo_autoexpire_adminmail'), ['help' => 'wpsg_mod_abo_autoexpire_adminmail']); ?>

+

+    <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_information', __('Mail vor automatischer Verlängerung versenden', 'wpsg'), [

+        '0' => __('Nein', 'wpsg'),

+        '1' => __('Ja', 'wpsg')

+    ], $this->get_option('wpsg_mod_abo_autoexpire_information'), [

+    	'help' => 'wpsg_mod_abo_autoexpire_information', 

+		'hint' => wpsg_translate(__('Mail wird X-Tage vor einer automatischen Verlängerung versendet. (mail_autoinformation.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodabautoinfo')

+	]); ?>

+		

 	<div class="wpsg_mod_abo_autoexpire_informationactiv" style="display:none;">	

+		

 		<?php echo wpsg_drawForm_Input('wpsg_mod_abo_autoexpire_informationtime', __('Zeitspanne zum Versenden der Informationsmail in Tagen', 'wpsg'), $this->get_option('wpsg_mod_abo_autoexpire_informationtime'), array('help' => 'wpsg_mod_abo_autoexpire_informationtime')); ?>

+		

 	</div>

-<br />

+	

+	<br />

 

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

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

@@ -82,7 +104,7 @@
 

 		jQuery('#wpsg_mod_abo_autoexpire_information').bind('change', function() {

 

-			if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_abo_autoexpire_informationactiv').show();

+			if (jQuery(this).val() === '1') jQuery('.wpsg_mod_abo_autoexpire_informationactiv').show();

 			else jQuery('.wpsg_mod_abo_autoexpire_informationactiv').hide();

 			

 		} ).change();