- Testweise 4

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5261 0d5edaf7-2b12-4e95-93f4-047927463d4b
author: Daniel Schmitzer <noreply@maennchen1.de> 2016-01-14 14:55:36 +0000
committer: Daniel Schmitzer <noreply@maennchen1.de> 2016-01-14 14:55:36 +0000
commit: ad405c7045c6e242080ec9d3ce4c9e586b517c4f (patch)
tree: b41905f4d27f3eaaabd5bad3a39f8d3873540b46 /views/warenkorb
9 files changed, 1434 insertions, 0 deletions
diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml
new file mode 100644
index 0000000..1f5d5cc
--- /dev/null
+++ b/views/warenkorb/ajaxDialog.phtml
@@ -0,0 +1,62 @@
+<?php
+	
+	/**
+	 * Template für den Dialog wenn im Backend "Lightbox Meldung" eingestellt ist
+	 */
+	 
+	// $this->view['error'] // Steht auf true wenn ein Fehler produziert und angezeigt werden soll
+	// $this->view['product_key'] // Der ProduktSchlüssel des hinzugefügten Produktes
+	// $this->view['amount_add'] // So oft wurde das Produkt hinzugefügt
+	// $this->view['amount_basket'] // So oft befindet sich das hinzugefügte Produkt im Warenkorb
+	// $this->view['product_data'] // Array mit Produktdaten
+	
+?><div id="wpsg_basket_ajax_message">
+ 	
+ 	<div class="wpsg_basket_ajax_message_content">
+ 		
+ 		<?php if ($this->view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?>
+ 		 
+ 		 	<span class="wpsg_basket_ajax_message_content_success">
+ 			<?php echo wpsg_translate(
+ 				__('Es wurde #1#x "#2#" in den Warenkorb gelegt.', 'wpsg'),
+ 				$this->view['amount_add'],
+ 				$this->getProductName($this->view['product_data']['id'], true)); ?>
+ 			</span>
+ 				
+ 		<?php } ?> 
+ 		
+ 		<div class="wpsg_button_wrap">
+ 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>
+ 			<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>"><button class="wpsg_button wpsg_button_basket"><?php echo __('Zum Warenkorb', 'wpsg'); ?></button></a>
+ 			<div class="wpsg_clear"></div>
+ 		</div>
+ 		
+ 		<?php $this->clearFrontendMessage(); ?>
+ 		
+ 	</div>
+
+</div><div id="wpsg_basket_ajax_layer"></div>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	function wpsg_basket_ajax_message_close()
+	{
+
+		jQuery('#wpsg_basket_ajax_message').remove();
+		jQuery('#wpsg_basket_ajax_layer').remove();
+
+		return false;
+		
+	}
+                                    
+	jQuery(document).ready(function() { 
+
+		jQuery('#wpsg_basket_ajax_layer').bind('click', function() {
+
+			wpsg_basket_ajax_message_close();
+			
+		} );
+		 
+	} );
+    
+/* ]]> */</script>
+\ No newline at end of file
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
new file mode 100644
index 0000000..f75874f
--- /dev/null
+++ b/views/warenkorb/basket.phtml
@@ -0,0 +1,331 @@
+<?php
+
+	/**
+	 * Template für den Warenkorb
+	 */
+ 
+	//wpsg_debug($this->view['basket']);
+	//wpsg_debug($_SESSION);
+	//wpsg_debug($this->arShipping);
+	
+?>	
+<div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
+	
+	<?php echo $this->writeFrontendMessage(); ?>
+	
+	<?php $this->callMods('basket_top'); ?>
+	
+	<?php if (sizeof($this->view['basket']['produkte']) > 0) { ?>
+
+	<?php $GLOBALS['step'] = 1; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+		
+	<form id="wpsg_basket_form" name="wpsg_basket_form"  method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>">
+	
+		<h2><?php echo __('Bestellte Produkte', 'wpsg'); ?></h2>
+		
+		<div class="wpsg_spacer"></div>
+		
+		<table>
+			<tr class="wpsg_kopf">
+				<th class="wpsg_cell_number">&nbsp;</th>
+				<th class="wpsg_cell_menge"><?php echo __("Anzahl", "wpsg"); ?></th> 
+				<th class="wpsg_cell_preis"><?php echo __("Einzelpreis", "wpsg"); ?></th>
+				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+				<th class="wpsg_cell_mwst"><?php echo __("MwSt.", "wpsg"); ?></th>
+				<?php } ?>				
+				<th class="wpsg_cell_gesamtpreis"><?php echo __("Gesamtpreis", "wpsg"); ?></th>
+			</tr>
+			<?php $i = 0; foreach ($this->view['basket']['produkte'] as $k => $p) { $i ++; ?>		
+			<?php $strBasketRow = ''; ob_start(); $this->callMods('basket_row', array(&$p, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>	
+			<tr class="productrow_1 wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+				<td class="wpsg_cell_number" rowspan="<?php echo 2 + substr_count($strBasketRow, '<tr'); ?>">
+				
+					<a class="wpsg_basket_removelink" href="<?php echo $this->getRemoveLinkURL($p['product_index']); ?>" title="<?php echo __('Produkt aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie das Produkt aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');">
+						<img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />
+					</a>			
+					
+				</td>
+				<td class="wpsg_cell_menge">
+					<input class="wpsg_form_submit_return" type="text" name="wpsg[menge][<?php echo $p['product_index']; ?>]" <?php echo ((wpsg_isTrue($p['oneOnly']) || wpsg_isSizedInt($p['basket_multiple'], 4))?'readonly="readonly"':''); ?> value="<?php echo wpsg_hspc($p['menge']); ?>" size="3" />
+				</td>
+				<td class="wpsg_cell_preis"><?php echo wpsg_ff($p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
+				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+				<td class="wpsg_cell_mwst"><?php echo wpsg_ff($p['mwst_value']); ?> %</td>
+				<?php } ?>
+				<td class="wpsg_cell_gesamtpreis"><?php echo wpsg_ff($p['menge'] * $p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
+			</tr>
+			<tr class="productrow_2 wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+				<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>" class="wpsg_cell_name"> 
+					<?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { 
+						
+						if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']);						
+						else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktID($p['id']))); 
+						
+					?>
+					<div class="wpsg_basket_productimage">
+						<?php if (wpsg_isSizedString($arBilder[0])) { ?>
+						<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktID($p['id']), $arBilder[0], 30, 30, 'c')); ?>" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />
+						<?php } ?>
+					</div>
+					<?php } ?>
+					<?php if ($this->getProduktLink($p)) { ?>
+					<a href="<?php echo $this->getProduktLink($p); ?>"><?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?></a>
+					<?php } else { ?>
+					<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>
+					<?php } ?>
+				</td>
+			</tr>			
+			<?php echo $strBasketRow; ?>			
+			<?php } ?>
+			<?php $this->callMods('basket_row_afterproducts', array(&$p, $i)); ?>			
+			<?php if (isset($this->view['basket']['gs'])) { ?> 
+			<tr class="wpsg_row_gutschein">
+				<td class="wpsg_cell_number" rowspan="2">
+					<a href="<?php echo str_replace('&', '&amp;', $this->getRemoveLinkURL('gs')); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');">
+						<img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />					
+					</a>
+				</td>
+				<td class="wpsg_cell_menge">1</td>				
+				<td class="wpsg_cell_preis">
+					<?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
+					<?php echo '-'.wpsg_ff($this->view['basket']['gs']['value'], '%'); ?>
+					<?php } else { ?>
+					<?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
+					<?php } ?>
+				</td>
+				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+				<td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+				<?php } ?> 
+				<td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
+			</tr>
+			<tr class="productrow_2">
+				<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_name">
+					<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
+				</td>
+			</tr>
+			<?php } ?>
+			<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
+			<tr class="wpsg_row_discount"> 
+				<td class="wpsg_cell_menge"></td>
+				<td class="wpsg_cell_name">
+					<?php echo __('Rabatt', 'wpsg'); ?>
+				</td>
+				<td class="wpsg_cell_preis">
+					<?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+				</td>
+				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+				<td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+				<?php } ?> 
+				<td class="wpsg_cell_gesamtpreis">
+					<?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+				</td>
+			</tr>			
+			<?php } ?>
+			<tr class="wpsg_row_summe">
+				<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+					<?php if ($this->get_option("wpsg_kleinunternehmer") == "1") { ?>
+					<?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+					<?php } else { ?>
+					<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
+					<?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:					
+					<?php } else { ?>
+					<?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+					<?php } ?>
+					<?php } ?>					
+				</td>
+				<td class="wpsg_cell_summe_value">
+					<?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?>
+				</td>
+			</tr>			
+			<tr class="wpsg_basket_shipping">
+				<td colspan="3" class="wpsg_cell_shipping_label">
+					<?php echo wpsg_translate(__('<a href="#1#">Versandkosten</a>:', 'wpsg'),
+						$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN)
+					); ?>
+					<?php if (sizeof($this->arShipping) > 1) { ?>		 							
+					<select name="set_shipping" class="wpsg_form_submit set_shipping">
+						<option><?php echo __('Bitte wählen', 'wpsg')?></option>
+						<?php foreach ($this->arShipping as $s_id => $s) { ?>						
+						<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 { ?>
+					<span><?php echo $this->arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?></span>
+					<?php } ?>
+					<?php if ($this->get_option('wpsg_hideBasketCountrySelect') != '1') { ?>
+					<select name="set_land" class="wpsg_form_submit set_land">
+						<?php foreach ($this->view['arLander'] as $l_id => $l) { ?>
+						<option <?php echo (($l_id == $this->getFrontendCountry(true))?'selected="selected"':''); ?> value="<?php echo $l_id; ?>"><?php echo wpsg_hspc(__($l, 'wpsg')); ?></option>
+						<?php } ?>
+					</select>	
+					<?php } else { ?>
+					<input type="hidden" name="set_land" value="<?php echo $this->view['basket']['checkout']['shipping_land']; ?>" />
+					<?php } ?>
+				</td>
+				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+				<td class="wpsg_cell_mwst"><?php  
+			 
+					if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
+					{
+					
+						echo __('anteilig', 'wpsg');
+											
+					}
+					else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))
+					{
+					
+						echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
+					
+					}
+				 
+				?></td>
+				<?php /*?><td class="wpsg_cell_mwst"><?php echo (($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'] > 0)?wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'):__('anteilig', 'wpsg')); ?></td> */?>							
+				<?php } ?>
+				<td class="wpsg_cell_shipping_value">
+					<?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?> 
+				</td>
+			</tr>
+			
+			<?php /* Zeile für Zahlungsart BEGIN */ ?>
+			<?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>
+			<tr class="wpsg_basket_payment">
+				<td colspan="3" class="wpsg_cell_payment_label">
+					<?php echo __('Zahlungsart:', 'wpsg'); ?>
+					<?php if (sizeof($this->arPayment) > 1) { ?>
+					<select name="set_payment" class="wpsg_form_submit set_payment">						
+						<option><?php echo __('Bitte wählen', 'wpsg')?></option>						
+						<?php foreach ($this->arPayment as $p_id => $p) { ?>
+						<option <?php echo (($p['id'] == $this->view['basket']['checkout']['payment'])?'selected="selected"':''); ?> value="<?php echo $p_id; ?>"><?php echo wpsg_hspc($p['name']); ?></option>
+						<?php } ?>
+					</select>
+					<?php } else { ?>
+					<span><?php echo $this->arPayment[$this->view['basket']['checkout']['payment']]['name']; ?></span>
+					<?php } ?>
+				</td>
+				<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+				<td class="wpsg_cell_mwst"><?php  
+				 
+					if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
+					{
+						
+						echo __('anteilig', 'wpsg');
+						
+					}
+					else if (array_key_exists(wpsg_getStr($this->view['basket']['checkout']['payment']), $this->arPayment))
+					{
+						
+						echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
+						
+					}					
+					
+				?></td>				
+				<?php } ?>
+				<td class="wpsg_cell_payment_value">
+					<?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
+				</td>
+			</tr>
+			<?php } ?>
+			<?php /* Zeile für Zahlungsart ENDE */ ?>
+			
+			<?php if (get_option("wpsg_kleinunternehmer") == "1") { ?>
+			<tr class="wpsg_basket_kleinunternehmer">			
+				<td colspan="<?php echo $this->view['colspan'] + 1; ?>"><?php echo get_option('wpsg_kleinunternehmer_text'); ?></td>
+			</tr>
+			<tr class="wpsg_basket_gesamt">
+				<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+					<?php echo __('Gesamtpreis', 'wpsg'); ?>:
+				</td>	
+				<td class="wpsg_cell_gesamtsumme_value">
+					<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
+				</td>
+			</tr>
+			<?php } else { ?>				
+				<tr class="wpsg_basket_gesamt_netto wpsg_row_small">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+						<?php echo __('Gesamtpreis (Netto)', 'wpsg'); ?>:
+					</td>
+					<td class="wpsg_cell_gesamtsumme_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')); ?>
+					</td>
+				</tr>
+				<?php foreach ($this->view['basket']['mwst'] as $mwst) { ?> 
+				<tr class="wpsg_row_mwst">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">				
+						<?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), __($mwst['name'], 'wpsg')); ?>:										
+					</td>
+					<td class="wpsg_cell_mwst_value">
+						<?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+					</td>
+				</tr>					 				
+				<?php } ?>
+				<tr class="wpsg_basket_gesamt wpsg_row_small">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+						<?php echo __('Gesamtpreis (Brutto)', 'wpsg'); ?>:
+					</td>
+					<td class="wpsg_cell_gesamtsumme_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
+					</td>
+				</tr> 					
+			<?php } ?>
+			<?php $this->callMods('basket_row_end', array(&$this->view)); ?>
+		</table>
+			   
+		<?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>
+				
+		<br /> 
+		
+		<input type="hidden" name="wpsg_basket_submit" value="1" />
+		
+		<input type="submit" class="wpsg_button wpsg_refreshbutton" value="<?php echo __('aktualisieren', 'wpsg'); ?>" name="wpsg_basket_refresh" />
+		<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
+				
+		<div class="wpsg_clear"></div>
+			
+		<?php $this->ClearSessionErrors(); ?>
+			
+	</form>
+	
+	<?php $this->callMods('basket_after', array(&$this->view)); ?>
+	 	
+	<?php } else { ?>
+	<p><?php echo __('Keine Produkte im Warenkorb.', 'wpsg'); ?></p>
+	<?php } ?>
+	
+</div>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		jQuery('.wpsg_form_submit_return').bind('keypress', function(e) {
+
+			var code = e.keyCode || e.which;
+
+			if (code == 13)
+			{
+
+				jQuery('.wpsg_refreshbutton').click(); return false;
+				
+			}
+			  
+		} );
+		
+		jQuery('.wpsg_form_submit').bind('change', function() {
+		  
+			jQuery('.wpsg_refreshbutton').click();
+		
+		} );
+
+	} );
+
+	<?php if (isset($_REQUEST['wpsg_basket_ajax'])) { ?> 
+
+		jQuery(document).ready(function() {
+			
+			jQuery('.wpshopgermany_widget').load('<?php echo $this->getURL(wpsg_ShopController::URL_WIDGET_AJAX); ?>');		
+			
+		} );
+
+	<?php } ?>
+	
+/* ]]> */</script>
+\ No newline at end of file
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml
new file mode 100644
index 0000000..1cf4e9b
--- /dev/null
+++ b/views/warenkorb/checkout.phtml
@@ -0,0 +1,269 @@
+<?php
+
+	/**
+	 * Template für den ersten Schritt der Kasse
+	 * Kundendaten etc.
+	 */
+	
+	//wpsg_debug($this->view);
+
+?>
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		<?php if ($this->get_option('wpsg_form_validation') == '1') { ?>
+		
+		if (typeof jQuery.validationEngine == "object")
+		{
+
+			jQuery("#form-step2").validationEngine('attach', {promptPosition : "bottomLeft", scroll: false});
+				
+			jQuery('.wpsg_mod_kundenverwaltung_login').bind('click', function(){
+				jQuery("#form-step2").validationEngine('detach');						
+			});
+
+		}
+		
+		<?php } else if ($this->get_option('wpsg_form_validation') == '2') { ?>
+
+		jQuery.validator.addMethod("cRequired", jQuery.validator.methods.required, "<?php echo __('Dieses Feld ist ein Pflichtfeld.', 'wpsg'); ?>");
+		jQuery.validator.addClassRules('validate[required]', { cRequired: true } );
+		jQuery("#form-step2").validate( { 
+			ignore: '',
+			errorClass: 'wpsg_error',
+			onsubmit: false,
+			showErrors: function(errorMap, errorList) {
+
+				this.defaultShowErrors();	
+
+			}
+		} ); 
+
+		jQuery('#wpsg_checkout2button').bind('click', function() { 
+
+			var bReturn = jQuery('#form-step2').validate().form();
+			if (jQuery('#form-step2 input.wpsg_error').length > 0) jQuery('#form-step2 input.wpsg_error')[0].focus();
+			return bReturn;
+			  
+		} );
+		
+		<?php } ?>
+
+		jQuery('.wpsg_checkout input').bind('keyup', function(e) {
+
+			if(e.keyCode == 13)
+		    {
+		        jQuery('#wpsg_checkout2button').click();
+		    }
+		    
+		} );
+		
+	} );
+		
+/* ]]> */</script>
+
+<div class="wpsg wpsg_checkout">
+
+	<?php echo $this->writeFrontendMessage(); ?>
+		
+	<?php $GLOBALS['step'] = 2; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+		
+	<form id="form-step2" method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" enctype="multipart/form-data">
+
+		<?php /* Einbindung des Logins im Checokut */ ?>	
+		<?php $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_login'); ?>
+	
+		<div class="wpsg_box" id="wpsg_box_kundendaten">
+			
+			<h2><?php echo __('Kundendaten', 'wpsg'); ?></h2>
+			
+			<div class="wpsg_spacer"></div>
+		
+			<div class="wpsg_inner">
+		
+				<div class="wpsg_checkoutblock" id="wpsg_firma">
+					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['firma']); ?>" />
+				</div>
+			
+				<div class="wpsg_checkoutblock" id="wpsg_anrede">
+					<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
+					<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>
+					<select class="<?php echo (($this->view['pflicht']['anrede'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_title" name="wpsg[checkout][title]">
+						<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
+						<?php foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
+						<option value="<?php echo wpsg_hspc($t); ?>" <?php echo (($this->view['basket']['checkout']['title'] == $t)?'selected="selected"':''); ?>><?php echo $t; ?></option>
+					<?php } ?>						
+					</select>
+				</div>
+			
+				<div class="wpsg_checkoutblock" id="wpsg_vorname">
+					<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[checkout][vname]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['vname']); ?>" />		
+				</div>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_name">
+					<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[checkout][name]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['name']); ?>" />
+				</div>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_email">
+					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[checkout][email]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['email']); ?>" />
+				</div>
+				
+				<?php if (isset($this->view['pflicht']['emailconfirm']) && $this->view['pflicht']['emailconfirm'] == '1') { ?>
+				<div class="wpsg_checkoutblock" id="wpsg_email2">
+					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail (Wiederholung)", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[checkout][email2]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['email2']); ?>" />
+				</div>
+				<?php } ?>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">
+					<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>
+					<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[checkout][geb]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['geb']); ?>" />
+				</div>
+						
+				<div class="wpsg_checkoutblock" id="wpsg_fax">
+					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['fax']); ?>" />
+				</div>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_telefon">
+					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['tel']); ?>" />
+				</div>
+			
+				<div class="wpsg_checkoutblock" id="wpsg_strasse">
+					<label for="strasse" class="wpsg_checkout"><?php echo __("Strasse Nr.", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['strasse']); ?>" />		
+				</div>
+			
+				<div class="wpsg_checkoutblock" id="wpsg_postleitzahl">
+					<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['plz']); ?>" />
+				</div>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_ort">
+					<label for="ort" class="wpsg_checkout"><?php echo __("Ort", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[checkout][ort]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['ort']); ?>" />
+				</div>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_land">
+					<label for="wpsg_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][land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_land">
+						<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
+						<?php foreach ($this->view['laender'] as $l) { ?>
+						<option value="<?php echo wpsg_hspc($l['id']); ?>" <?php echo (($l['id'] == $this->view['basket']['checkout']['land'])?'selected="selected"':((!wpsg_isSizedInt($this->view['basket']['checkout']['land']) && $this->get_option('wpsg_defaultland') == $l['id'])?'selected="selected"':'')); ?>><?php echo wpsg_hspc(__($l['name'], 'wpsg')); ?></option>
+						<?php } ?>
+					</select>
+				</div>
+				
+				<div class="wpsg_checkoutblock" id="wpsg_ustidnr">
+					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 
+					<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['ustidnr']); ?>" />
+				</div>
+				
+				<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
+				<?php if ($this->get_option('wpsg_kundenvariablen_show') == '1') { ?>
+				<?php foreach ((array)$this->view['pflicht']['custom'] as $c_id => $c) { if ($c['show'] != '2') { ?>
+				<div class="wpsg_checkoutblock">
+					<label class="wpsg_cv wpsg_checkout" 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]); ?>" />
+						<?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>
+							<?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"':''); ?> />
+						<?php } ?>
+					</label>
+				</div>
+				<?php } } ?>
+				<?php } ?>
+				<?php /* Automatische Einbindung der benutzerdefinierten Kundenfelder ENDE */ ?>
+				<div class="wpsg_clear"></div>
+				
+				<?php $this->callMods('checkout_customer_inner'); ?>
+				
+			</div>
+			
+		</div>
+	 	 		 		 
+		<?php $this->callMods('checkout_inner_prebutton', array(&$this->view)); ?>
+		 		
+		<div class="wpsg_clear"></div>
+		
+		<div class="wpsg_box">
+			
+			<h2><?php echo __('Bestellkommentar', 'wpsg'); ?></h2>
+			
+			<div class="wpsg_spacer"></div>
+			
+			<div class="wpsg_inner wpsg_commentblock">
+				<textarea name="wpsg[checkout][comment]" id="wpsg_checkout_comment"><?php echo wpsg_hspc($this->view['basket']['checkout']['comment']); ?></textarea>				 
+			</div>
+		</div>
+		
+		<div class="wpsg_mandatoryfield_hint">
+			<?php echo wpsg_translate(__('Mit #1# gekennzeichnete Felder sind Pflichtfelder.', 'wpsg'), '<span class="wpsg_required">*</span>'); ?>
+		</div>
+		  
+		<br />
+			 
+		<?php $this->ClearSessionErrors(); ?>
+			 		
+		<input type="submit" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>'; return false;" class="wpsg_button wpsg_basketbutton" value="<?php echo __('zurück zum Warenkorb', 'wpsg'); ?>" name="wpsg_redirect_basket" />
+		<input type="submit" id="wpsg_checkout2button" class="wpsg_button wpsg_checkout2button" value="<?php echo __('weiter', 'wpsg'); ?>" name="wpsg_checkout" />
+		
+		<div class="wpsg_clear"></div>
+	 
+	 	<br />
+	 
+	</form>
+	
+	<script type="text/javascript">/* <![CDATA[ */
+
+		jQuery(document).ready(function() {
+			jQuery('#wpsg_checkout_set_comment').bind('change', function() { 
+				if (jQuery(this).attr('checked') == true || jQuery(this).attr('checked') == "checked") jQuery('#wpsg_checkout_comment').show();
+				else jQuery('#wpsg_checkout_comment').hide();
+			} );
+		} );
+
+	/* ]]> */</script>
+	
+</div>
+\ No newline at end of file
diff --git a/views/warenkorb/checkout2.phtml b/views/warenkorb/checkout2.phtml
new file mode 100644
index 0000000..b80ca62
--- /dev/null
+++ b/views/warenkorb/checkout2.phtml
@@ -0,0 +1,148 @@
+<?php
+	
+	/**
+	 * Template für die Eingabe der Zahlungs- und Versandinformationen
+	 */
+
+	//wpsg_debug($this->view['basket']['checkout']);
+	//die();
+	
+?>
+<div class="wpsg wpsg_checkout2">
+
+	<?php echo $this->writeFrontendMessage(); ?>
+	
+	<?php $GLOBALS['step'] = 3; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+		
+	<form id="wpsg_checkout_form" method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
+
+		<input type="hidden" value="1" name="wpsg[checkout][send]" />
+	
+		<div class="wpsg_shipping"> 
+  
+ 			<h2><?php echo __('Versandarten', 'wpsg'); ?></h2>
+ 			
+ 			<div class="shippay_wrap">
+ 				<?php foreach ($this->view['arShipping'] as $s) { ?>
+ 				<div class="shippay_item_wrap">
+
+					<input <?php echo (($this->view['basket']['checkout']['shipping'] == $s['id'] || sizeof($this->view['arShipping']) == 1)?'checked="checked"':''); ?> type="radio" value="<?php echo $s['id']; ?>" name="wpsg[checkout][shipping]" id="shipping_<?php echo $s['id']; ?>" />
+ 				
+ 					<?php if (wpsg_isSizedString($s['logo'])) { ?>
+					<img class="wpsg_payship_logo" src="<?php echo $s['logo']; ?>" alt="<?php echo $s['name']; ?>" />
+					<?php } else { ?>
+					<div class="wpsg_payship_name"><?php echo __($s['name'], 'wpsg'); ?></div>				
+					<?php } ?> 
+ 					<?php if ((isset($s['hint']) && trim($s['hint']) != '') || $s['price'] > 0) { ?>					
+					<div id="shipping_<?php echo $s['id']; ?>_hint" class="shippay_hint">
+						<?php if ($s['price'] > 0) { ?>
+						<?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($s['price'], $this->get_option('wpsg_currency')); ?><br />
+						<?php } ?>
+						<?php echo $this->replaceUniversalPlatzhalter(__($s['hint'], 'wpsg')); ?>
+					</div>
+					<?php } ?>
+					
+					<div class="shippay_checkmark"></div>
+					
+ 				</div>
+ 				<?php } ?>
+ 			</div>
+		
+		</div>
+						
+		<?php if ($this->callMods('checkout_handlePayment') === true) { ?>
+				
+			<?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>
+			<div class="wpsg_payment">
+			
+				<h2><?php echo __('Zahlungsarten', 'wpsg'); ?></h2>
+				
+				<div class="shippay_wrap">
+ 				<?php foreach ($this->view['arPayment'] as $p) { ?>
+ 				<div class="shippay_item_wrap">
+
+					<input <?php echo (($this->view['basket']['checkout']['payment'] == $p['id'] || sizeof($this->view['arPayment']) == 1)?'checked="checked"':''); ?> type="radio" value="<?php echo $p['id']; ?>" name="wpsg[checkout][payment]" id="payment_<?php echo $p['id']; ?>" />
+ 				
+ 					<div class="wpsg_payship_name"><?php echo __($p['name'], 'wpsg'); ?></div>
+ 				
+ 					<?php if (wpsg_isSizedString($p['logo'])) { ?>
+					<img class="wpsg_payship_logo" src="<?php echo $p['logo']; ?>" alt="<?php echo $p['name']; ?>" />
+					<?php } ?>
+					 
+ 					<?php if ((isset($p['hint']) && trim($p['hint']) != '') || $p['price'] > 0) { ?>					
+					<div id="payment_<?php echo $p['id']; ?>_hint" class="shippay_hint">
+						<?php if ($p['price'] > 0) { ?>
+						<?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($p['price'], $this->get_option('wpsg_currency')); ?><br />
+						<?php } ?>
+						<?php echo $this->replaceUniversalPlatzhalter(__($p['hint'], 'wpsg')); ?>
+					</div>
+					<?php } ?>
+					
+					<div class="shippay_checkmark"></div>
+					
+ 				</div>
+ 				<?php } ?>
+ 			</div>
+			
+			</div>
+			<?php } ?>
+			
+		<?php } ?>
+		
+		<div class="wpsg_clear"></div>
+		
+		<br />
+
+		<?php $this->callMods('checkout2_inner_prebutton', array(&$this->view)); ?>
+		
+		<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zurück', 'wpsg'); ?>" name="wpsg_redirect_checkout" />
+		<input type="submit" id="wpsg_checkout2button" class="wpsg_button wpsg_overviewbutton" value="<?php echo __('weiter', 'wpsg'); ?>" name="wpsg_checkout2" />
+	
+		<div class="wpsg_clear"></div>
+	
+	</form>
+	
+	<script type="text/javascript">/* <![CDATA[ */
+
+		function wpsg_setShipPay(jqElement)
+		{
+
+			jqElement.parents('.shippay_wrap').find('.shippay_item_wrap').removeClass('shippay_active');
+			jqElement.addClass('shippay_active');
+
+			jqElement.find('input').prop('checked', true);
+
+			return true;
+			
+		}
+    
+		jQuery(document).ready(function() {
+
+			jQuery('.shippay_wrap .shippay_item_wrap').bind('click', function() {
+
+				wpsg_setShipPay(jQuery(this)); 
+				
+				jQuery.ajax( {
+					'url': wpsg_ajax.ajaxurl,
+					'method': 'get',
+					'data': {
+						'wpsg[action]': 'updateCheckout',
+						'wpsg_form_data': jQuery('#wpsg_checkout_form').serialize()						
+					},
+					'async': true,
+					'success': function(data) { }
+				} );
+				 
+			} );
+
+			jQuery('.shippay_wrap .shippay_item_wrap').each(function() {
+
+				if (jQuery(this).find('input[type="radio"]').prop('checked')) wpsg_setShipPay(jQuery(this));
+				
+			} );
+			 		 	
+		} );
+			
+	/* ]]> */</script>
+
+</div>
+\ No newline at end of file
diff --git a/views/warenkorb/customerquestion.phtml b/views/warenkorb/customerquestion.phtml
new file mode 100644
index 0000000..595fbdb
--- /dev/null
+++ b/views/warenkorb/customerquestion.phtml
@@ -0,0 +1,91 @@
+<?php 
+
+	/**
+	 * Zeigt die Abfrage nach der EU - Leistungsortregel an
+	 */
+
+?> 
+<form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
+
+	<input type="hidden" name="wpsg[action]" value="customeranswer" />
+	<input type="hidden" name="wpsg[redirect]" value="<?php echo wpsg_hspc($this->view['url']); ?>" />
+
+	<h2><?php echo __('Für eine korrekte Preisberechnung benötigen wir folgende Informationen von Ihnen.', 'wpsg'); ?></h2>
+	
+	<div class="customertype">
+		
+		<h2><?php echo __('Sie sind:', 'wpsg'); ?></h2>
+		
+		<div id="customerquestion_fk">
+			<label >
+				<input id="customerquestion_fk_button" type="radio" value="0" <?php echo ((!isset($_SESSION['wpsg']['checkout']['customertype']) || $_SESSION['wpsg']['checkout']['customertype'] === '0')?'checked="checked"':''); ?> name="wpsg[customertype]">&nbsp;<?php echo __('Firmenkunde', 'wpsg'); ?>
+			</label>
+		</div>
+		<div id="customerquestion_ek">
+			<label >
+				<input id="customerquestion_ek_button" type="radio" value="1" <?php echo ((isset($_SESSION['wpsg']['checkout']['customertype']) && $_SESSION['wpsg']['checkout']['customertype'] === '1')?'checked="checked"':''); ?> name="wpsg[customertype]">&nbsp;<?php echo __('Endkunde', 'wpsg'); ?>
+			</label>
+		</div>
+
+	</div>
+
+	<div class="country">
+		<h2><?php echo __('aus:', 'wpsg'); ?></h2>
+		<select class="wpsg_land" name="wpsg[customerCountry]">
+			<?php foreach ($this->view['arCountry'] as $country) { ?>
+			<option value="<?php echo wpsg_hspc($country->id); ?>" <?php echo (($country->id == $this->view['defaultCountry_id'])?'selected="selected"':''); ?>><?php echo wpsg_hspc($country->name); ?></option>
+			<?php } ?>
+		</select>
+	</div>
+	
+	<div class="button_wrap">
+		<input id="customerquestion_ok_button" type="submit"  name="wpsg_submit" class="wpsg_button" value="<?php echo __('OK', 'wpsg'); ?>" />	
+	</div>
+
+</form>
+
+<div class="wpsg_clear"></div> 
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(window).resize(function() {
+
+		// Hintergrund vom Body übernehmen
+		jQuery('#wpsg_calc_layer .content').css( { 'background-color': jQuery('body').css('background-color') } );
+		 
+		if (jQuery(window).width() < 600)
+		{
+
+			var layer_width = jQuery(window).width() - 50;
+									
+			jQuery('#wpsg_calc_layer .content').css( {
+				'width': layer_width + 'px',
+				'margin-left': (-1 * (layer_width / 2)) + 'px'
+			} );
+
+		}
+
+		var layer_height = jQuery('#wpsg_calc_layer .content').height();
+		
+		if (jQuery(window).height() < layer_height)
+		{
+
+			jQuery('#wpsg_calc_layer .content').css( {
+				'margin-top': '25px;',
+				'top': '0px'				
+			} );
+			
+		}
+		else
+		{
+
+			jQuery('#wpsg_calc_layer .content').css( {
+				'margin-top': (-1 * (layer_height / 2)) + 'px',
+				'top': '50%'
+			} );
+
+		}
+		
+	} ).resize();
+
+/* ]]> */</script>
diff --git a/views/warenkorb/done.phtml b/views/warenkorb/done.phtml
new file mode 100644
index 0000000..78b0f55
--- /dev/null
+++ b/views/warenkorb/done.phtml
@@ -0,0 +1,48 @@
+<?php 
+
+	/**
+	 * Template, welches nach erfolgreicher Bestellung angezeigt wird
+	 */
+
+	/*
+	BestellID: <?php echo $this->view['o_id']; ?>
+	Menge aller Produkte: <?php echo $this->view['menge']; ?>
+	Array mit bestellten Produkten: <?php print_r($this->view['basket']['produkte']); ?>
+	Array mit den MwSt Sätzen: <?php print_r($this->view['basket']['mwst']); ?>
+	Array mit den calculierten Preisen: <?php print_r($this->view['basket']['sum']); ?>
+	Netto Bestellsumme: <?php echo $this->view['basket']['sum']['preis_gesamt_netto']; ?>
+	Brutto Bestellsumme / Rechnungsbetrag: <?php echo $this->view['basket']['sum']['preis_gesamt_brutto']; ?>
+	Gesamtgewicht (wenn aktiviert): <?php echo $this->view['basket']['sum']['weight']; ?>
+	Gesamtsteuer: <?php echo $this->view['basket']['sum']['mwst']; ?>
+	Kosten Versand: <?php echo $this->view['basket']['sum']['preis_shipping']; ?>
+	Kosten Zahlart: <?php echo $this->view['basket']['sum']['preis_payment']; ?>
+	Kundendaten: <?php print_r($this->view['basket']['checkout']); ?>
+	Name des Kunden: <?php echo $this->view['basket']['checkout']['name']; ?>
+	Vorname des Kunden: <?php echo $this->view['basket']['checkout']['vname']; ?>
+	E-Mail des Kunden: <?php echo $this->view['basket']['checkout']['email']; ?>
+	Strasse des Kunden: <?php echo $this->view['basket']['checkout']['strasse']; ?>
+	Ort des Kunden: <?php echo $this->view['basket']['checkout']['ort']; ?>
+	PLZ des Kunden: <?php echo $this->view['basket']['checkout']['plz']; ?>
+	Name der Versandadresse (wenn angegeben): <?php echo $this->view['basket']['checkout']['shipping_name']; ?>
+	Vorname der Versandadresse (wenn angegeben): <?php echo $this->view['basket']['checkout']['shipping_vname']; ?>
+	Straße der Versandadresse (wenn angegeben): <?php echo $this->view['basket']['checkout']['shipping_strasse']; ?>
+	Ort der Versandadresse (wenn angegeben): <?php echo $this->view['basket']['checkout']['shipping_ort']; ?>
+	PLZ der Versandadresse (wenn angegeben): <?php echo $this->view['basket']['checkout']['shipping_plz']; ?>
+	Kundennummer: <?php echo $this->view['customer']['knr']; ?>
+	Bestellnummer: <?php echo $this->view['order']['onr']; ?>
+	Zahlungsart: <?php echo $this->arShipping[$this->view['basket']['checkout']['payment']]['name']; ?>
+	Versandart: <?php echo $this->arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?>
+	*/
+	
+?>
+<div class="wpsg wpsg_done">
+
+	<?php echo $this->writeFrontendMessage(); ?>
+	
+	<p><?php echo __('Vielen Dank für Ihre Bestellung!', 'wpsg'); ?></p>
+	<p><?php $this->callMods('order_done', array(&$this->view['o_id'], &$this->view)); ?></p>
+		
+	<br />
+	<div class="wpsg_clear"></div>
+	
+</div>
+\ No newline at end of file
diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml
new file mode 100644
index 0000000..b03d426
--- /dev/null
+++ b/views/warenkorb/index.phtml
@@ -0,0 +1,118 @@
+<?php
+
+	/**
+	 * Template für das Warenkorb Widget
+	 */
+ 
+?>
+<aside id="wpsg-widget" class="widget wpsg_basket_widget"> 
+	<h2 class="widget-title widgettitle"><?php echo __("Warenkorb", "wpsg"); ?></h2>
+	<br />
+ 
+	<?php if ($this->view['countArtikel'] > 0) { ?> 
+	<?php echo $this->view['countArtikel']; ?> <?php echo __("Artikel für", "wpsg"); ?> <?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?> <?php echo __("im Warenkorb", "wpsg"); ?>
+	<br /><br />
+	<form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
+	
+		<input type="hidden" name="subaction" value="index" />
+	
+		<table>		
+			<?php foreach ($this->view['basket']['produkte'] as $p) { ?>
+			<tr> 
+				<td class="wpsg_cell_name"><a href="<?php echo $this->getProduktLink($p); ?>">
+					<?php 
+					
+						echo $p['menge'].' x '.((strlen($p['name']) > 13)?mb_substr($p['name'], 0, 30).'..':$p['name']);
+						
+					?></a>
+				</td>
+				<td class="wpsg_cell_amount">
+					<?php
+					 
+						echo wpsg_ff(($p['preis'] * $p['menge']), $this->get_option('wpsg_currency'));
+						 
+					?>
+				</td>
+			</tr>
+			<?php } ?>
+			<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
+			<tr>
+				<td class="wpsg_cell_name">
+					<?php echo __('Rabatt', 'wpsg'); ?>	
+				</td>
+				<td class="wpsg_cell_amount">
+					<?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+				</td>
+			</tr>
+			<?php } ?>
+			<?php if (isset($this->view['basket']['gs'])) { // Gutschein vorhanden ?>
+			<tr>
+				<td class="wpsg_cell_name">
+					<?php echo __('Gutschein', 'wpsg'); ?>
+					<?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
+					(<?php echo $this->view['basket']['gs']['value']; ?>%)
+					<?php } ?>
+				</td>
+				<td class="wpsg_cell_amount">
+					<?php 
+						
+						echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+						
+					?>
+				</td>
+			</tr>
+			<?php } ?>
+			<tr class="wpsg_row_summary">
+				<td class="wpsg_cell_name"><?php echo __("Gesamt", "wpsg"); ?>:</td>
+				<td class="wpsg_cell_amount"><?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?></td>
+			</tr>
+		</table>
+	</form>
+	<br />
+		
+	<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
+	<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
+	<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
+	<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
+	<?php } else { ?>
+	<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
+	<?php } ?>
+	<?php if ($this->get_option('wpsg_page_basket') != get_the_ID() || isset($_REQUEST['produkt_id'])) { ?>
+	<input type="button" class="wpsg_button wpshopgermany_linktokasse" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController:: URL_BASKET); ?>';" value="<?php echo __("Zum Warenkorb", "wpsg"); ?>" />
+	<?php } ?>
+	<?php } else { ?>
+	<?php echo __("Keine Artikel im Warenkorb", "wpsg"); ?><br />
+	<?php } ?>
+	
+	<div class="wpsg_clear"></div><br />
+	<?php if ($this->showEULayer) { ?>
+	<?php echo wpsg_translate(
+		__('Für Produkte nach EU Leistungsortregel wird der Steuersatz von #1# angewendet.', 'wpsg'),
+		$this->getFrontendCountry()->name	
+	); ?><br /><br />
+	<a href="#" onclick="return wpsg_customerquestion('<?php echo $this->getCurrentUrl(); ?>');"><?php echo __('Preiseinstellungen ändern', 'wpsg'); ?></a>
+	<?php } ?>
+	
+	<ul>
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_agbpage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_AGB); ?>"><?php echo get_the_title($this->get_option('wpsg_page_agb')); ?></a></li>
+		<?php } ?>
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_wrpage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_WIDERRUF); ?>"><?php echo get_the_title($this->get_option('wpsg_page_widerrufsbelehrung')); ?></a></li>
+		<?php } ?>
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_dspage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_DATENSCHUTZ); ?>"><?php echo get_the_title($this->get_option('wpsg_page_datenschutz')); ?></a></li>
+		<?php } ?>
+		
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_vkpage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo get_the_title($this->get_option('wpsg_page_versand')); ?></a></li>
+		<?php } ?>
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_odrpage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_ONLINE_DISPUTE_RESOLUTION); ?>"><?php echo __('Online Streitbeilegung', 'wpsg'); ?></a></li>
+		<?php } ?>
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_imppage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_IMPRESSUM); ?>"><?php echo get_the_title($this->get_option('wpsg_page_impressum')); ?></a></li>
+		<?php } ?>
+	</ul>
+
+</aside>
+\ No newline at end of file
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
new file mode 100644
index 0000000..3cfb560
--- /dev/null
+++ b/views/warenkorb/overview.phtml
@@ -0,0 +1,307 @@
+<?php
+
+	/**
+	 * Template für die Zusammenfassung der Bestellung
+	 * Anzeige vor dem Abschluß einer Bestellung
+	 */
+
+	//wpsg_debug($this->view['basket']);
+ 
+?>
+<div class="wpsg wpsg_overview">
+
+	<?php echo $this->writeFrontendMessage(); ?>
+
+	<?php $GLOBALS['step'] = 4; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+
+	<form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
+
+		<h2><?php echo __('Zusammenfassung', 'wpsg'); ?></h2>
+		
+		<div class="wpsg_spacer"></div>
+		
+		<?php if (!$this->hasMod('wpsg_mod_ordercondition')) { ?>
+		<div class="wpsg_agb">
+			<label>
+				<input type="checkbox" value="1" name="wpsg[agb]" />
+				<?php echo wpsg_translate(__('Ich habe die #1# des Anbieters gelesen und erkläre mit dem Absenden der Bestellung mein Einverständnis. Die #2# habe ich zur Kenntnis genommen.', 'wpsg'), 
+					'<a target="_blank" href="'.$this->getURL(wpsg_ShopController::URL_AGB).'">'.__('AGB', 'wpsg').'</a>', 
+					'<a target="_blank" href="'.$this->getURL(wpsg_ShopController::URL_WIDERRUF).'">'.__('Widerrufsbelehrung', 'wpsg').'</a>'); 
+				?>
+			</label>
+		</div> 
+		<?php } ?>
+		
+		<?php $this->callMods('overview_top', array(&$this->view['basket'])); ?>
+				
+		<div class="shippayment">
+			<div class="subtitle"><?php echo __('Zahlung/Versand', 'wpsg'); ?>&nbsp;
+				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT2)); ?></span>
+			</div>
+			<div class="payment"><?php echo wpsg_hspc($this->arPayment[$this->view['basket']['checkout']['payment']]['name']); ?></div>
+			<div class="shipping"><?php echo wpsg_hspc($this->arShipping[$this->view['basket']['checkout']['shipping']]['name']); ?></div>
+		</div>
+		
+		<?php if ($this->view['basket']['checkout']['diff_shippingadress'] == '1') { ?>
+		<div class="anschrift">
+			<div class="subtitle"><?php echo __('Rechnungsanschrift', 'wpsg'); ?>&nbsp;
+				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
+			</div>
+			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>			
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
+			<?php } ?>
+			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$this->view['basket']['checkout']['title']:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
+			<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
+			<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
+			<?php } ?>					
+		</div>		
+		<div class="wpsg_clear"></div><br />
+					
+		<div class="anschrift">
+			<div class="subtitle"><?php echo __('Lieferanschrift', 'wpsg'); ?>&nbsp;
+				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
+			</div>
+			<?php if (trim($this->view['basket']['checkout']['shipping_firma']) != '') { ?>			
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_firma']); ?><br />
+			<?php } ?>
+			<?php echo (($this->view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$this->view['basket']['checkout']['shipping_title']:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse']); ?><br />
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_ort']); ?><br />
+			<?php if (wpsg_isSizedArray($this->view['basket']['shipping_land'])) { ?>
+			<?php echo wpsg_hspc($this->view['basket']['shipping_land']['name']); ?>
+			<?php } ?>		
+		</div>		
+		<div class="wpsg_clear"></div><br />
+		
+		<?php } else { ?>
+					
+		<div class="anschrift">
+			<div class="subtitle"><?php echo __('Liefer- und Rechnungsanschrift', 'wpsg'); ?>&nbsp;
+				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
+			</div>
+			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>			
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
+			<?php } ?>
+			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$this->view['basket']['checkout']['title']:''); ?> <?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?><br />
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+			<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
+			<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
+			<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
+			<?php } ?>							
+		</div>		
+		<div class="wpsg_clear"></div><br />
+		<?php } ?>
+		
+		<?php if (wpsg_isSizedString($this->view['basket']['checkout']['ustidnr'])) { ?>
+		<?php echo __('UStIdNr.', 'wpsg'); ?>: <?php echo wpsg_hspc($this->view['basket']['checkout']['ustidnr']); ?><br /><br />
+		<?php } ?>
+	
+		<div class="subtitle">
+			<?php echo __('Bestellte Produkte', 'wpsg'); ?>&nbsp;
+			<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_BASKET)); ?></span>
+		</div>
+		
+		<div class="wpsg_table_wrap">
+			<table class="wpsg_produkte">
+				<tr class="wpsg_kopf">
+					<th class="wpsg_cell_menge"><?php echo __("Anzahl", "wpsg"); ?></th>					
+					<th class="wpsg_cell_preis"><?php echo __('Einzelpreis', 'wpsg'); ?></th>
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+					<th class="wpsg_cell_mwst"><?php echo __("MwSt.", "wpsg"); ?></th>
+					<?php } ?>
+					<th class="wpsg_cell_gesamtpreis"><?php echo __("Gesamtpreis", "wpsg"); ?></th>
+				</tr>
+				<?php $i = 0; foreach ($this->view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?>
+				<?php $strOverviewRow = ''; ob_start(); $this->callMods('overview_row', array(&$p, $i)); $strOverviewRow = ob_get_contents(); ob_end_clean(); ?>
+				<tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+					<td class="wpsg_cell_menge" rowspan="<?php echo 2 + substr_count($strOverviewRow, '<tr'); ?>">
+						<?php echo wpsg_hspc($p['menge']); ?>			
+					</td>					
+					<td class="wpsg_cell_preis"><?php echo wpsg_ff($p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+					<td class="wpsg_cell_mwst"><?php echo wpsg_ff($p['mwst_value']); ?> %</td>				
+					<?php } ?>
+					<td class="wpsg_cell_gesamtpreis"><?php echo wpsg_ff($p['menge'] * $p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
+				</tr>
+				<tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_name">
+						<?php if ($this->get_option('wpsg_mod_produktbilder_overviewimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { 
+							
+							if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']);						
+							else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktID($p['id'])));  
+							
+						?>
+						<div class="wpsg_overview_productimage">
+							<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktID($p['id']), $arBilder[0], 30, 30, 'c')); ?>" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />
+						</div>
+						<?php } ?>
+						<?php if ($this->getProduktLink($p)) { ?>
+						<a href="<?php echo $this->getProduktLink($p); ?>"><?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?></a>
+						<?php } else { ?>
+						<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>
+						<?php } ?>	
+					</td>
+				</tr>
+				<?php echo $strOverviewRow; ?>
+				<?php } ?>
+				<?php  if (isset($this->view['basket']['gs'])) { ?>
+				<tr class="wpsg_row_gutschein"> 
+					<td class="wpsg_cell_menge" rowspan="2">1</td>					
+					<td class="wpsg_cell_preis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+					<td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+					<?php } ?>
+					<td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
+				</tr>
+				<tr class="wpsg_row_gutschein">				
+					<td class="wpsg_cell_name" colspan="<?php echo $this->view['colspan']; ?>"><?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?></td>
+				</tr>
+				<?php } ?>
+				<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
+				<tr class="wpsg_row_discount">
+					<td class="wpsg_cell_menge" rowspan="2"></td>					
+					<td class="wpsg_cell_preis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?></td>					
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+					<td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+					<?php } ?>
+					<td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?></td>
+				</tr>
+				<tr class="wpsg_row_discount">
+					<td class="wpsg_cell_name" colspan="<?php echo $this->view['colspan']; ?>"><?php echo __('Rabatt', 'wpsg'); ?></td>
+				</tr>
+				<?php } ?>
+				<tr class="wpsg_row_summe">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+						<?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
+							<?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+						<?php } else { ?>					
+							<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
+							<?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+							<?php } else { ?>
+							<?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+							<?php } ?>
+						<?php } ?>
+					</td>
+					<td class="wpsg_cell_summe_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+					</td>
+				</tr>	
+				<?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
+				<tr class="wpsg_row_shipping">
+					<td colspan="2" class="wpsg_cell_shipping_label">
+						<?php echo wpsg_translate(__('<a href="#1#">Versandkosten</a> (#2#)', 'wpsg'),
+							$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN),
+							$this->arShipping[$this->view['basket']['checkout']['shipping']]['name']
+						); ?>:								
+					</td>
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>										
+					<td class="wpsg_cell_mwst">
+					<?php if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true) { ?>
+					<?php echo __('anteilig', 'wpsg'); ?>
+					<?php } else { ?>
+					<?php echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'); ?>
+					<?php } ?>
+					</td>					
+					<?php } ?>
+					<td class="wpsg_cell_shipping_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
+					</td>
+				</tr>
+				<?php } ?>
+				<?php if ($this->view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?>
+				<tr class="wpsg_row_payment">
+					<td colspan="2" class="wpsg_cell_payment_label">
+						<?php echo wpsg_translate(__('Zahlungsart (#1#)', 'wpsg'), $this->arPayment[$this->view['basket']['checkout']['payment']]['name']); ?>:
+					</td>
+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+					<td class="wpsg_cell_mwst">
+					<?php if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true) { ?>
+					<?php echo __('anteilig', 'wpsg'); ?>
+					<?php } else { ?>
+					<?php echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%'); ?>
+					<?php } ?>
+					</td>
+					<?php } ?>
+					<td class="wpsg_cell_payment_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
+					</td>
+				</tr>
+				<?php } ?>		
+				
+				<?php if ($this->get_option("wpsg_kleinunternehmer") == "1") { ?>
+				<tr class="wpsg_basket_kleinunternehmer">	
+					<td colspan="<?php echo $this->view['colspan'] + 1; ?>"><?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?></td>
+				</tr>		
+				<tr class="wpsg_row_gesamt">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_gesamt_label">
+						<?php echo __('Gesamtpreis', 'wpsg'); ?>:
+					</td>
+					<td class="wpsg_cell_gesamt_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+					</td>
+				</tr>					
+				<?php } else { ?>		
+				<tr class="wpsg_row_gesamt">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_gesamt_label">
+						<?php echo __('Gesamtpreis (Netto)', 'wpsg'); ?>:
+					</td>
+					<td class="wpsg_cell_gesamt_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+					</td>
+				</tr>	
+				<?php foreach ($this->view['basket']['mwst'] as $mwst_id => $mwst) { ?>
+				<tr class="wpsg_row_mwst">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
+						<?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), $mwst['name']); ?>
+					</td>
+					<td class="wpsg_cell_mwst_value">
+						<?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+					</td>
+				</tr>
+				<?php } ?>	
+				<tr class="wpsg_row_gesamt_brutto wpsg_row_small">
+					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+						<?php echo __('Gesamtpreis (Brutto)', 'wpsg'); ?>:
+					</td>
+					<td class="wpsg_cell_gesamt_value">
+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
+					</td>
+				</tr>
+				<?php } ?>
+				
+				<?php $this->callMods('overview_row_end', array(&$this->view)); ?>
+			
+			</table>
+			
+			<div class="wpsg_versandhinweis"><?php echo __('Sofern die Lieferung in das Nicht-EU-Ausland erfolgt, können weitere Zölle, Steuern oder Gebühren vom Kunden zu zahlen sein, jedoch nicht an den Anbieter, sondern an die dort zuständigen Zoll- bzw. Steuerbehörden. Dem Kunden wird empfohlen, die Einzelheiten vor der Bestellung bei den Zoll- bzw. Steuerbehörden zu erfragen.', 'wpsg'); ?></div>
+		</div>
+		
+		<br />
+		
+		<?php if ($this->view['basket']['checkout']['comment'] != '') { ?>
+			<div class="subtitle">
+				<?php echo __('Bestellkommentar', 'wpsg'); ?>&nbsp;
+				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
+			</div>
+			<div class="wpsg_ordercomment">
+				<?php echo $this->view['basket']['checkout']['comment'] ?>
+			</div>
+		<?php }?>				
+		
+				
+		<?php $this->callMods('overview_inner_prebutton', array(&$this->view)); ?>
+				
+		<div class="wpsg_clear"></div>
+				
+		<br />
+				
+		<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zurück', 'wpsg'); ?>" name="wpsg_redirect_checkout" />
+		<input type="submit" class="wpsg_button wpsg_orderbutton" value="<?php echo __('zahlungspflichtig bestellen', 'wpsg'); ?>" name="wpsg_order" />
+		
+		<div class="wpsg_clear"></div>
+		
+	</form>		
+
+</div>
diff --git a/views/warenkorb/progress.phtml b/views/warenkorb/progress.phtml
new file mode 100644
index 0000000..786527c
--- /dev/null
+++ b/views/warenkorb/progress.phtml
@@ -0,0 +1,60 @@
+
+<div class="wpsg_progress">
+		
+	<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 } ?>
+	<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 } ?>
+	
+	<?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 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 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 } 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 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 } ?>
+
+</div> */ ?>
+	
+\ No newline at end of file
author	Daniel Schmitzer <noreply@maennchen1.de>	2016-01-14 14:55:36 +0000
committer	Daniel Schmitzer <noreply@maennchen1.de>	2016-01-14 14:55:36 +0000
commit	ad405c7045c6e242080ec9d3ce4c9e586b517c4f (patch)
tree	b41905f4d27f3eaaabd5bad3a39f8d3873540b46 /views/warenkorb