From 3fd450811d809f9557d7290dbb6d477486223742 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 5 Mar 2019 08:55:14 +0000
Subject: - QR Code

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7335 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mailtemplates/html/customer.phtml    | 12 +++++++++---
 views/mods/mod_prepayment/mail.phtml       |  2 +-
 views/mods/mod_prepayment/order_done.phtml | 19 +++++++++++--------
 3 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'views')

diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index 181fbcc..60d1b2b 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -166,13 +166,19 @@
 <br />		
 
 <?php
+	
 	require_once WPSG_PATH_LIB.'phpgirocode.class.php';
-	if (isset($this->view['mod_prepayment']['subject'])) { 
+	
+	if (isset($this->view['mod_prepayment']['subject'])) {
+			
 		if (in_array('kundenmail.phtml', $this->arTemplateStack)) {
-			echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['basket']['sum']['preis_gesamt_brutto'],
-				$this->view['mod_prepayment']['subject'], 3, PhpGirocode::OUTPUT_FILE));
+		
+			echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE));
+
 		}
+		
 	}
+	
 ?>
 		
 		
diff --git a/views/mods/mod_prepayment/mail.phtml b/views/mods/mod_prepayment/mail.phtml
index 3c8122d..539f502 100644
--- a/views/mods/mod_prepayment/mail.phtml
+++ b/views/mods/mod_prepayment/mail.phtml
@@ -12,4 +12,4 @@
 <?php echo wpsg_pad_right(__('IBAN', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?> 
 <?php echo wpsg_pad_right(__('Bank', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?>  
 <?php echo wpsg_pad_right(__('BIC-/SWIFT-Code', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?> 
-<?php echo wpsg_translate(__('Betreff: #1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?>   
\ No newline at end of file
+<?php echo wpsg_pad_right(__('Betreff: #1#', 'wpsg'), 35); ?><?php echo $this->view['mod_prepayment']['subject']; ?>   
\ 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 a1a3a15..bd3cc55 100644
--- a/views/mods/mod_prepayment/order_done.phtml
+++ b/views/mods/mod_prepayment/order_done.phtml
@@ -17,16 +17,19 @@
 <?php echo wpsg_translate(__('Bitte als Betreff angeben: "#1#"', 'wpsg'), $this->view['wpsg_mod_prepayment']['subject']); ?>
 
 <?php if (isset($this->view['wpsg_mod_prepayment']['subject'])) { ?>
-	<p><?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?></p>
+	
+	<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';
+	
+		$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'], 8, PhpGirocode::OUTPUT_BASE64));
+	
+		echo '<img src="data:image/png;base64,'.$img.'" />';
 		
-		$img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['basket']['sum']['preis_gesamt_brutto'],
-			$this->view['wpsg_mod_prepayment']['subject'], 8, PhpGirocode::OUTPUT_BASE64));
 	?>
-	<img src="data:image/gif;base64,<?php echo $img; ?>" alt="" />
-		
-  	<pre style="display:none;"><?php 	echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['basket']['sum']['preis_gesamt_brutto'],
-  			$this->view['wpsg_mod_prepayment']['subject'], 8, PhpGirocode::OUTPUT_TEST));
-	?></pre>
+	
 <?php } ?>
\ No newline at end of file
-- 
cgit v1.2.3