From cf7dd98d0e9d43d412b6cef5de1f0988703df28d Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Wed, 29 Nov 2017 15:06:52 +0000
Subject: - Reihenfolge synchron zwischen Rechnungs- und Lieferadresse

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6778 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mailtemplates/adminmail.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'views')

diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml
index 47719ef..4effc1e 100644
--- a/views/mailtemplates/adminmail.phtml
+++ b/views/mailtemplates/adminmail.phtml
@@ -19,12 +19,12 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
 <?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
-<?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 <?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?> 
 <?php } ?>
 
-<?php echo wpsg_pad_right(__('Ort', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['plz']; ?> <?php echo $this->view['basket']['checkout']['ort']; ?>  
+<?php echo wpsg_pad_right(__('Ort', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['plz']; ?> <?php echo $this->view['basket']['checkout']['ort']; ?> 
+<?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php echo wpsg_pad_right(__('Telefon', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['tel']; ?> 
 <?php echo wpsg_pad_right(__('Fax', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['fax']; ?> 
 <?php echo wpsg_pad_right(__('E-Mail Adresse', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['email']; ?>  
-- 
cgit v1.2.3