From 2e1ec6f94b7a22acf120720ba2a047e1738f6cfe Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Mon, 22 Jan 2018 07:24:26 +0000
Subject: Abo-Verwaltung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6867 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_abo/index.phtml | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/views/mods/mod_abo/index.phtml b/views/mods/mod_abo/index.phtml
index edc0871..0f99c44 100644
--- a/views/mods/mod_abo/index.phtml
+++ b/views/mods/mod_abo/index.phtml
@@ -60,18 +60,18 @@
                         <?php echo wpsg_drawForm_TextStart(); ?>
                         <div class="row">
                             <div class="col-lg-6">
-                                <select name="filter[cdate_m]" class="form-control input-sm">
+                                <select name="filter[enddate_m]" class="form-control input-sm">
                                     <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
                                     <?php for ($i = 1; $i <= 12; $i ++) { ?>
-                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
+                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
                                     <?php } ?>
                                 </select>
                             </div>
                             <div class="col-lg-6">
-                                <select name="filter[cdate_y]" class="form-control input-sm">
+                                <select name="filter[enddate_y]" class="form-control input-sm">
                                     <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
-                                    <?php foreach ($this->view['cdate_years'] as $y) { ?>
-                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
+                                    <?php foreach ($this->view['enddate_years'] as $y) { ?>
+                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
                                     <?php } ?>
                                 </select>
                             </div>
@@ -130,19 +130,21 @@
 
                             <input class="col_set_checkbox" name="wpsg_multido[<?php echo $oOrder->id; ?>]" type="checkbox" />
 
-                        </td>                       
+                        </td>
                         <td class="col_nr">
 
                             <?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />
 
                             <div class="actions">
-                                <span class="view"><a title="<?php echo __("Diese Abonnement ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>
+                                <span class="view"><a title="<?php echo __("Dieses Abonnement ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>
                                 |
-                                <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Abonnement kündigen möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Abonnement stornieren", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Kündigen", "wpsg"); ?></a></span>
+                                <?php if ($this->view['arFilter']['status'] != wpsg_ShopController::STATUS_GEKUENDIGTEABOS) { ?>
+                                <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement kündigen möchten?', 'wpsg'); ?>');" title="<?php echo __("Dieses Abonnement kündigen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=resign&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Kündigen", "wpsg"); ?></a></span>
                                 |
-                                <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Abonnement löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
+                                <?php } ?>
+                                <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Dieses Abonnement löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&abo=1&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
                             </div>
-												
+							
                             <?php if (trim($oOrder->admincomment) != "") { ?>
                             <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"></a>
                             <?php } ?>
@@ -153,9 +155,9 @@
 														
                             <?php if ($oOrder->hasShippingAdress()) { ?>
                             <a title="<?php echo __("Lieferadresse beachten", "wpsg"); ?>" onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"></a>
-                            <?php } ?>                                                  
+                            <?php } ?>
 
-                        </td>                        
+                        </td>
                         <td class="col_customer">
                             <?php $firma = $oOrder->getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?>
                             <?php echo $firma; ?><br />
@@ -165,7 +167,7 @@
                             <span class="wpsg_grey"><?php echo $oOrder->getInvoiceStreet(); ?><br />
                             <?php echo ltrim($oOrder->getInvoiceZip().' '.$oOrder->getInvoiceCity()); ?> <?php echo $oOrder->getInvoiceCountryKuerzel(); ?>
                             </span>
-                        </td>                        
+                        </td>
                         <td class="col_payment">
 
                             <?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>
@@ -179,7 +181,7 @@
                             &nbsp;-&nbsp;<?php echo wpsg_ff($oOrder->getPaymentAmount(), $this->get_option('wpsg_currency')); ?>
                             <?php } ?>
 
-                        </td>                        
+                        </td>
                         <td class="col_shipping">
 
                             <?php echo $oOrder->getShippingLabel(); ?>
@@ -197,7 +199,7 @@
                             </span>
                             <?php } ?>
 
-                        </td>                     
+                        </td>
                         <td class="col_products">
 
                             <?php $oOrderProducts = $oOrder->getOrderProducts(); ?>
@@ -218,14 +220,12 @@
                             <?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>
                         </td>
                         
-                        /* Laufzeitspalte */
+                        <?php /* Laufzeitspalte */ ?>
                         <td class="col_time">
                             <?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>
@@ -266,7 +266,6 @@
 
             <div class="wpsg_clear"></div>
 
-
 		<?php } else { ?>
 
             <?php echo wpsg_drawForm_AdminboxStart(); ?>
-- 
cgit v1.2.3