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
---
 .../mod_paypalapi/order_view_afterpayment.phtml    | 32 ++++++++-------------
 .../mods/mod_trustedshops/order_view_sidebar.phtml | 33 ++++++++--------------
 2 files changed, 22 insertions(+), 43 deletions(-)

(limited to 'views/mods')

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
-- 
cgit v1.2.3