- GiroCode

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8477 0d5edaf7-2b12-4e95-93f4-047927463d4b

6 files changed, 131 insertions, 260 deletions

diff --git a/views/css/frontend.css b/views/css/frontend.css
index 47d1870..9562a7a 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -254,7 +254,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_productform .wpsg_produkt_wrapper .wpsg_produkt_shortdescription { margin-top:0.75em; margin-bottom:0.75em; }

 .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_only_store {  margin-top:0.75em; margin-bottom:0.75em; }

 .wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap { margin-top:0.75em; margin-bottom:0.75em; }

-.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select { width:100%; box-sizing:border-box; }

+.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select { width:100%; box-sizing:border-box; padding:0.75em; line-height:1.5em; }

 .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_informationarea { margin-top:1.5em; margin-bottom:1.5em; }

 .wpsg_productform .wpsg_produkt_wrapper label { font-weight:bold; } 

 .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:48%; float:left; box-sizing:border-box; padding:0.7em; line-height:1.5em; font-size:1rem; }

@@ -575,7 +575,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_mod_prepayment_info_left_currency { display:flex; flex-direction:column; }

 .wpsg_mod_prepayment_info_left_amount { display:flex; flex-direction:column; }

 

-.wpsg_mod_prepayment_girocode { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px;}

+.wpsg_mod_prepayment_girocode { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px; font-size:16px; }

 .wpsg_mod_prepayment_girocode h4{ margin: 0; }

 .wpsg_mod_prepayment_girocode_left { display: flex; flex-direction: column; }

 .wpsg_mod_prepayment_girocode_left_qrcodeimg { width:240px; height:240px; }

diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index dd1ffbb..f352a62 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -181,38 +181,7 @@
 	<tr>

 		<td style="padding:2px; line-height:100%; vertical-align:top;" class="col0"><?php echo __('Zahlungsart', 'wpsg'); ?>:

 <br />		

-

-<?php

-	

-	require_once WPSG_PATH_LIB.'phpgirocode.class.php';

-	

-	if (isset($this->view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) {

-			

-		if (in_array('kundenmail.phtml', $this->arTemplateStack)) {

-

-		

-			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_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));

-

-				foreach ($qrcodes as $qr) echo $qr;

-

-			} else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { 

-

-				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, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));

-

-			} else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') {

-

-				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, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));

-

-			}

-

-		}

-		

-	}

-	

-?>

+ 

 		

 		

 		</td>

@@ -221,4 +190,5 @@
 			<?php $this->callMods('mail_payment'); ?>

 		</td>				

 	</tr>

+	<?php $this->callMods('mail_payment_after'); ?>

 </table>
\ No newline at end of file
diff --git a/views/mods/mod_prepayment/mail_html.phtml b/views/mods/mod_prepayment/mail_html.phtml
index 272041f..0da2f01 100644
--- a/views/mods/mod_prepayment/mail_html.phtml
+++ b/views/mods/mod_prepayment/mail_html.phtml
@@ -9,75 +9,3 @@
 	<?php echo wpsg_translate(__('Bitte überweisen Sie den Rechnungsbetrag in Höhe von #1# auf folgendes Konto und geben Sie als Betreff <strong>#2#</strong> an.', 'wpsg'), wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency')), $this->view['mod_prepayment']['subject']); ?>

 </p> 

 

-<table style="width:100%;">

-	<tr>

-		<td><?php echo __('Kontoinhaber', 'wpsg'); ?>:</td>

-		<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?></td>

-	</tr>

-	<tr>

-		<td><?php echo __('IBAN', 'wpsg'); ?>:</td>

-		<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?></td>

-	</tr>

-	<tr>

-		<td><?php echo __('Bank', 'wpsg'); ?>:</td>

-		<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?></td>

-	</tr>	

-	<tr>

-		<td><?php echo __('BIC-/SWIFT-Code', 'wpsg'); ?>:</td>

-		<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?></td>

-	</tr> 

-	<tr>

-		<td><?php echo __('Betreff', 'wpsg'); ?>:</td>

-		<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) {

-

-					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;" alt="qrcode">'.$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;" alt="qrcode">'.$qrcode['hash'].'</td>

-					</tr>

-				';

-

-			}

-		

-		}

-

-	?>

