From fc258ef7f429f12a3df329f218ea976ab80ebf2b Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Thu, 27 Apr 2017 08:43:01 +0000
Subject: Bestelluploads und Girocode

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6232 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mailtemplates/html/customer.phtml            | 16 ++++++++-
 views/mailtemplates/html/html_head.phtml           |  2 +-
 .../mod_orderupload/checkout_inner_prebutton.phtml |  2 +-
 .../mods/mod_orderupload/order_view_sidebar.phtml  | 41 +++++++++++-----------
 views/mods/mod_orderupload/settings_edit.phtml     |  2 +-
 views/mods/mod_ordervars/order_view_sidebar.phtml  | 13 +++----
 views/warenkorb/done.phtml                         | 17 ++++++++-
 7 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index 3868f01..58c5923 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -161,7 +161,21 @@
 		</td>		
 	</tr>
 	<tr>
-		<td style="padding:2px; line-height:100%; vertical-align:top;" class="col0"><?php echo __('Zahlungsart', 'wpsg'); ?>:</td>
+		<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'])) { 
+		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));
+		}
+	}
+?>
+		
+		
+		</td>
 		<td style="padding:2px; line-height:100%; vertical-align:top;" class="col1">
 			<?php echo $this->arPayment[$this->view['basket']['checkout']['payment']]['name']; ?><br />
 			<?php $this->callMods('mail_payment'); ?>
diff --git a/views/mailtemplates/html/html_head.phtml b/views/mailtemplates/html/html_head.phtml
index ef42e91..225795f 100644
--- a/views/mailtemplates/html/html_head.phtml
+++ b/views/mailtemplates/html/html_head.phtml
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />        
-        <title><?php echo $this->view['subject']; ?></title>
+        <title><?php //echo $this->view['subject']; ?></title>
 		<style type="text/css">
  
 			#outlook a { padding:0; }  
diff --git a/views/mods/mod_orderupload/checkout_inner_prebutton.phtml b/views/mods/mod_orderupload/checkout_inner_prebutton.phtml
index 7c400f7..ed31ead 100644
--- a/views/mods/mod_orderupload/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_orderupload/checkout_inner_prebutton.phtml
@@ -45,7 +45,7 @@
 	
 	<?php /* Counter, wie viel MB noch übrig sind */?>
 	<label class="wpsg_fileweight">
-		<?php echo __('Es stehen Ihnen #1# Mb von #2# Mb für den Upload zur Verfügung', 'wpsg'), $this->view['wpsg_mod_orderupload']['uploadsum'],$this->view['wpsg_mod_orderupload']['maxweight'];?>
+		<?php echo wpsg_translate(__('Es stehen Ihnen #1# Mb von #2# Mb für den Upload zur Verfügung', 'wpsg'), $this->view['wpsg_mod_orderupload']['uploadsum'],$this->view['wpsg_mod_orderupload']['maxweight']);?>
 	</label>
 	
 </div>
\ No newline at end of file
diff --git a/views/mods/mod_orderupload/order_view_sidebar.phtml b/views/mods/mod_orderupload/order_view_sidebar.phtml
index 1ca2ba9..a7a00dd 100644
--- a/views/mods/mod_orderupload/order_view_sidebar.phtml
+++ b/views/mods/mod_orderupload/order_view_sidebar.phtml
@@ -5,23 +5,24 @@
 	 */
  
 ?>
