From c6a85e33fb49250629022960249301adc756a67e Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 20 Oct 2016 14:59:46 +0000
Subject: - Weiter Ãœbernahme Adressanpassung
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5854 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/produkttemplates/standard.phtml |  6 +++---
 views/warenkorb/basket.phtml          | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index e361bfd..8a60603 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -163,10 +163,10 @@
 						
 					</div>
 					
-					<?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
+					<?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
 					<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
 						<div class="wpsg_mod_deliverytime_delay">
-							<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+							<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verz�gerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
 						</div>
 					<?php } ?>
 				<?php } ?>
@@ -244,7 +244,7 @@
 			<?php } ?>
 			
 			<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>
-				<?php if ($this->view['data']['storeproduct'] >= '1') {?>
+				<?php if (wpsg_isSizedInt($this->view['data']['storeproduct'])) {?>
 					
 					<span class="wpsg_product_only_store"><?php  echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span><br />
 				
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 19acf9e..ec0abff 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -149,7 +149,7 @@
 						<option <?php echo (($s['id'] == $this->view['basket']['checkout']['shipping'])?'selected="selected"':''); ?> value="<?php echo $s_id; ?>"><?php echo wpsg_hspc(__($s['name'], 'wpsg')); ?></option>
 						<?php } ?>
 					</select>
-					<?php } else { ?>
+					<?php } else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping)) { ?>
 					<span><?php echo $this->arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?></span>
 					<?php } ?>
 					<?php if ($this->get_option('wpsg_hideBasketCountrySelect') != '1') { ?>
@@ -297,9 +297,9 @@
 	
 </div>
 
-<script type="text/javascript">/* <![CDATA[ */
+<script type="text/javascript">/* <![CDATA[ */
 
-	jQuery(document).ready(function() {
+	jQuery(document).ready(function() {
 
 		jQuery('.wpsg_form_submit_return').bind('keypress', function(e) {
 
@@ -320,7 +320,7 @@
 		
 		} );
 
-	} );
+	} );
 
 	<?php if (isset($_REQUEST['wpsg_basket_ajax'])) { ?> 
 
@@ -331,5 +331,5 @@
 		} );
 
 	<?php } ?>
-	
+	
 /* ]]> */</script>
\ No newline at end of file
-- 
cgit v1.2.3