From 7a8552d2803d1be9e615585d175d83dd90d202bc Mon Sep 17 00:00:00 2001
From: karl <noreply@maennchen1.de>
Date: Tue, 1 Aug 2023 06:12:15 +0000
Subject: - Anpassung der Bestellabschlussseite, Inhalte der QR-Codes werden
 nun mit angegeben

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8341 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_prepayment/mail_html.phtml  |   2 +-
 views/mods/mod_prepayment/order_done.phtml | 152 ++++++++++++++++++++++++-----
 2 files changed, 128 insertions(+), 26 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_prepayment/mail_html.phtml b/views/mods/mod_prepayment/mail_html.phtml
index ea844c4..40c6353 100644
--- a/views/mods/mod_prepayment/mail_html.phtml
+++ b/views/mods/mod_prepayment/mail_html.phtml
@@ -30,4 +30,4 @@
 		<td><?php echo __('Betreff', 'wpsg'); ?>:</td>
 		<td style="text-align:right;"><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
 	</tr>
- </table>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/views/mods/mod_prepayment/order_done.phtml b/views/mods/mod_prepayment/order_done.phtml
index dfd6c4b..8efc258 100644
--- a/views/mods/mod_prepayment/order_done.phtml
+++ b/views/mods/mod_prepayment/order_done.phtml
@@ -7,6 +7,7 @@
 	//wpsg_debug($this->view['wpsg_mod_prepayment']['subject']);
     
 ?>
