From cc475ee2aa169f31a3be595e72890170f077ad9d Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 4 Sep 2019 05:53:20 +0000
Subject: - Task #674 - Fußzeilenvoreinstellung greift jetzt - Beim Aktivieren
 des Shops wird Vorkasse vordefiniert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7541 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverynote/order_view_content.phtml | 9 ++++++---
 views/mods/mod_rechnungen/order_view.phtml           | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_deliverynote/order_view_content.phtml b/views/mods/mod_deliverynote/order_view_content.phtml
index fc161bc..9f7ae44 100644
--- a/views/mods/mod_deliverynote/order_view_content.phtml
+++ b/views/mods/mod_deliverynote/order_view_content.phtml
@@ -68,15 +68,18 @@
 						<?php 
 													
 							$wpsg_mod_deliverynote_footer = $this->get_option("wpsg_mod_deliverynote_footer");
-		 					if (!is_array($wpsg_mod_deliverynote_footer)) $wpsg_mod_deliverynote_footer = unserialize($this->get_option("wpsg_mod_deliverynote_footer"));
+		 					
+							if (!is_array($wpsg_mod_deliverynote_footer)) $wpsg_mod_deliverynote_footer = unserialize($this->get_option("wpsg_mod_deliverynote_footer"));
 							if (!is_array($wpsg_mod_deliverynote_footer)) $wpsg_mod_deliverynote_footer = Array();
-		
+							
+							$default = $this->get_option('wpsg_mod_deliverynote_foottext_standard');							
+							
 						?>
 												
 						<?php if (sizeof($wpsg_mod_deliverynote_footer) > 0) { ?>				
 						<select style="width:300px; float:right;" name="wpsg_mod_deliverynote_select" id="wpsg_mod_deliverynote_select" onchange="jQuery('#wpsg_mod_deliverynote_fusstext').val(this.value);">
 							<?php foreach ($wpsg_mod_deliverynote_footer as $k => $v) { ?>
-							<option <?php echo (($this->get_option('wpsg_mod_deliverynote_foottext_standard') == $k)?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
+							<option <?php echo ((intval($default) === intval($k))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
 							<?php } ?>
 						</select>
 						<?php } ?>
diff --git a/views/mods/mod_rechnungen/order_view.phtml b/views/mods/mod_rechnungen/order_view.phtml
index 2e27e62..0d4a166 100644
--- a/views/mods/mod_rechnungen/order_view.phtml
+++ b/views/mods/mod_rechnungen/order_view.phtml
@@ -234,15 +234,18 @@
                     <?php
 
                         $wpsg_rechnungen_footer = $this->get_option("wpsg_rechnungen_footer");
+                        
                         if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer"));
                         if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array();
 
+                        $default = $this->get_option('wpsg_rechnungen_foottext_standard');
+                         
                     ?>
 
                     <?php if (sizeof($wpsg_rechnungen_footer) > 0) { ?>
                     <select style="width:300px; float:right;" id="wpsg_rechnungen_select" onchange="jQuery('#wpsg_rechnungen_fusstext').val(this.value);">
                         <?php foreach ($wpsg_rechnungen_footer as $k => $v) { ?>
-                        <option value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
+                        <option value="<?php echo wpsg_hspc($v[1]); ?>" <?php echo ((intval($default) === intval($k))?'selected="selected"':''); ?>><?php echo wpsg_hspc($v[0]); ?></option>
                         <?php } ?>
                     </select>
                     <?php } ?>
-- 
cgit v1.2.3