Basket und Overview responsible

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

1 files changed, 12 insertions, 14 deletions

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index a59e6ee..3320550 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -37,16 +37,16 @@
 		

 		<div class="basket_product_wrap">

 		

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

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

 

 			<div class="basket_product_row">

 			

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

 

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

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

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

@@ -70,7 +70,6 @@
 					if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true;

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

 					?>

-					

 					<?php } ?>

 				</div>

 				<?php } ?>

@@ -137,13 +136,12 @@
 					</div>

 					<?php } ?>

 

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

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

 					<?php echo $strBasketRow; ?>

 					

 				</div>

 				

 			</div>

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

 			

 			<?php }   // foreach products ?>

 			

@@ -161,7 +159,7 @@
 					</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'); ?>" />					

+							<img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />

 						</a>

 					</div>

 				</div>

@@ -208,7 +206,7 @@
 						<?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#, 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 } ?>

@@ -252,7 +250,7 @@
 						{

 						

 							echo __('anteilig', 'wpsg');

-												

+						

 						}

 						else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))

 						{

@@ -264,7 +262,7 @@
 					?>

 				</div>

 				<div class="value">

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

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

 				</div>

 			</div>

 			

@@ -274,8 +272,8 @@
 					<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>		

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

@@ -343,7 +341,7 @@
 				<?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')); ?>:										

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