From 703a450908599b3ebc8018f41f54e510bb0dc255 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 4 Mar 2016 21:04:26 +0000
Subject: - Übernahme neuer Funktionen aus dem alten Zweig / Pfad /
 Einstellungen / Hilfe Icons / Berechnung - Neuer Modulfilter im neuen Backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'views/warenkorb/progress.phtml')

diff --git a/views/warenkorb/progress.phtml b/views/warenkorb/progress.phtml
index 786527c..acd7bbe 100644
--- a/views/warenkorb/progress.phtml
+++ b/views/warenkorb/progress.phtml
@@ -1,60 +1,55 @@
+<?php 
 
-<div class="wpsg_progress">
-		
-	<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>">		
+	/**
+	 * Fortschrittsbalken
+	 */
+
+?>
+
+<div class="wpsg_progress <?php echo (($this->get_option('wpsg_mod_onepagecheckout') == '')?'':'only3steps'); ?>">
+      
+	<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>">      
 		<span class="step step1 <?php echo (($GLOBALS['step'] === 1)?'current':'done'); ?>" title="<?php echo __('Hier gelangen Sie zum Warenkorb', 'wpsg'); ?>"><span class="dot"></span><span class="text"><?php echo __('Warenkorb', 'wpsg'); ?></span></span>
 	</a>
-	
-	<?php if ($GLOBALS['step'] > 1) { ?>
-	<a href=""><?php } ?>
+        
+	<?php if ($this->get_option('wpsg_mod_onepagecheckout') == '') { ?>
+           
+	<?php if ($GLOBALS['step'] > 1) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>"><?php } ?>
 	<span class="step step2 <?php echo (($GLOBALS['step'] ===2)?'current':''); ?> <?php echo (($GLOBALS['step'] > 2)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten', 'wpsg'); ?>">
 		<span class="dot"></span><span class="text"><?php echo __('Kundendaten', 'wpsg'); ?></span>
-	</span>
-	<?php if ($GLOBALS['step'] > 1) { ?>
-	</a><?php } ?>
+	</span>            
+	<?php if ($GLOBALS['step'] > 1) { ?></a><?php } ?>
 	
-	<?php if ($GLOBALS['step'] > 2) { ?>
-	<a href=""><?php } ?>
+	<?php if ($GLOBALS['step'] > 2) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT2); ?>"><?php } ?>
 	<span class="step step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?> <?php echo (($GLOBALS['step'] > 3)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zur Auswahl der Bezahlmethode und der Versandart', 'wpsg'); ?>">
 		<span class="dot"></span><span class="text"><?php echo __('Zahlung / Versand', 'wpsg'); ?></span>
-	</span>
-	<?php if ($GLOBALS['step'] > 2) { ?>
-	</a><?php } ?>
-	
-	<?php if ($GLOBALS['step'] > 3) { ?>
-	<a href=""><?php } ?>
+	</span>            
+	<?php if ($GLOBALS['step'] > 2) { ?></a><?php } ?>
+            
+	<?php if ($GLOBALS['step'] > 3) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_OVERVIEW); ?>"><?php } ?>
 	<span class="step step4 <?php echo (($GLOBALS['step'] === 4)?'current':''); ?> <?php echo (($GLOBALS['step'] > 4)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>">
 		<span class="dot"></span><span class="text"><?php echo __('Abschluß', 'wpsg'); ?></span>
 	</span>
-	<?php if ($GLOBALS['step'] > 3) { ?>
-	</a><?php } ?>
-
-</div>
-
-<div class="wpsg_clear"></div>
-
-<?php /* ?>
-<div class="steps">
-	
-	<a class="step1 <?php echo (($GLOBALS['step'] === 1)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" title="<?php echo __('Hier gelangen Sie zum Warenkorb', 'wpsg'); ?>"><span><?php echo __('Warenkorb', 'wpsg'); ?></span></a>
-	
-	<?php if ($GLOBALS['step'] > 1) { ?>
-	<a class="step2 <?php echo (($GLOBALS['step'] === 2)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten', 'wpsg'); ?>"><span><?php echo __('Kundendaten', 'wpsg'); ?></span></a>
+	<?php if ($GLOBALS['step'] > 3) { ?></a><?php } ?>
+   
 	<?php } else { ?>
-	<p class="step2"><span><?php echo __('Kundendaten','wpsg')?></span></p>		
-	<?php } ?>
-	
-	<?php if ($GLOBALS['step'] > 2) { ?>
-	<a class="step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT2); ?>" title="<?php echo __('Hier gelangen Sie zur Auswahl der Bezahlmethode und der Versandart', 'wpsg'); ?>"><span><?php echo __('Bezahlung', 'wpsg'); ?></span></a>
-	<?php } else { ?>	
-	<p class="step3"><span><?php echo __('Bezahlung','wpsg')?></span></p>		
-	<?php } ?>
+        	
+		<?php /* Onepagecheckout */ ?>
+		<?php if ($GLOBALS['step'] > 1) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>"><?php } ?>
+		<span class="step step2 <?php echo (($GLOBALS['step'] ===2)?'current':''); ?> <?php echo (($GLOBALS['step'] > 2)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten, Bezahlmethode und der Versandart', 'wpsg'); ?>">
+			<span class="dot"></span><span class="text"><?php echo __('Kundendaten / Zahlung  / Versand', 'wpsg'); ?></span>
+		</span>
+		<?php if ($GLOBALS['step'] > 1) { ?></a><?php } ?>
 	
-	<?php if ($GLOBALS['step'] > 3) { ?>
-	<a class="step4 <?php echo (($GLOBALS['step'] === 4)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_OVERVIEW); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>"><span><?php echo __('Abschluss', 'wpsg'); ?></span></a>
-	<?php } else { ?>
-	<p class="step4"><span><?php echo __('Abschluss','wpsg')?></span></p>
+		<?php if ($GLOBALS['step'] > 2) { ?><a href=""><?php } ?>
+		<span class="step step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?> <?php echo (($GLOBALS['step'] > 3)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>">
+			<span class="dot"></span><span class="text"><?php echo __('Abschluß', 'wpsg'); ?></span>
+		</span>
+		<?php if ($GLOBALS['step'] > 2) { ?></a><?php } ?>
+   
 	<?php } ?>
 
-</div> */ ?>
+</div>
+
+<div class="wpsg_clear"></div>
 	
\ No newline at end of file
-- 
cgit v1.2.3