From 93f96eaef010ad9fb5d19aa3a9189f347dc76247 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 8 Dec 2017 13:36:17 +0000
Subject: OnePageCheckout Land mit Voreinstellung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6803 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_onepagecheckout/onepage.phtml                 | 11 +++++++----
 views/mods/mod_shippingadress/checkout_inner_prebutton.phtml |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_onepagecheckout/onepage.phtml b/views/mods/mod_onepagecheckout/onepage.phtml
index 29fbc9f..3f12539 100644
--- a/views/mods/mod_onepagecheckout/onepage.phtml
+++ b/views/mods/mod_onepagecheckout/onepage.phtml
@@ -239,17 +239,17 @@
 					<label class="wpsg_cv" for="wpsg_cv_<?php echo $c_id; ?>">
 						<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
 						<?php if ($c['typ'] == '0') { // Textfeld ?>
-						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['basket']['checkout']['custom'][$c_id]); ?>" />
+						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" type="text" value="<?php if (isset($this->view['basket']['checkout']['custom'][$c_id])) echo wpsg_hspc($this->view['basket']['checkout']['custom'][$c_id]); ?>" />
 						<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
 						<select class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]">
 							<option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
 							<?php foreach ((array)$arAuswahl as $a) { ?>
-							<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+							<option value="<?php echo wpsg_hspc($a); ?>" <?php if (isset($this->view['basket']['checkout']['custom'][$c_id])) echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
 							<?php } ?>
 						</select>
 						<?php } else if ($c['typ'] == '2') { // Checkbox ?>
 						<input type="hidden" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="0" />
-						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['basket']['checkout']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
+						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="1" <?php if(isset($this->view['basket']['checkout']['custom'][$c_id])) echo wpsg_hspc(($this->view['basket']['checkout']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
 						<?php } ?>
 					</label>
 				</div>
@@ -415,8 +415,11 @@
 			 			
 			<?php } ?>			
 
+			land = <?php if (wpsg_isSizedInt($this->view['basket']['checkout']['land'])) echo $this->view['basket']['checkout']['land'];
+					else echo $this->get_option('wpsg_defaultland'); ?>;
+				
 			// Land der Rechnungsadresse setzen
-			land = jQuery('#set_land').val();
+			//land = jQuery('#set_land').val();
 			jQuery('#wpsg_land').val(land);
 			//alert('land: ' + land);
 		 	
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
index c9fbf7f..7209b59 100644
--- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
@@ -72,7 +72,7 @@
 			</div>
 				
 			<div class="wpsg_checkoutblock">
-				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
+				<label for="shipping_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>					
 				<select name="wpsg[checkout][shipping_land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="shipping_land">
@@ -120,6 +120,10 @@
 				{	
 					
 					view_checkout_shippingadresss();
+
+					land = <?php if (wpsg_isSizedInt($this->view['basket']['checkout']['land'])) echo $this->view['basket']['checkout']['land'];
+					else echo $this->get_option('wpsg_defaultland'); ?>;
+					jQuery('#shipping_land').val(land);
 					
 				});
 				
-- 
cgit v1.2.3