From b13d50858a50be6e4ad68a709581a88f30edac42 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 19 Sep 2023 18:21:04 +0000
Subject: - Rechnungen neu schreiben / PHP 8.2 Fehler

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8369 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_prepayment/order_done.phtml |  8 ++++++--
 views/mods/mod_rechnungen/order_view.phtml | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/views/mods/mod_prepayment/order_done.phtml b/views/mods/mod_prepayment/order_done.phtml
index bd52650..5d26a4f 100644
--- a/views/mods/mod_prepayment/order_done.phtml
+++ b/views/mods/mod_prepayment/order_done.phtml
@@ -28,11 +28,14 @@
 
 		<?php 
 
+		try {
+			
 			$img = array();
 			$img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 10, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-
+ 		
+			
 		?>
-
+ 
 		<div class="wpsg_mod_prepayment_info_wrap">
 			<?php foreach ($img as $i) { ?>
 				<div class="wpsg_mod_prepayment_info">
@@ -76,6 +79,7 @@
 			<?php } ?>
 		</div>
 
+		<?php } catch (\Exception $e) { } ?>
 
 	<?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { ?>
 
diff --git a/views/mods/mod_rechnungen/order_view.phtml b/views/mods/mod_rechnungen/order_view.phtml
index ce5e2ae..0365c96 100644
--- a/views/mods/mod_rechnungen/order_view.phtml
+++ b/views/mods/mod_rechnungen/order_view.phtml
@@ -30,17 +30,23 @@
                     <div>
                         <?php echo $oInvoice->getNr(true); ?>
                     </div>
-                    <div style="text-align:right;">
-                        
+                    <div style="text-align:right; white-space:nowrap;">
+                    
+						<a target="_blank" href="<?php
+						
+							echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$_REQUEST['edit_id'].'&r_id='.$r['id'].'&do=rebuildadmin', 'wpsg-mod_invoice-order_ajax-rebuildadmin-'.$_REQUEST['edit_id']);
+							
+						?>" style="color:red;"><?php echo __('Neu erstellen', 'wpsg'); ?></a>
+						
                         <a target="_blank" onclick="if (!confirm('<?php echo __('Sind Sie sicher, dass Sie eine Kopie dieser Rechnung/Rechnungskorrektur erneut an den Kunden senden möchten?', 'wpsg'); ?>')) return false;" href="<?php 
                             
                             if ($r['o_id'] == '0') {
                                 // Multirechnung
                                 $r_o_ids = array_map('intval', explode(',', $r['o_ids']));
-                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$r_o_ids[0].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$r_o_ids[0]);
+                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$_REQUEST['edit_id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$_REQUEST['edit_id']);
                             } else {
                                 // normale Rechnung
-                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$this->view['data']['id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$this->view['data']['id']);
+                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$_REQUEST['edit_id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$_REQUEST['edit_id']);
                             }
 
                         ?>"><?php echo ' &nbsp;'.__("Kopie senden", "wpsg"); ?></a>&nbsp; 
@@ -59,6 +65,6 @@
     
 <style>
     
-    #wpsg_mod_rechnungen_order_view .grid { display:grid; width:100%; grid-template-columns:150px 1fr 100px; row-gap:0.25rem; }
+    #wpsg_mod_rechnungen_order_view .grid { display:grid; width:100%; grid-template-columns:150px 1fr 250px; row-gap:0.25rem; column-gap:1rem; }
     
 </style>
\ No newline at end of file
-- 
cgit v1.2.3