Index: /changelog
===================================================================
--- /changelog	(revision 8341)
+++ /changelog	(revision 8342)
@@ -597,4 +597,5 @@
 #4.4.6
 - Feature: Modul Vorkasse: QR-Code ist nun deaktivierbar
-- Feature: Modul Vorkasse: QR-Code von QR-Rechnung (Schweiz) kann nun auf der Bestellabschlussseite/Bestellmail angezeigt werden.
+- Feature: Modul Vorkasse: QR-Code wird nun in der BestellbestÀtigung (E-Mail) dargestellt
+- Feature: Modul Vorkasse: QR-Code von QR-Rechnung (Schweiz) kann nun auf der Bestellabschlussseite/BestellbestÀtigung (E-Mail) angezeigt werden.
 - Bugfix: Modul Produktvarianten: Produktvariationen mit einen "ungesetzten" Preis fÃŒhren nun zu keinem Fehler in der Bestellverwaltung mehr  
Index: /mods/wpsg_mod_prepayment.class.php
===================================================================
--- /mods/wpsg_mod_prepayment.class.php	(revision 8341)
+++ /mods/wpsg_mod_prepayment.class.php	(revision 8342)
@@ -222,5 +222,9 @@
 					$phpGiroCode->generate(PhpGirocode::OUTPUT_FILE, $fname1);
 					$fname2 = WPSG_URL_WP.'?wpsg_action=wpsg_getGiroCode&order_id='.$order_id;
-					$ret[] = '<img src="'.$fname2.'" />';
+					$data1 = array(
+						'title' => 'Girocode',
+						'value' => '<img style="max-width:120px;" width="120" height="120" src="'.$fname2.'" />'
+					);
+					$ret[] = $data1;
 
 				} else if ($out == PhpGirocode::OUTPUT_BASE64) {
@@ -301,5 +305,9 @@
 					$qrBill->getQrCode()->writeFile($fname3);
 					$fname4 = WPSG_URL_WP.'?wpsg_action=wpsg_getQrInvoice&order_id='.$order_id;
-					$ret[] = '<img src="'.$fname4.'" />';
+					$data2 = array(
+						'title' => 'QR-Rechnung',
+						'value' => '<img style="max-width:120px;" width="120" height="120" src="'.$fname4.'" />'
+					);
+					$ret[] = $data2;
 
 				} else if ($out == PhpGirocode::OUTPUT_BASE64) {
@@ -338,5 +346,9 @@
 					$phpGiroCode->generate(PhpGirocode::OUTPUT_FILE, $fname1);
 					$fname2 = WPSG_URL_WP.'?wpsg_action=wpsg_getGiroCode&order_id='.$order_id;
-					$ret = '<img src="'.$fname2.'" />';
+					$data = array(
+						'title' => 'Girocode',
+						'value' => '<img style="max-width:120px;" width="120" height="120" src="'.$fname2.'" />'
+					);
+					$ret = $data;
 
 				} else if ($out == PhpGirocode::OUTPUT_BASE64) {
@@ -422,5 +434,9 @@
 					$qrBill->getQrCode()->writeFile($fname3);
 					$fname4 = WPSG_URL_WP.'?wpsg_action=wpsg_getQrInvoice&order_id='.$order_id;
-					$ret = '<img src="'.$fname4.'" />';
+					$data = array(
+						'title' => 'QR-Rechnung',
+						'value' => '<img style="max-width:120px;" width="120" height="120" src="'.$fname4.'" />'
+					);
+					$ret = $data;
 
 				} else if ($out == PhpGirocode::OUTPUT_BASE64) {
Index: /views/mods/mod_prepayment/mail_html.phtml
===================================================================
--- /views/mods/mod_prepayment/mail_html.phtml	(revision 8341)
+++ /views/mods/mod_prepayment/mail_html.phtml	(revision 8342)
@@ -31,3 +31,53 @@
 		<td style="text-align:right;"><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
 	</tr>
+	<?php 
+
+		if (isset($this->view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) {
+
+			require_once WPSG_PATH_LIB.'phpgirocode.class.php';
+
+			echo '<tr><td>'.__('Zahlen via QR Code', 'wpsg').':</td></tr>';
+			
+			if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') {
+
+				$qrcodes = array();
+				$qrcodes = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
+				foreach ($qrcodes as $qr) {
+
+					// Base64 QR-Image
+					if ($qr['title'] == 'QR-Rechnung') echo '<tr style="margin-top:25px;" >';
+					else echo '<tr>';
+						echo '<td>'.__($qr['title'], 'wpsg').'</td>';
+						echo '<td style="float:right;"><img style="max-width:120px;" width="120" height="120" src="data:image/png;base64,'.$qr['hash'].'" alt="qrcode" /></td>';
+					echo '</tr>';
+
+				}
+
+			} else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { 
+
+				$qrcode = $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_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
+				
+				echo '
+					<tr>
+						<td>'.__($qrcode['title'], 'wpsg').':</td>
+						<td style="float:right;">'.$qrcode['hash'].'</td>
+					</tr>
+				';
+
+			} else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') {
+
+				$qrcode = $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_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
+
+				echo '
+					<tr>
+						<td>'.__($qrcode['title'], 'wpsg').':</td>
+						<td style="float:right;">'.$qrcode['hash'].'</td>
+					</tr>
+				';
+
+			}
+		
+		}
+
+	?>
 </table>