From 95214639efa9fcf49b9fe576c7f6e611176064c8 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 18 Oct 2023 14:00:08 +0000
Subject: - SwissQR ausgelagert

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8375 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/frontend.css                        |  6 +++-
 views/mods/mod_prepayment/order_done.phtml    | 49 +++++++++++++--------------
 views/mods/mod_prepayment/settings_edit.phtml | 39 ---------------------
 views/mods/mod_rechnungen/copymail.phtml      | 14 ++++----
 4 files changed, 36 insertions(+), 72 deletions(-)

(limited to 'views')

diff --git a/views/css/frontend.css b/views/css/frontend.css
index f249aa0..b7b5a02 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -78,7 +78,11 @@ input.wpsg_error { border-color:red !important; }
 
 .wpsg_basket .wpsg_checkoutbutton { float:right; padding:0.75em 1em; }
 .wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; }
-.wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; padding:0.75em 1em; }
+.wpsg_checkout2 .wpsg_overviewbutton,
+.wpsg_checkout2 .wpsg_checkoutbutton,
+.wpsg_overview .wpsg_orderbutton,
+.wpsg_overview .wpsg_checkoutbutton,
+.wpsg_basket .wpsg_refreshbutton, .wpsg_checkout2button, .wpsg_basketbutton { float:left; padding:0.75em 1em; }
 .wpsg_basket .wpsg_basket_weiter_shoppen {background:#1a1a1a none repeat scroll 0 0; border:0 none; border-radius:2px; color:#fff; font-weight:700; line-height:1; text-transform:uppercase; padding:0.85em 0.875em 0.78em;}
 .wpsg_basket .product_action_printshop .label { align-self:flex-start; }
 .wpsg_basket .product_action_printshop .files ul li { list-style:none; display:flex; align-items:center; justify-content:flex-end; }
diff --git a/views/mods/mod_prepayment/order_done.phtml b/views/mods/mod_prepayment/order_done.phtml
index 5d26a4f..b8caa25 100644
--- a/views/mods/mod_prepayment/order_done.phtml
+++ b/views/mods/mod_prepayment/order_done.phtml
@@ -18,7 +18,7 @@
 <?php echo wpsg_translate(__('Bitte als Betreff angeben: "#1#"', 'wpsg'), $this->view['wpsg_mod_prepayment']['subject']); ?>
 <br /><br />
 
-<?php if ( isset($this->view['wpsg_mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true) ) { ?>
+<?php return; if ( isset($this->view['wpsg_mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true) ) { ?>
 
 	<?php require_once WPSG_PATH_LIB.'phpgirocode.class.php'; ?>
 
@@ -27,13 +27,12 @@
 		<!-- Girocode und QR-Rechnung -->
 
 		<?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">
@@ -41,7 +40,7 @@
 				<div class="wpsg_mod_prepayment_info">
 					<div class="wpsg_mod_prepayment_info_left">
                     <div class="wpsg_mod_prepayment_info_left_qr-download">
-						<h4><?php echo wpsg_translate(__($i['title'], $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__($i['title'], 'wpsg')); ?></h4>
 						<?php if (isset($i['filepath'])) { ?><a title="Downloadlink für die QR-Rechnung" target="_blank" href="<?php echo $this->callMod('wpsg_mod_prepayment', 'getFrontendLink', [$i['order_id']]); ?>"><i class="fa fa-download" aria-hidden="true"></i></a><?php } ?>
                     </div>	
                         <br />
@@ -49,28 +48,28 @@
 						<br />
 						<div class="wpsg_mod_prepayment_info_left_wrap">
 							<div class="wpsg_mod_prepayment_info_left_currency">
-								<h4><?php echo wpsg_translate(__('Währung', $wpsg)); ?></h4>
+								<h4><?php echo wpsg_translate(__('Währung', 'wpsg')); ?></h4>
 								<?php echo $this->get_option('wpsg_currency'); ?>
 							</div>
 							<div class="wpsg_mod_prepayment_info_left_amount">
-								<h4><?php echo wpsg_translate(__('Betrag', $wpsg)); ?></h4>
+								<h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>
 								<?php echo sprintf("%.2f", $i['invoiceAmount']); ?>
 							</div>
 						</div>
 					</div>
 					<div class="wpsg_mod_prepayment_info_right">
-						<h4><?php echo wpsg_translate(__('Konto / Zahlbar an', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>
 						<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?><br />
 						<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?><br />
 						<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_street')); ?><br />
 						<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_zip')).' '.$this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_city')); ?><br />
 						<?php if (!empty($i['referenceNumber'])) { ?>
-							<h4><?php echo wpsg_translate(__('Referenz', $wpsg)); ?></h4>
+							<h4><?php echo wpsg_translate(__('Referenz', 'wpsg')); ?></h4>
 							<?php echo $i['referenceNumber']; ?><br />
 						<?php } ?>
-						<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>
 						<?php echo $i['additionalInformation']; ?><br /> 
-						<h4><?php echo wpsg_translate(__('Zahlbar durch', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Zahlbar durch', 'wpsg')); ?></h4>
 						<?php echo $i['customerdata']['vname'].' '.$i['customerdata']['name']; ?><br />
 						<?php echo $i['customerdata']['strasse'].' '.$i['customerdata']['nr']; ?><br />
 						<?php echo $i['customerdata']['plz'].' '.$i['customerdata']['ort']; ?><br />
@@ -79,7 +78,7 @@
 			<?php } ?>
 		</div>
 
-		<?php } catch (\Exception $e) { } ?>
+		<?php } catch (\Exception $e) { wpsg_debug($e); } ?>
 
 	<?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { ?>
 
@@ -98,34 +97,34 @@
 
 		<div class="wpsg_mod_prepayment_girocode">
 			<div class="wpsg_mod_prepayment_girocode_left" >
-				<h4><?php echo wpsg_translate(__($img['title'], $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__($img['title'], 'wpsg')); ?></h4>
 				<br />
 				<?php echo '<img class="wpsg_mod_prepayment_girocode_left_qrcodeimg" src="data:image/png;base64,'.$img['hash'].'" />'; ?>
 				<br>
 				<div class="wpsg_mod_prepayment_girocode_left_wrap">
 					<div class="wpsg_mod_prepayment_girocode_left_currency">
-						<h4><?php echo wpsg_translate(__('Währung', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Währung', 'wpsg')); ?></h4>
 						<?php echo $this->get_option('wpsg_currency'); ?>
 					</div>
 					<div class="wpsg_mod_prepayment_girocode_left_amount">
-						<h4><?php echo wpsg_translate(__('Betrag', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>
 						<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>
 					</div>
 				</div>
 			</div>
 			<div class="wpsg_mod_prepayment_girocode_right">
-				<h4><?php echo wpsg_translate(__('Konto / Zahlbar an', $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?><br />
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?><br />
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_street')); ?><br />
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_zip')).' '.$this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_city')); ?><br />
 				<?php if (!empty($img['referenceNumber'])) { ?>
-					<h4><?php echo wpsg_translate(__('Referenz', $wpsg)); ?></h4>
+					<h4><?php echo wpsg_translate(__('Referenz', 'wpsg')); ?></h4>
 					<?php echo $img['referenceNumber']; ?><br />
 				<?php } ?>
-				<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>
 				<?php echo $img['additionalInformation']; ?><br /> 
-				<h4><?php echo wpsg_translate(__('Zahlbar durch', $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__('Zahlbar durch', 'wpsg')); ?></h4>
 				<?php echo $img['customerdata']['vname'].' '.$img['customerdata']['name']; ?><br />
 				<?php echo $img['customerdata']['strasse'].' '.$img['customerdata']['nr']; ?><br />
 				<?php echo $img['customerdata']['plz'].' '.$img['customerdata']['ort']; ?><br />
@@ -145,34 +144,34 @@
 		
 		<div class="wpsg_mod_prepayment_qrrechnung">
 			<div class="wpsg_mod_prepayment_qrrechnung_left">
-				<h4><?php echo wpsg_translate(__($img['title'], $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__($img['title'], 'wpsg')); ?></h4>
 				<br />
 				<?php echo '<img class="wpsg_mod_prepayment_qrrechnung_left_qrcodeimg" src="data:image/png;base64,'.$img['hash'].'" />'; ?>
 				<br>
 				<div class="wpsg_mod_prepayment_qrrechnung_left_wrap">
 					<div class="wpsg_mod_prepayment_qrrechnung_left_currency">
-						<h4><?php echo wpsg_translate(__('Währung', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Währung', 'wpsg')); ?></h4>
 						<?php echo $this->get_option('wpsg_currency'); ?>
 					</div>
 					<div class="wpsg_mod_prepayment_qrrechnung_left_amount">
-						<h4><?php echo wpsg_translate(__('Betrag', $wpsg)); ?></h4>
+						<h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>
 						<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>
 					</div>
 				</div>
 			</div>
 			<div class="wpsg_mod_prepayment_qrrechnung_right">
-				<h4><?php echo wpsg_translate(__('Konto / Zahlbar an', $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?><br />
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?><br />
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_street')); ?><br />
 				<?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_zip')).' '.$this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_city')); ?><br />
 				<?php if (!empty($img['referenceNumber'])) { ?>
-					<h4><?php echo wpsg_translate(__('Referenz', $wpsg)); ?></h4>
+					<h4><?php echo wpsg_translate(__('Referenz', 'wpsg')); ?></h4>
 					<?php echo $img['referenceNumber']; ?><br />
 				<?php } ?>
-				<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>
 				<?php echo $img['additionalInformation']; ?><br /> 
-				<h4><?php echo wpsg_translate(__('Zahlbar durch', $wpsg)); ?></h4>
+				<h4><?php echo wpsg_translate(__('Zahlbar durch', 'wpsg')); ?></h4>
 				<?php echo $img['customerdata']['vname'].' '.$img['customerdata']['name']; ?><br />
 				<?php echo $img['customerdata']['strasse'].' '.$img['customerdata']['nr']; ?><br />
 				<?php echo $img['customerdata']['plz'].' '.$img['customerdata']['ort']; ?><br />
diff --git a/views/mods/mod_prepayment/settings_edit.phtml b/views/mods/mod_prepayment/settings_edit.phtml
index 80dee13..53fa95f 100644
--- a/views/mods/mod_prepayment/settings_edit.phtml
+++ b/views/mods/mod_prepayment/settings_edit.phtml
@@ -8,15 +8,6 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_prepayment_bezeichnung'), array('help' => 'wpsg_mod_prepayment_bezeichnung')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_prepayment_aktiv'), array('help' => 'wpsg_mod_prepayment_aktiv')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_qrcode', __('QR-Code anzeigen', 'wpsg'), $this->get_option('wpsg_mod_prepayment_qrcode'), array('help' => 'wpsg_mod_prepayment_qrcode')); ?>
-<div id="wpsg_mod_prepayment_qrcode_options_layer" style="display: none;">
-	<?php echo wpsg_drawForm_Select('wpsg_mod_prepayment_qrcode_country', __('QR-Code für', 'wpsg'), Array(
-					wpsg_mod_prepayment::QRCODE_BOTH => __('Beide', 'wpsg'),
-					wpsg_mod_prepayment::QRCODE_EPC => __('Girocode', 'wpsg'),
-					wpsg_mod_prepayment::QRCODE_SWISS => __('QR-Rechnung', 'wpsg')
-				), $this->get_option('wpsg_mod_prepayment_qrcode_country'), array('help' => 'wpsg_mod_prepayment_qrcode_country')); ?>
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_mailattachment', __('QR-Rechnung an Bestellbestätigung anhängen', 'wpsg'), $this->get_option('wpsg_mod_prepayment_mailattachment'), array('help' => 'wpsg_mod_prepayment_mailattachment')); ?>
-</div>
 
 <?php echo wpsg_drawForm_Textarea('wpsg_mod_prepayment_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_prepayment_hint'), array('help' => 'wpsg_mod_prepayment_hint')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_subject', __('Betreff für Überweisungen', 'wpsg'), $this->get_option('wpsg_mod_prepayment_subject'), array('help' => 'mod_prepayment_subject')); ?>
@@ -31,33 +22,3 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_bank', __('Bank', 'wpsg'), $this->get_option('wpsg_mod_prepayment_bank'), array('help' => 'wpsg_mod_prepayment_bank')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_iban', __('IBAN', 'wpsg'), $this->get_option('wpsg_mod_prepayment_iban'), array('help' => 'wpsg_mod_prepayment_iban')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_swift', __('BIC-/SWIFT Code', 'wpsg'), $this->get_option('wpsg_mod_prepayment_swift'), array('help' => 'wpsg_mod_prepayment_swift')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_qriban', __('QR-IBAN', 'wpsg'), $this->get_option('wpsg_mod_prepayment_qriban'), array('help' => 'wpsg_mod_prepayment_qriban')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_besr', __('BESR-ID', 'wpsg'), $this->get_option('wpsg_mod_prepayment_besr'), array('help' => 'wpsg_mod_prepayment_besr')); ?>
-
-<script>
-
-	document.addEventListener("DOMContentLoaded", function() {
-
-		var qrcodeAktiveCheckbox = document.getElementById('wpsg_mod_prepayment_qrcode');
-		var qrcodeSelectDiv = document.getElementById('wpsg_mod_prepayment_qrcode_options_layer');
-
-		
-		function toggleDivVisibility(checkbox, div) 
-		{
-
-			if (checkbox.checked) div.style.display = "block";
-			else div.style.display = "none";
-
-		}
-
-		// Event Listener für die Checkboxen
-		qrcodeAktiveCheckbox.addEventListener("change", function() {
-			toggleDivVisibility(qrcodeAktiveCheckbox, qrcodeSelectDiv);
-		});
-
-		// Überprüfen und Initialisieren des Anfangszustands der Checkboxen
-		toggleDivVisibility(qrcodeAktiveCheckbox, qrcodeSelectDiv);
-	
-	});
-
-</script>
diff --git a/views/mods/mod_rechnungen/copymail.phtml b/views/mods/mod_rechnungen/copymail.phtml
index 315e9ea..0b18b5a 100644
--- a/views/mods/mod_rechnungen/copymail.phtml
+++ b/views/mods/mod_rechnungen/copymail.phtml
@@ -1,13 +1,13 @@
 <?php 
-   /*
-    *   Template für die Rechnungskopie
-    **/     
 
+	/*
+	 * Template für die Rechnungskopie
+	 */
+ 
+	/** @var wpsg_order $oOrder */
+	$oOrder = wpsg_order::getInstance($this->view['order']['id']);
 
-    $arPflicht = $this->loadPflichtFeldDaten();
-    $arTitle = explode('|', $arPflicht['anrede_auswahl']);
-
-?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), @$arTitle[$this->view['basket']['checkout']['title']], $this->view['basket']['checkout']['vname'], $this->view['basket']['checkout']['name']); ?>
+?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), $oOrder->getInvoiceTitle(), $oOrder->getInvoiceFirstName(), $oOrder->getInvoiceName()); ?>
  
 <?php if (isset($this->view['rnr'])) { ?>
 <?php echo __("hiermit erhalten Sie die Kopie der Rechnung", "wpsg"); ?> <?php echo $this->view['rnr']; ?>.
-- 
cgit v1.2.3