From 141750106d23b13633fad3e828e7565976762abd Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 19 Dec 2017 10:15:56 +0000
Subject: - AboModul Erweiterung - 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
---
 views/order/index.phtml | 57 +++++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

(limited to 'views/order/index.phtml')

diff --git a/views/order/index.phtml b/views/order/index.phtml
index 7c8f463..aca2971 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -171,22 +171,10 @@
                             <?php } ?>
 
                             <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
-                            
-                                <?php if (in_array(strval($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id))), array(1))) { ?>
-                                    
-                                    <?php $abo_expiration = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id))); ?>
 
-                                    <?php echo __('Abo:', 'wpsg'); ?>
-                                    
-                                    <?php if ($abo_expiration > time()) { ?>
-                                        <span class="wpsg_mod_abo_future_expire"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>
-                                    <?php } else { ?>
-                                        <span class="wpsg_mod_abo_expired"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>    
-                                    <?php } ?>
-                                    
-                                <?php } ?>
-                                
-                                <?php if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 2) { ?>
+                                <?php if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 1) { ?>
+                                    <?php echo __('Abo Bestellung', 'wpsg'); ?>
+                                <?php } else if ($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 2) { ?>
                                     
                                     <?php
 
@@ -245,14 +233,37 @@
                         </td>
                         <td class="col_products">
 
-                            <?php $oOrderProducts = $oOrder->getOrderProducts();
-                            foreach ($oOrderProducts as $oOrderProduct) { ?>
-                            <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
-                                $oOrderProduct->getCount(),
-                                WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(),
-                                $oOrderProduct->getProductName(),
-                                wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))
-                            ); ?><br />
+                            <?php $oOrderProducts = $oOrder->getOrderProducts(); ?>
+                            
+                            <?php foreach ($oOrderProducts as $oOrderProduct) { ?>
+                            
+                                <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
+                                    $oOrderProduct->getCount(),
+                                    WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(),
+                                    $oOrderProduct->getProductName(),
+                                    wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))
+                                ); ?><br />
+                                
+                                <?php if ($this->hasMod('wpsg_mod_abo')) { ?>
+
+                                    <?php if (in_array(strval($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id))), array(1))) { ?>
+
+                                        <?php $abo_expiration = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id, $oOrderProduct->getProductKey()))); ?>
+
+                                        <?php echo __('Abo Laufzeit:', 'wpsg'); ?>
+
+                                        <?php if ($abo_expiration > time()) { ?>
+                                            <span class="wpsg_mod_abo_future_expire"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>
+                                        <?php } else { ?>
+                                            <span class="wpsg_mod_abo_expired"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>
+                                        <?php } ?>
+
+                                        <br />
+                                        
+                                    <?php } ?>
+                                    
+                                <?php } ?>
+                            
                             <?php } ?>
 
                         </td>
-- 
cgit v1.2.3