-</table>
\ No newline at end of file
diff --git a/views/mods/mod_prepayment/mail_html_payment_after.phtml b/views/mods/mod_prepayment/mail_html_payment_after.phtml
new file mode 100644
index 0000000..42417af
--- /dev/null
+++ b/views/mods/mod_prepayment/mail_html_payment_after.phtml
@@ -0,0 +1,67 @@
+<?php
+	
+	declare(strict_types=1);
+	
+	/**
+	 * @author: daniel
+	 * @date: 15.01.25
+	 * @time: 14:41
+	 */
+	
+?>
+
+<?php
+	
+	if (isset($this->view['mod_prepayment']['subject'])) {
+ 
+?>
+
+			<tr>
+				<td>
+					<?php if ($this->get_option('wpsg_mod_prepayment_qrcode') == true) {
+						
+						require_once WPSG_PATH_LIB.'phpgirocode.class.php';
+		
+						$qrcode = $this->callMod('wpsg_mod_prepayment', 'genQRCode', [
+							$this->view['o_id'],
+							$this->view['mod_prepayment']['subject'],
+							$this->view['basket']['sum']['preis_gesamt_brutto'],
+							5,
+							PhpGirocode::OUTPUT_BASE64
+						]);
+						
+					?>
+						<?php echo __('Girocode für einfache Überweisungen', 'wpsg'); ?><br /><br />
+						<img src="data:image/png;base64,<?php echo $qrcode; ?>" alt="Base64 Image">
+					<?php } ?>
+				</td>
+				<td>
+					<br /><br />
+					<table style="width:100%;">
+						<tr>
+							<td><?php echo __('Kontoinhaber', 'wpsg'); ?>:</td>
+							<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?></td>
+						</tr>
+						<tr>
+							<td><?php echo __('IBAN', 'wpsg'); ?>:</td>
+							<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?></td>
+						</tr>
+						<tr>
+							<td><?php echo __('Bank', 'wpsg'); ?>:</td>
+							<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?></td>
+						</tr>
+						<tr>
+							<td><?php echo __('BIC-/SWIFT-Code', 'wpsg'); ?>:</td>
+							<td style="text-align:right;"><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?></td>
+						</tr>
+						<tr>
+							<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>
+				</td>
+			</tr>
+
+<?php
+	
+	}
diff --git a/views/mods/mod_prepayment/order_done.phtml b/views/mods/mod_prepayment/order_done.phtml
index b8caa25..4e8443d 100644
--- a/views/mods/mod_prepayment/order_done.phtml
+++ b/views/mods/mod_prepayment/order_done.phtml
@@ -4,180 +4,78 @@
 	 * Template welches bei der Zahlungsart "Vorkasse" nach Abschluss einer Bestellung angezeigt wird

 	 */

 	

-	//wpsg_debug($this->view['wpsg_mod_prepayment']['subject']);

-    

+	$formatIBAN = function($iban) {

+	

+		$iban = preg_replace('/\040/', '', $iban);

+		$iban_formated = '';

+		

+		for ($i = 0; $i < ceil(strlen($iban) / 4); $i ++) $iban_formated .= substr($iban, $i * 4, 4).' ';

+		

+		return trim($iban_formated);

+	

+	}

+	

 ?>

 

 <?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 /> 

