Basket responsive

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6330 0d5edaf7-2b12-4e95-93f4-047927463d4b

1 files changed, 264 insertions, 233 deletions

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 3fecba6..7a3bfca 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -23,11 +23,11 @@
 	<?php if (sizeof($this->view['basket']['produkte']) > 0) { ?>

 

 	<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>

-	<?php } else {?> 

+	<?php } else {?>

 		<?php $GLOBALS['step'] = 1; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>

-	<?php } ?> 

+	<?php } ?>

 

-	<?php if (!isset($this->view['noFormTag'])) { ?>	

+	<?php if (!isset($this->view['noFormTag'])) { ?>

 	<form id="wpsg_basket_form" name="wpsg_basket_form"  method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>">

 	<?php } ?>

 	

@@ -37,18 +37,44 @@
 		

 		<div class="basket_product_wrap">

 		

-			<?php foreach ($this->view['basket']['produkte'] as $k => $product_data) { ?>

+			<?php $i = 0; foreach ($this->view['basket']['produkte'] as $k => $product_data) { $i ++; ?>		

+

 			<div class="basket_product_row">

 			

-				<?php $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_data['product_id'])); if (!wpsg_isSizedArray($arImages)) $arImages = array(); ?>

-				<?php if (wpsg_isSizedArray($arImages)) { ?>

+				<?php $this->view['$bPicture'] = false; ?>

+

+				<?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { 

+					

+					if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']);						

+					else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); 

+					

+				?>

 				<div class="productimage">

+					<?php if (wpsg_isSizedString($arImages[0]['guid'])) { ?>

 					

-					<?php echo wp_get_attachment_image($arImages[0]['post_id'], array(300, 300), false, array()); ?>

+					<?php

+					if (isset($product_data['product_key'])) {

+						$arr = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($product_data['product_key']));

+						if (wpsg_isSizedArray($arr))

+						{

+							$ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail');

+							$url = $ais[0];

+						}

+						else

+						{

+							$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail'));

+						}

+					} else {

+						$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail'));

+					}

+					if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true;

+					echo "<img src=".$url." alt='' />";

+					?>

 					

+					<?php } ?>

 				</div>

 				<?php } ?>

-				

+

 				<div class="product_content">

 					

 					<div class="product_name">

@@ -62,162 +88,144 @@
 						<div class="product_shortdesc"><?php echo $product_data['shortdesc']; ?></div>

 						<?php } ?>

 						

+						<a class="wpsg_basket_removelink" href="<?php echo $this->getRemoveLinkURL($product_data['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>

+						

 					</div>

 					

 					<div class="product_action">

+						<div class="title">

+							<?php echo __("Menge", "wpsg"); ?>

+						</div>

 						<div class="amount">

 							

 							<input class="wpsg_form_submit_return" type="text" name="wpsg[menge][<?php echo $product_data['product_index']; ?>]" <?php echo ((wpsg_isTrue($product_data['oneOnly']) || wpsg_isSizedInt($product_data['basket_multiple'], 4))?'readonly="readonly"':''); ?> value="<?php echo wpsg_hspc($product_data['menge']); ?>" size="3" />

 							

 						</div>

+					</div>

+					<div class="product_action">

+						<div class="title">

+							<?php echo __("Einzelpreis", "wpsg"); ?>

+						</div>

 						<div class="price">

 							<?php echo wpsg_ff($product_data['preis'], $this->get_option('wpsg_currency')); ?>

 						</div>

+					</div>

+					<div class="product_action">

+						<div class="title">

+							<?php echo __("Gesamtpreis", "wpsg"); ?>

+						</div>

 						<div class="price_total">

 							<?php echo wpsg_ff($product_data['menge'] * $product_data['preis'], $this->get_option('wpsg_currency')); ?>

 						</div>

 					</div>

 					

+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>

+					<div class="product_info">

+						<div 

+						<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+							<?php echo __("MwSt.", "wpsg"); ?>

