summaryrefslogtreecommitdiff
path: root/views/order
diff options
context:
space:
mode:
authorDaniel Schmitzer <noreply@maennchen1.de>2017-11-03 15:07:26 +0000
committerDaniel Schmitzer <noreply@maennchen1.de>2017-11-03 15:07:26 +0000
commit3dd40b6433c3ce954d0a4eee8076270cd3d1523c (patch)
tree9a4345304e9a9bc9b054f0d571ae91da8bcdfda5 /views/order
parentc3624d0943a36118c673e30cf68dd02fe31f6ea3 (diff)
- Feature - Darstellung PayPalPlus Bestellbackend
- Feature - Darstellung Trusted Shops Bestellbackend - Feature - Bestelldaten in Kopf der Bestellansicht - Feature - Kundenkommentar in Bestallansicht git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6683 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views/order')
-rw-r--r--views/order/view.phtml15
-rw-r--r--views/order/view_general.phtml12
2 files changed, 26 insertions, 1 deletions
diff --git a/views/order/view.phtml b/views/order/view.phtml
index d4e7270..ace618b 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -14,8 +14,21 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
- <li role="presentation" class="active <?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
+ <li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
<li role="presentation" class="wpsg_showhide_filter active"><a onclick="return false;"><?php echo __("Bestellansicht (Detail)", "wpsg"); ?></a></li>
+ <li role="presentation" class="wpsg_top_extend">
+
+ <?php echo $this->view['oOrder']->getInvoiceFirstName().' '.$this->view['oOrder']->getInvoiceName().' / '.wpsg_ff($this->view['oOrder']->getAmount($this->getBackendTaxview()), $this->get_option('wpsg_currency')); ?>
+
+ <?php if (trim($this->view['oOrder']->admincomment) != "") { ?>
+ <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($this->view['oOrder']->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign commenticon admincomment" href="#"></a>
+ <?php } ?>
+
+ <?php if (trim($this->view['oOrder']->comment) != "") { ?>
+ <a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($this->view['oOrder']->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign commenticon customercomment" href="#"></a>
+ <?php } ?>
+
+ </li>
</ul>
<ul class="nav navbar-nav navbar-right">
diff --git a/views/order/view_general.phtml b/views/order/view_general.phtml
index 80e1e30..c2ed0c5 100644
--- a/views/order/view_general.phtml
+++ b/views/order/view_general.phtml
@@ -16,6 +16,18 @@
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php $comment = $this->view['oOrder']->comment; if (wpsg_isSizedString($comment)) { ?>
+
+ <?php echo wpsg_drawForm_AdminboxStart(__('Bestellkommentar (Kunde)', 'wpsg')); ?>
+
+ <p>
+ <?php echo $comment; ?>
+ </p>
+
+ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<?php } ?>
+
<?php echo wpsg_drawForm_AdminboxStart(__('Statusänderung', 'wpsg')); ?>
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&amp;action=switchStatus&amp;edit_id=<?php echo $this->view['data']['id']; ?>&amp;noheader=1" enctype="multipart/form-data">