-<?php echo wpsg_translate(__('IBAN: #1#', 'wpsg'), $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban'))); ?><br /> 

+<?php echo wpsg_translate(__('IBAN: #1#', 'wpsg'), $formatIBAN($this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')))); ?><br />

 <?php echo wpsg_translate(__('Bank: #1#', 'wpsg'), $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank'))); ?><br />

 <?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 return; if ( isset($this->view['wpsg_mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true) ) { ?>

+<?php 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'; ?>

-

-	<?php if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') { ?>

-		

-		<!-- 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">

-			<?php foreach ($img as $i) { ?>

-				<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>

-						<?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 />

-						<?php echo '<img class="wpsg_mod_prepayment_info_left_qrcodeimg" src="data:image/png;base64,'.$i['hash'].'" />'; ?>

-						<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>

-								<?php echo $this->get_option('wpsg_currency'); ?>

-							</div>

-							<div class="wpsg_mod_prepayment_info_left_amount">

-								<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>

-						<?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>

-							<?php echo $i['referenceNumber']; ?><br />

-						<?php } ?>

-						<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>

-						<?php echo $i['additionalInformation']; ?><br /> 

-						<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 />

-					</div>

-				</div>

-			<?php } ?>

-		</div>

-

-		<?php } catch (\Exception $e) { wpsg_debug($e); } ?>

+	<!-- Girocode (EPC) -->

 

-	<?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { ?>

+	<p>

+		<?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?>

+	</p>

 

-		<!-- Girocode (EPC) -->

-

-		<p>

-			<?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?>

-		</p>

-

-		<?php 

+	<?php

+	

+		$img = [

+			'title' => __('Girocode', 'wpsg'),

+			'invoiceAmount' => $this->view['basket']['sum']['preis_gesamt_brutto'],

+			'referenceNumber' => $this->view['wpsg_mod_prepayment']['subject'],

+			'hash' => $this->callMod('wpsg_mod_prepayment', 'genQRCode', [

+				$this->view['o_id'],

+				$this->view['wpsg_mod_prepayment']['subject'],

+				$this->view['basket']['sum']['preis_gesamt_brutto'],

+				10,

+				PhpGirocode::OUTPUT_BASE64

+			])

+		];

 		

-			$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">

-			<div class="wpsg_mod_prepayment_girocode_left" >

-				<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>

-						<?php echo $this->get_option('wpsg_currency'); ?>

-					</div>

-					<div class="wpsg_mod_prepayment_girocode_left_amount">

-						<h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>

-						<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>

-					</div>

+	?>

+

+	<div class="wpsg_mod_prepayment_girocode">

+		<div class="wpsg_mod_prepayment_girocode_left" >

+			<h4><?php echo wpsg_translate(__($img['title'], 'wpsg')); ?></h4>

+			<?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>

+					<?php echo $this->get_option('wpsg_currency'); ?>

 				</div>

-			</div>

-			<div class="wpsg_mod_prepayment_girocode_right">

-				<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>

-					<?php echo $img['referenceNumber']; ?><br />

-				<?php } ?>

-				<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>

-				<?php echo $img['additionalInformation']; ?><br /> 

-				<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 />

-			</div>

-		</div>

-

-	<?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') { ?>

-

-		<!-- QR-Rechnung (SWISS) -->

-

-		<?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'])); 

-		

-		?>

-		

-		<div class="wpsg_mod_prepayment_qrrechnung">

-			<div class="wpsg_mod_prepayment_qrrechnung_left">

-				<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>

-						<?php echo $this->get_option('wpsg_currency'); ?>

-					</div>

-					<div class="wpsg_mod_prepayment_qrrechnung_left_amount">

-						<h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>

-						<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>

-					</div>

+				<div class="wpsg_mod_prepayment_girocode_left_amount">

+					<h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>

+					<?php echo sprintf("%.2f", $img['invoiceAmount']); ?>

 				</div>

 			</div>

-			<div class="wpsg_mod_prepayment_qrrechnung_right">

-				<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>

-					<?php echo $img['referenceNumber']; ?><br />

-				<?php } ?>

-				<h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>

-				<?php echo $img['additionalInformation']; ?><br /> 

-				<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 />

-			</div>

 		</div>

-

-	<?php } ?>

+		<div class="wpsg_mod_prepayment_girocode_right">

+			<h4 style="margin-bottom:30px;"><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>

+			IBAN: <strong><?php echo $formatIBAN($this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban'))); ?></strong><br />

+			Kontoinhaber: <strong><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?></strong><br /><br />

+			Betreff: <strong><?php echo $img['referenceNumber']; ?></strong>

+		</div>

+	</div>

 	

 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_prepayment/settings_edit.phtml b/views/mods/mod_prepayment/settings_edit.phtml
index 53fa95f..7d99ebe 100644
--- a/views/mods/mod_prepayment/settings_edit.phtml
+++ b/views/mods/mod_prepayment/settings_edit.phtml
@@ -9,6 +9,14 @@
 <?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')); ?>

 

+<br />

+

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_qrcode', __('GiroCode für Überweisung (Bestellabschluss) anbieten', 'wpsg'), $this->get_option('wpsg_mod_prepayment_qrcode'), array('help' => 'wpsg_mod_prepayment_qrcode')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_qrcode_invoice', __('GiroCode für Überweisung (Rechnung) anbieten', 'wpsg'), $this->get_option('wpsg_mod_prepayment_qrcode_invoice'), array('help' => 'wpsg_mod_prepayment_qrcode_invoice')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_qrcode_mail', __('GiroCode für Überweisung (HTML Kundenemail) anbieten', 'wpsg'), $this->get_option('wpsg_mod_prepayment_qrcode_mail'), array('help' => 'wpsg_mod_prepayment_qrcode_mail')); ?>

+

+<br />

+

 <?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')); ?>