- AboModul Erweiterung4.0.5

- Optionaler Versand an Admin wenn Abo angehlaten werden soll
- Protokoll
- Frontendfunktionen / Darstellung der Abos

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

6 files changed, 150 insertions, 77 deletions

diff --git a/views/mods/mod_abo/mail_admin_stoprenewal.phtml b/views/mods/mod_abo/mail_admin_stoprenewal.phtml
new file mode 100644
index 0000000..9bb7825
--- /dev/null
+++ b/views/mods/mod_abo/mail_admin_stoprenewal.phtml
@@ -0,0 +1,14 @@
+<?php

+

+    /**

+     * Template für die Mail, die der Admin bekommt wenn ein Kunde ein Abo im Frontend anhalten möchte (Text)

+     */

+    

+?><?php echo __('Hallo Administrator,', 'wpsg'); ?> 

+

+<?php echo wpsg_translate(__('Der Kunde "#1#" möchte sein Abo für Produkte "#2#" anhalten.'), trim($this->view['oCustomer']->getFirstname().$this->view['oCustomer']->getName()), $this->view['oProduct']->getProductName()); ?> 

+

+<?php echo wpsg_translate(__('Link zur Ausgangsbestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$this->view['oOrder']->id); ?> 

+<?php echo wpsg_translate(__('Direkt stoppen und zur Bestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id='.$this->view['oOrder']->id.'&product_key='.$this->view['product_key'].'&do=stop&noheader=1'); ?> 

+

+<?php echo __('Dies ist eine automatisch generierte Mail.', 'wpsg'); ?> 
\ No newline at end of file
diff --git a/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml b/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml
new file mode 100644
index 0000000..e30f72b
--- /dev/null
+++ b/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml
@@ -0,0 +1,16 @@
+<?php

+

+    /**

+     * Template für die Mail, die der Admin bekommt wenn ein Kunde ein Abo im Frontend anhalten möchte (HTML)

+     */

+    

+?>

+

+<?php echo __('Hallo Administrator,', 'wpsg'); ?><br />

+<br />

+<?php echo wpsg_translate(__('Der Kunde "#1#" möchte sein Abo für Produkte "#2#" anhalten.'), trim($this->view['oCustomer']->getFirstname().$this->view['oCustomer']->getName()), $this->view['oProduct']->getProductName()); ?><br />

+<br />

+<?php echo wpsg_translate(__('Link zur Ausgangsbestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$this->view['oOrder']->id); ?><br />

+<?php echo wpsg_translate(__('Direkt stoppen und zur Bestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id='.$this->view['oOrder']->id.'&product_key='.$this->view['product_key'].'&do=stop&noheader=1'); ?><br />

+<br />

+<?php echo __('Dies ist eine automatisch generierte Mail.', 'wpsg'); ?>

diff --git a/views/mods/mod_abo/order_view.phtml b/views/mods/mod_abo/order_view.phtml
index 8ae8a65..29fc978 100644
--- a/views/mods/mod_abo/order_view.phtml
+++ b/views/mods/mod_abo/order_view.phtml
@@ -10,35 +10,31 @@
 <?php foreach ($this->view['arOrderedAboProducts'] as $oOrderProduct) { ?>

 

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

-         

+

+        <?php $tExpire = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', Array($_REQUEST['edit_id'], $oOrderProduct->getProductKey()))); echo wpsg_drawForm_Text(__('Laufzeit', 'wpsg'), wpsg_formatTimestamp($tExpire), false, Array('class_content_wrap' => (($tExpire > time())?'wpsg_mod_abo_future_expire':'wpsg_mod_abo_expired'))); ?>

+

+        <?php echo wpsg_drawForm_Text(wpsg_translate(__('Preis (#1# Tage):', 'wpsg'), $oOrderProduct->getProduct()->wpsg_mod_abo_durration), wpsg_ff($oOrderProduct->getProduct()->wpsg_mod_abo_price, $this->get_option('wpsg_currency'))); ?>

+    

         <?php echo wpsg_drawForm_TextStart(); ?>

-            

+        

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

     

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

         

                 <?php echo __('Aktiv', 'wpsg'); ?>

-

-                &nbsp;[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&product_key=<?php echo $oOrderProduct->getProductKey(); ?>&do=stop&noheader=1"><?php echo __('Anhalten'); ?></a>&nbsp;]

+        

+                &nbsp;[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&product_key=<?php echo $oOrderProduct->getProductKey(); ?>&do=stop&noheader=1"><?php echo __('Deaktivieren'); ?></a>&nbsp;]

         

             <?php } else if ($abo_product_status['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>

         

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

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

 

-                &nbsp;[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&product_key=<?php echo $oOrderProduct->getProductKey(); ?>&do=run&noheader=1"><?php echo __('Fortsetzen'); ?></a>&nbsp;]

+                &nbsp;[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&product_key=<?php echo $oOrderProduct->getProductKey(); ?>&do=run&noheader=1"><?php echo __('Aktivieren'); ?></a>&nbsp;]

         

             <?php } ?>

     

         <?php echo wpsg_drawForm_TextEnd(__('Verlängerung')); ?>

-    

-        <?php $tExpire = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', Array($_REQUEST['edit_id']))); echo wpsg_drawForm_Text(__('Abo läuft bis'), wpsg_formatTimestamp($tExpire), false, Array('class_content_wrap' => (($tExpire > time())?'wpsg_mod_abo_future_expire':'wpsg_mod_abo_expired'))); ?>

-     

-        <?php /* echo wpsg_drawForm_TextStart(); ?>

-

-            <?php echo wpsg_translate(_('Erstkauf am #1#', 'wpsg'), $this->view['data']['cdate']); ?>

-    

-        <?php echo wpsg_drawForm_TextEnd(__('Verlauf', 'wpsg')); */ ?>

-    

+          

     <?php echo wpsg_drawForm_AdminboxEnd(); ?>

     

 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_abo/page_abo.phtml b/views/mods/mod_abo/page_abo.phtml
new file mode 100644
index 0000000..1646cff
--- /dev/null
+++ b/views/mods/mod_abo/page_abo.phtml
@@ -0,0 +1,104 @@
+<?php

+

+	/**

+	 * Template für die Übersichtsseite der Abonnements im Frontend

+	 */

+ 

+?>

+

+<div class="wpsg_mod_kundenverwaltung_abo wpsg">

+

+	<?php echo $this->writeFrontendMessage(); ?>

+	

+	<?php if (wpsg_isSizedArray($this->view['arOrder'])) { ?>

+		

+		<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())); ?>

+			

+				<div class="wpsg_mod_abo_order_product">

+

+					<h1 class="entry-title title">

+						<?php echo wpsg_translate(__('Abo "#1#" aus Bestellung #2#', 'wpsg'), $oOrderProduct->getProduct()->getProductName(), $oOrder->getNr()); ?>

+					</h1>

+					

+					<?php $nAttachmentID = $this->imagehandler->getAttachmentID($oOrderProduct->getProductKey()); ?>

+					

+					<?php if (wpsg_isSizedInt($nAttachmentID)) { ?>

+						<div class="image">

+							<?php echo wp_get_attachment_image($nAttachmentID, array(100, 100), false, array()); ?>

+						</div>

+					<?php } ?>

+			

+					<div class="content">

+					

+						<div class="start">

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

+							<span class="value">

+								

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

+								

+							</span>

+						</div>

+						<div class="price">

+							<span class="label"><?php echo wpsg_translate(__('Preis (#1# Tage):', 'wpsg'), $oOrderProduct->getProduct()->wpsg_mod_abo_durration); ?></span>

+							<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="value">

+								

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

+								

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

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

+								<?php } else { ?>

+									<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="value">

+													

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

+									

+									<span class="status_activ"><?php echo __('Aktiv'); ?></span>

+									

+									<?php if (strtotime($aboStatus['mail_admin_stop'])) { ?>

+	

+										<?php echo __('Kündigung ausstehend', 'wpsg'); ?>

+										

+									<?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))) { ?>

+										<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 } ?>

+							

+									<?php } ?>

+									

+								<?php } else if ($aboStatus['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>

+									<span class="status_inactiv"><?php echo __('Inaktiv') ?></span>

+								<?php } ?> 

+								

+							</span>

+						</div>

+					</div>

+					

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

+					

+				</div>

+				

+			<?php } // foreach OrderProducts ?>

+							

+		<?php } // foreach Order ?>

+		</div>

+		

+	<?php } else { ?>

+	

+		<p><?php echo __('Bisher kein(e) Abonnement(s) vorhanden.', 'wpsg'); ?></p>

+		

+	<?php } ?>

+</div>
\ No newline at end of file
diff --git a/views/mods/mod_abo/settings_edit.phtml b/views/mods/mod_abo/settings_edit.phtml
index bd57d0e..8b88bfb 100644
--- a/views/mods/mod_abo/settings_edit.phtml
+++ b/views/mods/mod_abo/settings_edit.phtml
@@ -16,8 +16,8 @@
 <br />

  

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

-	wpsg_mod_abo::EXPIRE_MAIL => _('Mail versenden', 'wpsg'),

-	wpsg_mod_abo::EXPIRE_AUTO => _('Automatisch verlängern', 'wpsg')

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

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

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

 

 <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'); ?>;">

@@ -32,9 +32,9 @@
 	<?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_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')

+		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()); ?>	

 	

 </div>

diff --git a/views/mods/mod_kundenverwaltung/abo.phtml b/views/mods/mod_kundenverwaltung/abo.phtml
deleted file mode 100644
index 483d46d..0000000
--- a/views/mods/mod_kundenverwaltung/abo.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php

-

-	/**

-	 * Template für die Übersichtsseite der Abonnements im Frontend

-	 */

-

-	//wpsg_debug($this->view['arOrder']);

-

-?>

-

-<div class="wpsg_mod_kundenverwaltung_abo wpsg">

-

-	<?php echo $this->writeFrontendMessage(); ?>

-	

-	<?php if (wpsg_isSizedArray($this->view['arOrder'])) { ?>

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

-		

-		<div class="wpsg_box">

-			

-			<div class="wpsg_inner wpsg_order_<?php echo $order['id']; ?>">

-			

-			<?php /* Abo-Name */ ?>

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

-			

-			<?php /* Abo-Preis */ ?>

-			

-			<?php /* Anhalten des Abos */ ?>

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

-    

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

-        

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

-

-                &nbsp;[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&product_key=<?php echo $oOrderProduct->getProductKey(); ?>&do=stop&noheader=1"><?php echo __('Anhalten'); ?></a>&nbsp;]

-        

-            <?php } else if ($abo_product_status['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>

-        

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

-

-                &nbsp;[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&product_key=<?php echo $oOrderProduct->getProductKey(); ?>&do=run&noheader=1"><?php echo __('Fortsetzen'); ?></a>&nbsp;]

-        

-            <?php } ?>

-    

-        	<?php echo wpsg_drawForm_TextEnd(__('Verlängerung')); ?>

-			

-			<?php /* Ablaufzeitpunkt */ ?>		

-			<?php $tExpire = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', Array($_REQUEST['edit_id']))); echo wpsg_drawForm_Text(__('Abo läuft bis'), wpsg_formatTimestamp($tExpire), false, Array('class_content_wrap' => (($tExpire > time())?'wpsg_mod_abo_future_expire':'wpsg_mod_abo_expired'))); ?>				

-				

-			</div>

-		

-		</div>

-				

-		<?php } ?>

-	<?php } else { ?>

-	<p><?php echo __('Bisher kein(e) Abonnement(s) vorhanden.', 'wpsg'); ?></p>

-	<?php } ?>

-</div>
\ No newline at end of file