From 754a5c89e217a89f3ffa652f35e680f1bfb63375 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 17 Nov 2020 12:53:35 +0000
Subject: - K

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7809 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_abo/index.phtml      |  83 +++++++++++--------
 views/mods/mod_abo/order_view.phtml | 160 +++++++++++++++++++-----------------
 2 files changed, 136 insertions(+), 107 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_abo/index.phtml b/views/mods/mod_abo/index.phtml
index aaf9cb3..d188f46 100644
--- a/views/mods/mod_abo/index.phtml
+++ b/views/mods/mod_abo/index.phtml
@@ -1,8 +1,9 @@
 <?php
 
-/**
- * Template für die Übersicht der Abonnements
-*/
+	/**
+	 * Template für die Übersicht der Abonnements
+	*/
+	
 ?>
 
 <div class="wpsg_order" id="wpsg-bs">
@@ -133,7 +134,12 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ($this->view['arData'] as $oAbo) { $oOrder = $oAbo->getOrder(); ?>
+                    <?php foreach ($this->view['arData'] as $oAbo) { 
+                    	
+                    	$oOrder = $oAbo->getOrder(); 
+                    	$oOrderProduct = $oAbo->getOrderProduct();	
+                    	
+					?>
                     <tr>
                         <td class="col_checkbox">
 
@@ -154,7 +160,7 @@
                                 |
                                 <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_admin_url('Order', 'delete', ['edit_id' => $oOrder->id], ['abo' => '1', 'noheader' => '1']);	
+									echo wpsg_admin_url('Abo', 'delete', ['abo_id' => $oAbo->id], ['noheader' => '1']);	
 																			
 								?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
 							
@@ -213,19 +219,21 @@
                         </td>
                         <td class="col_products">
 
-                            <?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(),
+							<?php if ($oOrderProduct === false) { ?>
+
+                                <?php echo __('Produkt nicht gefunden.', 'wpsg'); ?>
+								
+							<?php } else { ?>
+								
+								<?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
+									$oOrderProduct->getCount(),
 									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->getProductName(),
-                                    wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))
-                                ); ?>
+									$oOrderProduct->getProductName(),
+									wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))
+								); ?>
+							
+							<?php } ?>
                             
-                            <?php } ?>
-
                         </td>
                         <td class="col_sum">
                             <?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>
@@ -233,23 +241,32 @@
                         
                         <?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 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 if ($oOrderProduct === false) { ?>
+
+                                <?php echo __('Produkt nicht gefunden.', 'wpsg'); ?>
+								
+							<?php } else { ?>
+							
+								<?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 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 } ?>
                             
                        </td>
 						
diff --git a/views/mods/mod_abo/order_view.phtml b/views/mods/mod_abo/order_view.phtml
index 52ea434..3242993 100644
--- a/views/mods/mod_abo/order_view.phtml
+++ b/views/mods/mod_abo/order_view.phtml
@@ -10,86 +10,98 @@
        
 <?php foreach ($this->view['arOrderedAboProducts'] as $oOrderProduct) {
 
-    $oAbo = wpsg_abo::getFromOrderAndProduct($view['oOrder']->getId(), $oOrderProduct->getId());
+	try {
+    
+		$oAbo = wpsg_abo::getFromOrderAndProduct($view['oOrder']->getId(), $oOrderProduct->getId());
+		
+		?>
 	
-	?>
-
-    <?php echo wpsg_drawForm_AdminboxStart($oOrderProduct->getProduct()->getProductName()); ?>
-
-        <?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())); ?>
+		<?php echo wpsg_drawForm_AdminboxStart($oOrderProduct->getProduct()->getProductName()); ?>
 	
