Basket und Overview responsible

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

1 files changed, 307 insertions, 205 deletions

diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 972390b..f8036a0 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -6,7 +6,7 @@
 	 */

 

 	//wpsg_debug($this->view['basket']);

- 

+

 ?>

 <div class="wpsg wpsg_overview">

 

@@ -20,23 +20,23 @@
 	<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>'); 

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

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

@@ -44,17 +44,17 @@
 			<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

 			$arAnrede = explode('|', $this->get_option('wpsg_admin_pflicht')['anrede_auswahl']);

 		?>

-		

+

 		<?php if (wpsg_getStr($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 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')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />

@@ -62,15 +62,15 @@
 			<?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>		

+			<?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 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')?$arAnrede[$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 />

@@ -78,12 +78,12 @@
 			<?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>		

+			<?php } ?>

+		</div>

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

-		

+

 		<?php } else { ?>

-					

+

 		<div class="anschrift">

 			<div class="subtitle"><?php echo __('Liefer- und Rechnungsanschrift', 'wpsg'); ?>&nbsp;

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

@@ -92,7 +92,7 @@
 				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>

 				<?php } ?>

 			</div>

-			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>			

+			<?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')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?><br />

@@ -100,210 +100,313 @@
 			<?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>		

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

+

+			<div class="overview_product_row">

+

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

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

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

-							

-						?>

-						<div class="wpsg_overview_productimage">

-							

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

-							

-							<?php

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

-								$img_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'thumbnail'));

-							} else {

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

-							} ?>

-							<?php if ($img_url !== false) { ?>

-							   <img class="theme_border_color_2 theme_color_2" src="<?php echo $img_url; ?>" alt="<?php echo wpsg_translate(__('Produktbilder von Produkte #1#', 'wpsg'), $p['name']); ?>" />

-							<?php } ?>

-							

-							<?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 $strOverviewRow; ?>

+				</div>

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

+

+				<div class="product_content">

+

+					<div class="product_name">

+						<?php if ($this->getProduktLink($product_data)) { ?>

+						<a href="<?php echo $this->getProduktLink($product_data); ?>"><?php echo wpsg_hspc((($product_data['detailname'] != '')?$product_data['detailname']:$product_data['name'])); ?></a>

+						<?php } else { ?>

+						<?php echo wpsg_hspc((($product_data['detailname'] != '')?$product_data['detailname']:$product_data['name'])); ?>

+						<?php } ?>

+

+						<?php if (wpsg_isSizedString($product_data['shortdesc'])) { ?>

+						<div class="product_shortdesc"><?php echo $product_data['shortdesc']; ?></div>

+						<?php } ?>

+

+					</div>

+

+					<div class="product_action">

+						<div class="title">

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

+						</div>

+						<div class="amount">

+							<?php echo wpsg_hspc($product_data['menge']); ?>

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

-					<td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>

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

-					<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 $strOverviewRow= ''; ob_start(); $this->callMods('overview_row', array(&$product_data, $i)); $strOverviewRow= ob_get_contents(); ob_end_clean(); ?>

+					<?php echo $strOverviewRow; ?>

+

+				</div>

+

+			</div>

+			<?php }   // foreach products ?>

+

+		<div class="overview_sum_wrap">

+

+			<?php $bLine = false; ?>

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

+				<div class="overview_sum_row">

+					<div class="titlegs">

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

+					</div>

+				</div>

+				<div class="overview_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 if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>

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

+

+			<div class="overview_sum_row">

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

+					<div class="title">

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

+					</div>

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

-					<td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>

+						<div class="value">

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

+						</div>

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

+						<div class="value">

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

+						</div>

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

+			</div>

+

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

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

+			<?php } ?>

+

+			<div class="overview_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 } else { ?>

+						<?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:

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

+				</div>

+				<div class="value">

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

+				</div>

+			</div>

+

+			<?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>

+			<div class="overview_sum_row">

+				<div class="title">

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

+						); ?>:

+

+				</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')); ?>

+				</div>

+			</div>

+			<?php } ?>

+

+			<?php /* Zeile für Zahlungsart BEGIN */ ?>

+			<?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>

+				<div class="overview_sum_row">

+					<div class="title">

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

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

+

+							}

+

+						} ?>

+					</div>

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

+					</div>

+				</div>

+			<?php } ?>

+			<?php /* Zeile für Zahlungsart ENDE */ ?>

+

+			<?php if (get_option("wpsg_kleinunternehmer") == "1") { ?>

+				<div class="overview_sum_row">

+					<div class="title2">

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

+					</div>

+					<div class="value">

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

+					</div>

+				</div>

+

+				<div class="overview_sum_row">

+					<div class="title2">

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

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

+					<div class="title2">

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

+					</div>

+					<div class="sum">

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

+					</div>

+				</div>

+

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

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

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

+				<div class="overview_sum_row">

+					<div class="title2">

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

-					</td>

-					<td class="wpsg_cell_gesamt_value">

+					</div>

+					<div class="sum">

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

+				</div>

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

+			<?php } ?>

+

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

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

+

+			<br />

+

+		</div>

+

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

@@ -312,20 +415,19 @@
 			<div class="wpsg_ordercomment">

 				<?php echo $this->view['basket']['checkout']['comment'] ?>

 			</div>

-		<?php }?>				

-		

-				

+		<?php }?>

+

+

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

-				

+

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

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

-		

+

+		<input type="submit" class="wpsg_checkoutbutton" value="<?php echo __('zurück', 'wpsg'); ?>" name="wpsg_redirect_checkout" />

+		<input type="submit" class="wpsg_orderbutton" value="<?php echo __('zahlungspflichtig bestellen', 'wpsg'); ?>" name="wpsg_order" />

+

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

-		

-	</form>		

+

+	</form>

 

 </div>