From 95e6564917cddd2188fa945dc7102bd470818fbc Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Wed, 14 Dec 2016 11:58:21 +0000
Subject: BE Bestell-Mail an Kunde senden, Korrektur Aufteilung Payment-Kosten

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5979 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mailtemplates/kundenmail.phtml |  2 +-
 views/order/view.phtml               | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml
index 22dfd4d..8e26d8e 100644
--- a/views/mailtemplates/kundenmail.phtml
+++ b/views/mailtemplates/kundenmail.phtml
@@ -59,7 +59,7 @@
  
 <?php echo wpsg_pad_right(__('Kundennummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['knr']; ?> 
 <?php echo wpsg_pad_right(__('Bestellnummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['onr']; ?> 
-<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", $this->view['basket']['checkout']['datum']); ?> 
+<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", strtotime($this->view['basket']['checkout']['datum'])); ?> 
 <?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> 
 <?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>
 
diff --git a/views/order/view.phtml b/views/order/view.phtml
index 55e8386..5ae9a2e 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -58,6 +58,9 @@
             <?php //} ?>
         <?php } ?>
 		
+        <a href="" id="LinkSendMail" onclick="return wpsg_sendMail(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-envelope"></span>&nbsp;
+	 	<?php echo __("Mail an Kunde", "wpsg"); ?>
+	 	</a><br />
 		
 		<div id='wpsg_kv_list'>
 		</div>
@@ -80,6 +83,24 @@
 <script type="text/javascript">/* <![CDATA[ */
 
 
+	/**
+	 * Fügt einen neuen Rabatt hinzu (nur wenn keiner da ist)
+	 */	                                            	
+	function wpsg_sendMail(oid)
+	{
+		jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=sendMail&do=send&edit_id=' + oid + '&noheader=1',
+			success: function(data) {
+				jQuery('#wpsg_produkte_table').replaceWith(data);
+			}
+		} );
+	
+		return false;
+	
+	} // function wpsg_sendMail()
+
 	/**
 	 * Fügt einen neuen Rabatt hinzu (nur wenn keiner da ist)
 	 */	                                            	
-- 
cgit v1.2.3