From 3dd40b6433c3ce954d0a4eee8076270cd3d1523c Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 3 Nov 2017 15:07:26 +0000
Subject: - 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
---
 views/css/admin.css                                |  4 ++-
 .../mod_paypalapi/order_view_afterpayment.phtml    | 32 ++++++++-------------
 .../mods/mod_trustedshops/order_view_sidebar.phtml | 33 ++++++++--------------
 views/order/view.phtml                             | 15 +++++++++-
 views/order/view_general.phtml                     | 12 ++++++++
 views/produkt/addedit.phtml                        |  2 +-
 6 files changed, 52 insertions(+), 46 deletions(-)

(limited to 'views')

diff --git a/views/css/admin.css b/views/css/admin.css
index e3279db..7d4840b 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -191,7 +191,8 @@ table.wpsgitrecht_table { width:100%; }
  */
 .wpsg_productview_backend-sold-out { color:#dc3232; font-weight:700; }
 .wpsg_productview_backend-available { color:#7ad03a; font-weight:700; float:left; margin-right:5px; }
-.wpsg_top_productname { line-height:50px; margin-left:15px; }
+.wpsg_top_extend { line-height:50px; margin-left:15px; }
+.wpsg_top_extend .commenticon { cursor:default; display:inline-block; margin:0px !important; padding-right:0px; }
 
 /* Bewertung */
 .wpsg_rating { background-color:#29556E; }
@@ -217,6 +218,7 @@ table.wpsgitrecht_table { width:100%; }
 .wpsg_order .col_nr .actions a { font-size:0.9em; }
 .wpsg_order .col_nr .glyphicon { margin-top:5px; font-size:1.2em; margin-right:5px; text-decoration:none; }
 .wpsg_order .col_nr .glyphicon.shippingadress { color:red; }
+.wpsg_top_extend .commenticon.admincomment,
 .wpsg_order .col_nr .glyphicon.admincomment { color:red; }
 .wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; }
 
diff --git a/views/mods/mod_paypalapi/order_view_afterpayment.phtml b/views/mods/mod_paypalapi/order_view_afterpayment.phtml
index fdd522a..80e402a 100644
--- a/views/mods/mod_paypalapi/order_view_afterpayment.phtml
+++ b/views/mods/mod_paypalapi/order_view_afterpayment.phtml
@@ -7,34 +7,24 @@
 ?>
 
 <?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'))) { ?>
-	
-	<div class="wpsg_form_field ">
-		<div class="wpsg_form_left">
-			<label for=""><?php echo __('PaymentID', 'wpsg'); ?>: [<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refresh&edit_id=<?php echo $this->view['oOrder']->id; ?>"><?php echo __('Status Aktualisieren', 'wpsg'); ?></a>]</label>
-		</div>
-		<div class="wpsg_form_right">
-			<p class="" id=""><?php echo wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentstate')); ?></p>
-		</div>
-		<div class="wpsg_clear"></div>
-	</div>
-		
+
+	<?php echo wpsg_drawForm_Text(
+		wpsg_translate(
+			__('PaymentID [<a href="#1#">Status Aktualisieren</a>]', 'wpsg'),
+			WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refresh&edit_id='.$this->view['oOrder']->id
+		),
+		wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentstate'))
+	); ?>
+
 <?php } ?>
 
 <?php if (wpsg_isSizedString($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'))) { ?>
 
-	<div class="wpsg_form_field ">
-		<div class="wpsg_form_left">
-			<label for=""><?php echo __('SaleID', 'wpsg'); ?>:</label>
-		</div>
-		<div class="wpsg_form_right">
-			<p class="" id=""><?php echo wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate')); ?></p>
-		</div>
-		<div class="wpsg_clear"></div>
-	</div>
+	<?php echo wpsg_drawForm_Text(__('SaleID', 'wpsg'), wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate'))); ?>
 	
 	<?php if ($this->view['oOrder']->getMeta('wpsg_mod_paypalapi_salestate') != 'refunded') { ?>
 	<br />
-	<a onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refund&edit_id=<?php echo $this->view['data']['id']; ?>"><?php echo __('Zahlung rückerstatten (Refund Call)', 'wpsg'); ?></a>
+	<a onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refund&edit_id=<?php echo $this->view['data']['id']; ?>"><?php echo __('Zahlung rückerstatten', 'wpsg'); ?></a>
 	<?php } ?> 	
 	 	
 <?php } ?>
diff --git a/views/mods/mod_trustedshops/order_view_sidebar.phtml b/views/mods/mod_trustedshops/order_view_sidebar.phtml
index 9675bef..517305a 100644
--- a/views/mods/mod_trustedshops/order_view_sidebar.phtml
+++ b/views/mods/mod_trustedshops/order_view_sidebar.phtml
@@ -4,25 +4,14 @@
 	 * Template für die Trusted Shops Integration in die Bestellverwaltung
 	 */
 
-?> 
-<div class="postbox" id="wpsg_trustedshops">
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Trusted Shops', 'wpsg'); ?></span>
-	</h3> 
-	<div class="inside">
-		
-		<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_set', __('Einwilligung', 'wpsg'), (($this->view['data']['wpsg_mod_trustedshops_set'] == '1')?__('Ja', 'wpsg'):__('Nein', 'wpsg')), array('text' => true, 'help' => 'wpsg_mod_trustedshops_set')); ?>
-		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				
-			</div>
-			<div class="wpsg_form_right">
-				<a onclick="if (!confirm('<?php echo __('Der Kunde erhält eine Mail mit einem Link zur Bewertung der Bestellung. Sind Sie sich sicher?', 'wpsg'); ?>')) return false;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_trustedshops&edit_id=<?php echo $this->view['data']['id']; ?>&do=mail"><?php echo __('E-Mail mit Bewertungslink senden', 'wpsg'); ?></a>										
-			</div>
-		</div>
-		<div class="wpsg_clear"></div>
-		
-	</div>
-</div>
\ No newline at end of file
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Trusted Shps', 'wpsg')); ?>
+
+	<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_set', __('Einwilligung', 'wpsg'), (($this->view['data']['wpsg_mod_trustedshops_set'] == '1')?__('Ja', 'wpsg'):__('Nein', 'wpsg')), array('text' => true, 'help' => 'wpsg_mod_trustedshops_set')); ?>
+
+	<br />
+
+	<a onclick="if (!confirm('<?php echo __('Der Kunde erhält eine Mail mit einem Link zur Bewertung der Bestellung. Sind Sie sich sicher?', 'wpsg'); ?>')) return false;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_trustedshops&edit_id=<?php echo $this->view['data']['id']; ?>&do=mail"><?php echo __('E-Mail mit Bewertungslink senden', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
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">
 
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml
index ec7dd69..1a6426b 100644
--- a/views/produkt/addedit.phtml
+++ b/views/produkt/addedit.phtml
@@ -18,7 +18,7 @@
 				<ul class="nav navbar-nav">
 					<li role="presentation" class="active"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("Produktübersicht", "wpsg"); ?></a></li>
 					<li role="presentation" class="wpsg_showhide_filter active"><a href="#" onclick="return false;"><?php echo __("Produkte anlegen/bearbeiten", "wpsg"); ?></a></li>
-					<li role="presentation" class="wpsg_top_productname">
+					<li role="presentation" class="wpsg_top_extend">
 						<?php echo $this->view['oProduct']->getProductName(); ?>
 					</li>
 				</ul>
-- 
cgit v1.2.3