+						</div>

+						<div class="valuer">

+							<?php echo wpsg_ff($product_data['mwst_value'], ' %'); ?>

+						</div>

+						<div class="dummyr">

+							<?php echo __('&nbsp;'); ?>

+						</div>

+						

+					</div>

+					<?php } ?>

+

+					<?php $strBasketRow = ''; ob_start(); $this->callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>	

+					<?php echo $strBasketRow; ?>

+					

 				</div>

 				

 			</div>

-			<?php } ?>

+			<?php }   // foreach products ?>

+			

 		</div>

 		

+		<div class="basket_sum_wrap">

 		

-		<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_MT', array($this->getProduktID($p['id']))); 

-						

-					?>

-					<div class="wpsg_basket_productimage">

-						<?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>

-						

-						<?php

-						if (isset($p['product_key'])) {

-							//$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium'));

-							$arr = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($p['product_key']));

-							$ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail');

-							$url = $ais[0];

-						} else {

-							$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['productkey'], 'medium'));

-						}

-						echo "<img src=".$url." alt='' />";

-						?>

-						

+			<?php $this->callMods('basket_row_afterproducts', array(&$p, $i)); ?>

+			

+			<?php $bLine = false; ?>

+			<?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>

+				<div class="basket_sum_row">

+					<div class="titlegs">

+						<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>

+					</div>

+					<div class="wpsg_basket_removelink">

+						<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>

+					</div>

+				</div>

+				<div class="basket_sum_row">

+					<div class="delgs">&nbsp;</div>

+					<div class="colgsl">1</div>

+					<div class="colgsl">

+						<?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 } ?>

 					</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>

+				<div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>

+				<?php } ?>

+				<div class="colgsr"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></div>

+			</div>

 			<?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>			

+		

+			<div class="basket_sum_row">

+				<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>

+					<div class="title">

+						<?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:

+					</div>

+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>

+						<div class="value">

+							<?php echo __('anteilig', 'wpsg'); ?>

+						</div>

+					<?php } ?>

+						<div class="value">

+							<?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>

+						</div>

+				<?php } ?>

+			</div>

+

+			<?php if ($bLine == true) { ?>

+				<div class="wpsg_spacer"></div>

 			<?php } ?>

-			<tr class="wpsg_row_summe">

-				<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">

+

+			<div class="basket_sum_row">

+				<div class="title2">

 					<?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 echo wpsg_translate(__('Summe (zzgl. #1#)', '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 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 } ?>

-					<?php } ?>					

-				</td>

-				<td class="wpsg_cell_summe_value">

+				</div>

+				<div class="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">

+				</div>

+			</div>

+			

+			<div class="basket_sum_row">

+				<div class="title">

 					<?php echo wpsg_translate(__('<a href="#1#">Versandkosten</a>:', 'wpsg'),

 						$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN)

 					); ?>

-					<?php if (sizeof($this->arShipping) > 1) { ?>		 							

+					<?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) { ?>						

+						<?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>

@@ -231,124 +239,144 @@
 						<?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>	

+					</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">

+				</div>

+				<div class="value">

+					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {

+						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'], '%');

+						

+						}

+				 	}

+					?>

+				</div>

+				<div class="value">

 					<?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?> 

-				</td>

-			</tr>

+				</div>

+			</div>

 			

 			<?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>

+				<div class="basket_sum_row">

+					<div class="title">

+						<?php echo __('Zahlungsart:', 'wpsg').'&nbsp;&nbsp;&nbsp;&nbsp;'; ?>

+						<?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 if (!wpsg_isSizedArray($this->arPayment) || !array_key_exists($this->view['basket']['checkout']['payment'], $this->arPayment)) { ?>

+						<span><?php echo __('Keine Zahlungsart möglich / Bitte manuell anfragen', 'wpsg'); ?></span>

+						<?php } else { ?>

+						<span><?php echo $this->arPayment[$this->view['basket']['checkout']['payment']]['name']; ?></span>

 						<?php } ?>

