- SwissQR ausgelagert

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

1 files changed, 24 insertions, 25 deletions

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