diff options
| author | hartmut <noreply@maennchen1.de> | 2016-12-14 11:58:21 +0000 |
|---|---|---|
| committer | hartmut <noreply@maennchen1.de> | 2016-12-14 11:58:21 +0000 |
| commit | 95e6564917cddd2188fa945dc7102bd470818fbc (patch) | |
| tree | a4501ed2cabfea691f0e06a1257293810bd16654 | |
| parent | 7d11e7763038b8f847b150cd3a1eddc512798689 (diff) | |
BE Bestell-Mail an Kunde senden, Korrektur Aufteilung Payment-Kosten
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5979 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/mailtemplates/kundenmail.phtml | 2 | ||||
| -rw-r--r-- | views/order/view.phtml | 21 |
2 files changed, 22 insertions, 1 deletions
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>
+ <?php echo __("Mail an Kunde", "wpsg"); ?>
+ </a><br />
<div id='wpsg_kv_list'>
</div>
@@ -83,6 +86,24 @@ /**
* 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)
+ */
function wpsg_addDiscount(oid)
{
jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
|