-					</select>

-					<?php } else if (!wpsg_isSizedArray($this->arPayment) || !array_key_exists($this->view['basket']['checkout']['payment'], $this->arPayment)) { ?>

-					<span><?php echo __('Keine Zahlungsart möglich / Bitte manuell anfragen', 'wpsg'); ?></span>

-					<?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'], '%');

+					</div>

+					<div class="value">

+						<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {

+					 

+							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>

+						} ?>

+					</div>

+					<div class="value">

+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>

+					</div>

+				</div>

 			<?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">

+				<div class="basket_sum_row">

+					<div class="title2">

+						<?php echo get_option('wpsg_kleinunternehmer_text'); ?>

+					</div>

+					<div class="value">

+						<?php echo __('&nbsp;'); ?>

+					</div>

+				</div>

+

+				<div class="basket_sum_row">

+					<div class="title2">

+						<?php echo __('Gesamtpreis', 'wpsg'); ?>:

+					</div>

+					<div class="sum">

+						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>

+					</div>

+				</div>

+			<?php } else { ?>

+

+				<div class="basket_sum_row">

+					<div class="title2">

 						<?php echo __('Gesamtpreis (Netto)', 'wpsg'); ?>:

-					</td>

-					<td class="wpsg_cell_gesamtsumme_value">

+					</div>

+					<div class="sum">

 						<?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>					 				

+					</div>

+				</div>

+

+				<?php foreach ($this->view['basket']['mwst'] as $mwst) { ?>

+					<div class="basket_sum_row">

+						<div class="title2">

+							<?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), __($mwst['name'], 'wpsg')); ?>:										

+						</div>

+						<div class="value">

+							<?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>

+						</div>

+					</div>

 				<?php } ?>

-				<tr class="wpsg_basket_gesamt wpsg_row_small">

-					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">

+				<div class="wpsg_spacer"></div>

+				<div class="basket_sum_row">

+					<div class="title2">

 						<?php echo __('Gesamtpreis (Brutto)', 'wpsg'); ?>:

-					</td>

-					<td class="wpsg_cell_gesamtsumme_value">

+					</div>

+					<div class="sum">

 						<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>

-					</td>

-				</tr> 					

+					</div>

+				</div>

+				<div class="wpsg_spacer"></div>

 			<?php } ?>

+			

 			<?php $this->callMods('basket_row_end', array(&$this->view)); ?>

-		</table>

-			   

-		<?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>

-				

-		<br /> 

+			

+			<br />

+			<div class="wpsg_spacer"></div>

+

+				<div class="basket_sum_row">

+					<div class="title2">

+

+					</div>

+					<div class="value">

+						<?php echo __('&nbsp;', 'wpsg'); ?>

+					</div>

+				</div>

+

+			<?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>

+			

+		</div>

 		

 		<input type="hidden" name="wpsg_basket_submit" value="1" />

 		

@@ -360,17 +388,20 @@
 			<br /><br />

 			

 			<a href="<?php echo WPSG_URL_WP;?>" class="wpsg_basket_weiter_shoppen"><?php echo __('weiter shoppen', 'wpsg'); ?></a>

-		<?php } ?>	

+		<?php } ?>

 		<div class="wpsg_clear"></div>

-			

-		<?php $this->ClearSessionErrors(); ?>

 		

-	<?php if (!isset($this->view['noFormTag'])) { ?>	

-	</form>

+		<?php $this->ClearSessionErrors(); ?>

+

+	<?php if (!isset($this->view['noFormTag'])) { ?>

+		</form>

 	<?php } ?>

 	

+	<br />

 	<?php $this->callMods('basket_after', array(&$this->view)); ?>

-	 	

+	

+	<br />

+

 	<?php } else { ?>

 	<p><?php echo __('Keine Produkte im Warenkorb.', 'wpsg'); ?></p>

 	<?php } ?>