-<div class="postbox" id="wpsg_modorderupload">
-	<div title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br></div>
-	<h3 class="hndle">
-		<span><?php echo __('Bestelluploads', 'wpsg'); ?></span>
-	</h3> 
-	<div class="inside">
-		 <?php if (!wpsg_isSizedArray($this->view['arFiles'])) { ?>
-		 <p class="wpsg_checkout_orderupload_backend">
-		 	<?php echo __('Keine Dateien hochgeladen.', 'wpsg'); ?>
-		 </p>
-		 <?php } else { ?>
-		 <?php foreach ($this->view['arFiles'] as $f) { ?>
-		 <p class="wpsg_checkout_orderupload_backend">
-		 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>&noheader=1&action=ajax&mod=wpsg_mod_orderupload&wpsg_mod_orderupload_download=<?php echo rawurlencode($f); ?>"><?php echo $f; ?></a><br /> 
-		 	<span class="wpsg_checkout_orderupload_backend_weight">(<?php echo wpsg_formatSize($this->callMod('wpsg_mod_orderupload', 'getSavePath', array($this->view['data']['id'])).$f); ?>)</span>
-		 </p>
-		 <?php } ?>
-		 <?php } ?>
-	</div>
-</div>
\ No newline at end of file
+
+	<?php if ($this->hasMod('wpsg_mod_orderupload')) { ?>
+		<?php echo wpsg_drawForm_AdminboxStart(__('Bestelluploads', 'wpsg')); ?>
+		
+			<div class="inside">
+				 <?php if (!wpsg_isSizedArray($this->view['arFiles'])) { ?>
+				 <p class="wpsg_checkout_orderupload_backend">
+				 	<?php echo __('Keine Dateien hochgeladen.', 'wpsg'); ?>
+				 </p>
+				 <?php } else { ?>
+				 <?php foreach ($this->view['arFiles'] as $f) { ?>
+				 <p class="wpsg_checkout_orderupload_backend">
+				 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>&noheader=1&action=ajax&mod=wpsg_mod_orderupload&wpsg_mod_orderupload_download=<?php echo rawurlencode($f); ?>"><?php echo $f; ?></a><br /> 
+				 	<span class="wpsg_checkout_orderupload_backend_weight">(<?php echo wpsg_formatSize($this->callMod('wpsg_mod_orderupload', 'getSavePath', array($this->view['data']['id'])).$f); ?>)</span>
+				 </p>
+				 <?php } ?>
+				 <?php } ?>
+			</div>
+		
+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+	<?php } ?>
diff --git a/views/mods/mod_orderupload/settings_edit.phtml b/views/mods/mod_orderupload/settings_edit.phtml
index 8ad96c1..0104a89 100644
--- a/views/mods/mod_orderupload/settings_edit.phtml
+++ b/views/mods/mod_orderupload/settings_edit.phtml
@@ -30,7 +30,7 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload_optional', __('Upload ist kein Pflichtfeld', 'wpsg'), $this->get_option('wpsg_mod_orderupload_optional'), array('help' => 'wpsg_mod_orderupload_optional')); ?>
 
 <?php /* Anhang an Adminmail */ ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload_mail', __('Upload an Anhang an Adminmail', 'wpsg'), $this->get_option('wpsg_mod_orderupload_mail'), array('help' => 'wpsg_mod_orderupload_mail')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload_mail', __('Upload als Anhang an Adminmail', 'wpsg'), $this->get_option('wpsg_mod_orderupload_mail'), array('help' => 'wpsg_mod_orderupload_mail')); ?>
 
 <?php /* mehrere Anhänge zippen (wenn "mehrere Dateien" und wenn "Adminmail"*/ ?>
 <div class="wpsg_mod_orderupload_mail_activ" style="display:none;">
diff --git a/views/mods/mod_ordervars/order_view_sidebar.phtml b/views/mods/mod_ordervars/order_view_sidebar.phtml
index 2cf8c73..7ce1cad 100644
--- a/views/mods/mod_ordervars/order_view_sidebar.phtml
+++ b/views/mods/mod_ordervars/order_view_sidebar.phtml
@@ -5,12 +5,9 @@
 	 */
 
 ?>
-<div id="wpsg_ordervars" class="postbox">
-	<h3 class="wpsg_handlediv">
-		<span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br></span>
-		<span><?php echo __('Bestellvariablen', 'wpsg'); ?></span>
-	</h3>
-	<div class="inside">
+	
+	<?php echo wpsg_drawForm_AdminboxStart(__('Bestellvariablen', 'wpsg')); ?>
+	
 		<?php foreach ($this->view['wpsg_mod_ordervars']['data'] as $ov_id => $ov) { ?>
 		
 			<?php echo wpsg_drawForm_Input('wpsg_ordervar_'.$ov_id, $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])), $this->callMod('wpsg_mod_ordervars', 'getValueByIdAndOrder', array($ov_id, $_REQUEST['edit_id'])), array('text' => true, 'class_text' => 'wpsg_editable')); ?>
@@ -59,5 +56,5 @@
 			/* ]]> */</script>
 			
 		<?php } ?>
-	</div>
-</div>
+	
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/warenkorb/done.phtml b/views/warenkorb/done.phtml
index c5f3492..11f0a59 100644
--- a/views/warenkorb/done.phtml
+++ b/views/warenkorb/done.phtml
@@ -41,8 +41,23 @@
 	
 	<p><?php echo __('Vielen Dank für Ihre Bestellung!', 'wpsg'); ?></p>
 	<p><?php $this->callMods('order_done', array(&$this->view['o_id'], &$this->view)); ?></p>
-		
+	
 	<br />
 	<div class="wpsg_clear"></div>
 	
+	<?php if (isset($this->view['wpsg_mod_prepayment']['subject'])) { ?>
+		<p><?php echo __('Wenn Ihre Banking-App Girocode versteht, 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['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><?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 } ?>
+	
 </div>
\ No newline at end of file
-- 
cgit v1.2.3