From 4ff7abd50d825caef5acc1a7eaa7966eac112764 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Mon, 23 Nov 2020 08:25:58 +0000
Subject: - K

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7812 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/order/index.phtml | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

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

diff --git a/views/order/index.phtml b/views/order/index.phtml
index ee56a66..afd03b7 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -350,7 +350,18 @@
 
                             <?php $oOrderProducts = $oOrder->getOrderProducts(); ?>
                             
-                            <?php foreach ($oOrderProducts as $oOrderProduct) { $product_id = $oOrderProduct->getProductId(); ?>
+                            <?php foreach ($oOrderProducts as $oOrderProduct) { 
+                            	
+                            		$product_id = $oOrderProduct->getProductId();
+                                	$oAbo = null;
+                            		
+                            		if ($this->hasMod('wpsg_mod_abo')) {
+                            			
+                            			try { $oAbo = wpsg_abo::getFromOrderAndOrderProduct($oOrder->getId(), $oOrderProduct->getId()); } catch (\Exception $e) {  }
+                            			
+                                    }
+								
+								?>
                             
                                 <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
                                     $oOrderProduct->getCount(),
@@ -359,23 +370,21 @@
                                     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 } ?>
+                                <?php if ($oAbo !== null) { ?>
+ 
+									<?php
+									 
+										$state = $oAbo->getState();
+									
+										echo __('Abo Laufzeit:', 'wpsg'); 
+									
+									?>
 
-                                        <br />
-                                        
-                                    <?php } ?>
+									<?php if ($state === wpsg_abo::STATE_INEXTENSION) { ?><span style="color:orange;"><?php echo $oAbo->getStateLabel(); ?></span>
+									<?php } else if ($state === wpsg_abo::STATE_RUNNING) { ?><span style="color:green;"><?php echo $oAbo->getStateLabel(); ?></span>
+									<?php } else if ($state === wpsg_abo::STATE_EXTEND) { ?><span style="color:red;"><?php echo $oAbo->getStateLabel(); ?></span><?php } ?>
+									 
+									<br />  
                                     
                                 <?php } ?>
                             
-- 
cgit v1.2.3