-		<script>
-
-            moment.locale('de');
+			<?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())); ?>
+		
+			<script>
+	
+				moment.locale('de');
+				
+				jQuery('#wpsg_mod_abo_duration').editable({
+					type: 'combodate',
+					display: function(value) {
+						
+						jQuery(this).html(value.format('DD.MM.YYYY HH:mm:ss'));
+						
+					},
+					success: function(response, newValue) {
+						
+						jQuery.ajax({
+							url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo&subaction=admin_inlineEdit&noheader=1',
+							data: {
+								field: 'duration',
+								product_key: '<?php echo $oOrderProduct->getProductKey(); ?>',
+								order_id: '<?php echo $view['oOrder']->getId() ?>',
+								date: newValue.format()
+							},
+							success: function(response) {
+	 
+								jQuery('.wpsg_abo_state').attr("class", "col-sm-6 wpsg_abo_state_class_" + response.state)
+															
+							}
+						})
+						
+					},
+					format: 'DD.MM.YYYY HH:mm:ss',
+					viewformat: 'DD.MM.YYYY HH:mm:ss',
+					template: 'D MMM YYYY  HH:mm:ss',
+					combodate: {
+						minYear: 2000,
+						maxYear: <?php echo (intval(date('Y')) + 1); ?>,
+						minuteStep: 1
+					}
+				}); 
+				
+			</script>
+	
+			<?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
+		
+				$strURL = $this->callMod('wpsg_mod_abo', 'getRebuyLink', [$view['oOrder']->getId(), $oOrderProduct->getProductKey()]);
+				$strURL = '<a href="'.$strURL.'">'.$strURL.'</a>';
+		
+				echo wpsg_drawForm_Text(__('URL für den Kauf einer Verlängerung', 'wpsg'), $strURL); 
+				
+			?>
+		
+			<?php echo wpsg_drawForm_TextStart(); ?>
 			
-            jQuery('#wpsg_mod_abo_duration').editable({
-				type: 'combodate',
-                display: function(value) {
-				    
-                    jQuery(this).html(value.format('DD.MM.YYYY HH:mm:ss'));
-				    
-				},
-                success: function(response, newValue) {
-				    
-					jQuery.ajax({
-                        url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo&subaction=admin_inlineEdit&noheader=1',
-						data: {
-                            field: 'duration',
-							product_key: '<?php echo $oOrderProduct->getProductKey(); ?>',
-							order_id: '<?php echo $view['oOrder']->getId() ?>',
-							date: newValue.format()
-                        },
-						success: function(response) {
- 
-                            jQuery('.wpsg_abo_state').attr("class", "col-sm-6 wpsg_abo_state_class_" + response.state)
-                                                        
-						}
-					})
-				    
-                },
-                format: 'DD.MM.YYYY HH:mm:ss',
-                viewformat: 'DD.MM.YYYY HH:mm:ss',
-                template: 'D MMM YYYY  HH:mm:ss',
-                combodate: {
-                    minYear: 2000,
-                    maxYear: <?php echo (intval(date('Y')) + 1); ?>,
-                    minuteStep: 1
-                }
-            }); 
+				<?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) { ?>
 			
-		</script>
-
-        <?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
-	
-			$strURL = $this->callMod('wpsg_mod_abo', 'getRebuyLink', [$view['oOrder']->getId(), $oOrderProduct->getProductKey()]);
-			$strURL = '<a href="'.$strURL.'">'.$strURL.'</a>';
+					<?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 __('Deaktivieren'); ?></a>&nbsp;]
+			
+				<?php } else if ($abo_product_status['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>
+			
+					<?php echo __('Inaktiv', 'wpsg'); ?>
 	
-			echo wpsg_drawForm_Text(__('URL für den Kauf einer Verlängerung', 'wpsg'), $strURL); 
+					&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 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 __('Deaktivieren'); ?></a>&nbsp;]
-        
-            <?php } else if ($abo_product_status['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>
-        
-                <?php echo __('Inaktiv', 'wpsg'); ?>
+				<?php } ?>
+		
+			<?php echo wpsg_drawForm_TextEnd(__('Verlängerung')); ?>
+			  
+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+		
+	<?php } catch (\Exception $e) { ?>
 
-                &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 echo wpsg_drawForm_AdminboxEnd(); ?>
+        <?php echo wpsg_drawForm_AdminboxStart($oOrderProduct->getProduct()->getProductName()); ?>
+		
+			<p><?php echo __('Abo wurde gelöscht.', 'wpsg'); ?></p>
+		
+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+		
+	<?php } ?>
     
 <?php } ?>
\ No newline at end of file
-- 
cgit v1.2.3