+
 <?php echo wpsg_translate(__('Sie haben die Zahlungsart "Vorkasse" gewählt. Überweisen Sie daher den Rechnungsbetrag von #1# auf folgendes Konto:', 'wpsg'), wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency'))); ?>
 <br /><br />
 <?php echo wpsg_translate(__('Kontoinhaber: #1#', 'wpsg'), $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber'))); ?><br /> 
@@ -15,60 +16,161 @@
 <?php echo wpsg_translate(__('BIC-/SWIFT-Code: #1#', 'wpsg'), $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift'))); ?> 
 <br /><br />
 <?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) ) { ?>
 
-	<p>
-		<?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?>
-	</p>
-
 	<?php require_once WPSG_PATH_LIB.'phpgirocode.class.php'; ?>
 
 	<?php if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') { ?>
 		
-		<!-- QR-CODE für EPC und SWISS -->
+		<!-- Girocode und QR-Rechnung -->
 
 		<?php 
 
 			$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']));
+		
+		?>
 
-			echo '<div style="display: flex; justify-content: center; flex; gap: 20px;">';
-			foreach ($img as $i) {
-
-				echo '<div>';
-					echo '<h4 style="margin-bottom: -15px; font-weight: bold;">'.$i['title'].':'.'<h4>';
-					echo '<div class="order_done_qrcode"><img style="width: 240px; height:240px; border: solid 1px; padding: 25px;" src="data:image/png;base64,'.$i['hash'].'" /></div>';
-				echo '</div>';
-
-			}
-			echo '</div>'
+		<div style="display: flex; justify-content: center; flex-direction: column; gap: 20px;">
+			<?php foreach ($img as $i) { ?>
+				<div class="wpsg_mod_prepayment_info" style="display: flex; gap: 20px; border: 1px solid #000; padding: 20px;">
+					<div class="wpsg_mod_prepayment_info_left" style="display: flex; flex-direction: column;">
+						<h4 style="margin: 0;"><?php echo wpsg_translate(__($i['title'], $wpsg)); ?></h4>
+						<br />
+						<?php echo '<img style="width: 240px; height:240px;" src="data:image/png;base64,'.$i['hash'].'" />'; ?>
+						<br>
+						<div style="display: flex; gap: 25%;">
+							<div style="display: flex; flex-direction: column;">
+								<h4 style="margin: 0;"><?php echo wpsg_translate(__('Währung', $wpsg)); ?></h4>
+								<?php echo $this->get_option('wpsg_currency'); ?>
+							</div>
+							<div style="display: flex; flex-direction: column;">
+								<h4 style="margin: 0;"><?php echo wpsg_translate(__('Betrag', $wpsg)); ?></h4>
+								<?php echo sprintf("%.2f", $i['invoiceAmount']); ?>
+							</div>
+						</div>
+					</div>
+					<div class="wpsg_mod_prepayment_info_right" style="display: flex; flex-direction: column;">
+						<h4 style="margin: 0;"><?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 style="margin: 0;"><?php echo wpsg_translate(__('Referenz', $wpsg)); ?></h4>
+							<?php echo $i['referenceNumber']; ?><br />
+						<?php } ?>
+						<h4 style="margin: 0;"><?php echo wpsg_translate(__('Zusätzliche Informationen', $wpsg)); ?></h4>
+						<?php echo $i['additionalInformation']; ?><br /> 
+						<h4 style="margin: 0;"><?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 />
+					</div>
+				</div>
+			<?php } ?>
+		</div>
 
-		?>
 
 	<?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { ?>
 
-		<!-- QR-CODE für EPC -->
+		<!-- Girocode (EPC) -->
+
+		<p>
+			<?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?>
+		</p>
 
 		<?php 
 		
-			$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')));
-		
-			echo '<img style="width: 320px; height:320px;" src="data:image/png;base64,'.$img.'" />';
-			
+			$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_girocode" style="display: flex; gap: 20px; border: 1px solid #000; padding: 20px;">
+			<div class="wpsg_mod_prepayment_girocode_left" style="display: flex; flex-direction: column;">
+				<h4 style="margin: 0;"><?php echo wpsg_translate(__($img['title'], $wpsg)); ?></h4>
+				<br />
+				<?php echo '<img style="width: 240px; height:240px;" src="data:image/png;base64,'.$img['hash'].'" />'; ?>
+				<br>
+				<div style="display: flex; gap: 25%;">
+					<div style="display: flex; flex-direction: column;">
+						<h4 style="margin: 0;"><?php echo wpsg_translate(__('Währung', $wpsg)); ?></h4>
+						<?php echo $this->get_option('wpsg_currency'); ?>
+					</div>
+					<div style="display: flex; flex-direction: column;">
+						<h4 style="margin: 0;"><?php echo wpsg_translate(__('Betrag', $wpsg)); ?></h4>
+						<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>
+					</div>
+				</div>
+			</div>
+			<div class="wpsg_mod_prepayment_girocode_right" style="display: flex; flex-direction: column;">
+				<h4 style="margin: 0;"><?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 style="margin: 0;"><?php echo wpsg_translate(__('Referenz', $wpsg)); ?></h4>
+					<?php echo $img['referenceNumber']; ?><br />
+				<?php } ?>
+				<h4 style="margin: 0;"><?php echo wpsg_translate(__('Zusätzliche Informationen', $wpsg)); ?></h4>
+				<?php echo $img['additionalInformation']; ?><br /> 
+				<h4 style="margin: 0;"><?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 />
+			</div>
+		</div>
+
 	<?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') { ?>
 
-		<!-- QR-CODE für SWISS -->
+		<!-- QR-Rechnung (SWISS) -->
 
 		<?php 
 
-			$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']));
+			$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'])); 
 		
-			echo '<img style="width: 320px; height:320px;" src="data:image/png;base64,'.$img.'" />';
-			
 		?>
+		
+		<div class="wpsg_mod_prepayment_qrrechnung" style="display: flex; gap: 20px; border: 1px solid #000; padding: 20px;">
+			<div class="wpsg_mod_prepayment_qrrechnung_left" style="display: flex; flex-direction: column;">
+				<h4 style="margin: 0;"><?php echo wpsg_translate(__($img['title'], $wpsg)); ?></h4>
+				<br />
+				<?php echo '<img style="width: 240px; height:240px;" src="data:image/png;base64,'.$img['hash'].'" />'; ?>
+				<br>
+				<div style="display: flex; gap: 25%;">
+					<div style="display: flex; flex-direction: column;">
+						<h4 style="margin: 0;"><?php echo wpsg_translate(__('Währung', $wpsg)); ?></h4>
+						<?php echo $this->get_option('wpsg_currency'); ?>
+					</div>
+					<div style="display: flex; flex-direction: column;">
+						<h4 style="margin: 0;"><?php echo wpsg_translate(__('Betrag', $wpsg)); ?></h4>
+						<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>
+					</div>
+				</div>
+			</div>
+			<div class="wpsg_mod_prepayment_qrrechnung_right" style="display: flex; flex-direction: column;">
+				<h4 style="margin: 0;"><?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 style="margin: 0;"><?php echo wpsg_translate(__('Referenz', $wpsg)); ?></h4>
+					<?php echo $img['referenceNumber']; ?><br />
+				<?php } ?>
+				<h4 style="margin: 0;"><?php echo wpsg_translate(__('Zusätzliche Informationen', $wpsg)); ?></h4>
+				<?php echo $img['additionalInformation']; ?><br /> 
+				<h4 style="margin: 0;"><?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 />
+			</div>
+		</div>
 
 	<?php } ?>
 	
-- 
cgit v1.2.3