Basket und Overview responsible

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

8 files changed, 114 insertions, 48 deletions

diff --git a/views/mods/mod_abo/overview_row.phtml b/views/mods/mod_abo/overview_row.phtml
index fb7bbf5..75b57fe 100644
--- a/views/mods/mod_abo/overview_row.phtml
+++ b/views/mods/mod_abo/overview_row.phtml
@@ -1,13 +1,20 @@
 <?php

 

 	/**

-	 * Template für die Anzeige der Abo-Verlängerung im Warenkorb

+	 * Template für die Anzeige der Abo-Verlängerung im Overview

 	 */

 

 ?>

-<tr class="wpsg_<?php echo (($this->view['i'] == 0)?'odd':'even'); ?>">

-	<td><?php echo __('Abo Verlängerung', 'wpsg'); ?>:</td>

-	<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">

-		<?php echo wpsg_translate(__('Verlängerung zu Bestellung #1# (#2# Tage)', 'wpsg'), $this->view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?>

-	</td>

-</tr>
\ No newline at end of file
+<div class="product_info">

+	<div 

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

+		<?php echo __("Abo Verlängerung", "wpsg"); ?>

+	</div>

+	<div class="valuel">

+		<?php echo wpsg_translate(__('Verlängerung zu Bestellung #1# (#2# Tage)', 'wpsg'), $this->view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?>	

+	</div>

+	<div class="dummyr">

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

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/mods/mod_basketteaser/basket_row.phtml b/views/mods/mod_basketteaser/basket_row.phtml
index bea76f3..7d8b0ea 100644
--- a/views/mods/mod_basketteaser/basket_row.phtml
+++ b/views/mods/mod_basketteaser/basket_row.phtml
@@ -22,11 +22,11 @@
 		<?php } ?>

     </div>

     <div class="valuer">

-		<input name="wpsg_mod_basketteaser_row[<?php echo $this->view['data']['id']; ?>]" type="text" size="3" value="1" />

+		<input name="wpsg_mod_basketteaser_row[<?php echo $this->view['data']['id']; ?>]" type="text" size="3" value="0" />

     </div>

     <div class="valuer">

 		<a href="#" onclick="return wpsg_mod_basketteaser_add(<?php echo $this->view['data']['id']; ?>);"><?php echo __('Hinzufügen', 'wpsg'); ?></a>

     </div>

-    

+

 </div>

 <br />
\ No newline at end of file
diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml
index fe27e24..87ccdc9 100644
--- a/views/mods/mod_deliverytime/overview_row.phtml
+++ b/views/mods/mod_deliverytime/overview_row.phtml
@@ -5,26 +5,31 @@
 	 */

 

 ?>

-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">

-	<td><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>

-	<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>" class="wpsg_cell_deliverytime_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">

+<div class="product_info">

+	<div 

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

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

+	</div>

+	<div class="valuel">

 		<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>

-		 	<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>

+			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>

 		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>

-		  	<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>

+				<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>

 		<?php } else { /* Sonst sofort lieferbar */ ?>

 		 	<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>

 		<?php } ?>

-	</td>	

-</tr>

-

+	</div>

+	<div class="dummyr">

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

+	</div>

+	

+</div>

 <?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>

 <?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>

-	<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">	

-		<td colspan="3">

-			<div class="wpsg_mod_deliverytime_delay">

-				<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>

-			</div>

-		</td>

-	</tr>

+<div class="product_info">

+	<div class="fulll">

+		<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>

+

+	</div>

+</div>

 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_productvariants/overview_row.phtml b/views/mods/mod_productvariants/overview_row.phtml
new file mode 100644
index 0000000..1ca7e07
--- /dev/null
+++ b/views/mods/mod_productvariants/overview_row.phtml
@@ -0,0 +1,30 @@
+ <?php

+

+	/**

+	 * Render ein Variantenprodukt in der Bestellübersicht (basket.phtml)

+	 */

+

+?>

+<?php //wpsg_debug($this->view['variante']) ?>

+<div class="product_info">

+	<div 

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

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

+	</div>

+	<div class="valuel">

+		<?php if (get_option('wpsg_vp_detailview') == 1) { ?>

+		<?php foreach ($this->view['variante'] as $vari => $value) { ?>

+		<?php if (is_numeric($vari)) { ?>

+		<?php echo $value['name'] ?>: <?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; <?php echo $value['preis'] ?> <?php echo $this->get_option('wpsg_currency') ?>

+		<br />

+		<?php } ?>

+		<?php } ?>							

+		<?php } else { ?>

+		<?php echo $this->view['variante']['key']; ?>

+		<?php } ?>

+	</div>

+	<div class="dummyr">

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

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/mods/mod_productvars/overview_row.phtml b/views/mods/mod_productvars/overview_row.phtml
index b3cd82a..7499b5a 100644
--- a/views/mods/mod_productvars/overview_row.phtml
+++ b/views/mods/mod_productvars/overview_row.phtml
@@ -6,11 +6,15 @@
 

 ?>

 <?php if (is_array($this->view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?>

+

 <?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>

-<tr class="wpsg_<?php echo (($this->view['wpsg_mod_productvars']['i'] == 0)?'odd':'even'); ?>">

-	<td><?php echo __($pv['name'], 'wpsg'); ?>:</td>

-	<td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>">

-		<?php if ($pv['typ'] == '1') { // Auswahl ?>

+<div class="product_info">

+	<div 

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

+		<?php echo __($pv['name'], 'wpsg'); ?><?php if ($pv['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>

+	</div>

+	<div class="valuel">

+		<?php if ($pv['typ'] == '1') { // Auswahlfeld ?>		

 			<?php if ($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == 'not_set') { ?>

 			<?php echo __('Nicht angegeben', 'wpsg'); ?>

 			<?php } else { ?>

@@ -25,7 +29,11 @@
 			<?php echo __('Nein', 'wpsg'); ?>

 			<?php } ?>

 		<?php } ?>

-	</td>

-</tr>

+	</div>

+	<div class="dummyr">

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

+	</div>

+	

+</div>

 <?php } ?>

 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_produktattribute/overview_row.phtml b/views/mods/mod_produktattribute/overview_row.phtml
index 2059efb..13389a0 100644
--- a/views/mods/mod_produktattribute/overview_row.phtml
+++ b/views/mods/mod_produktattribute/overview_row.phtml
@@ -7,11 +7,17 @@
 ?>

 

 <?php foreach ((array)$this->view['wpsg_mod_produktattribute']['data'] as $pa_id) { ?>

-					

-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">	

-	<td colspan="1"><?php echo __('Attribut', 'wpsg'); ?>:</td>

-	<td class="wpsg_cell_produktattribute_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>">

+<div class="product_info">

+	<div 

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

+		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>

+	</div>

+	<div class="valuel">

 		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?>

-	</td>

-</tr>

+	</div>

+	<div class="dummyr">

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

+	</div>

+	

+</div>

 <?php }?>
\ No newline at end of file
diff --git a/views/mods/mod_weight/overview_row.phtml b/views/mods/mod_weight/overview_row.phtml
index 921f387..92dc032 100644
--- a/views/mods/mod_weight/overview_row.phtml
+++ b/views/mods/mod_weight/overview_row.phtml
@@ -5,9 +5,16 @@
 	 */

 

 ?>

-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">

-	<td ><?php echo __('Gewicht', 'wpsg'); ?>:</td>

-	<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>" class="wpsg_cell_weight_value">

-		<?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>

-	</td>

-</tr>
\ No newline at end of file
+<div class="product_info">

+	<div 

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

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

+	</div>

+	<div class="valuer">

+		<?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>	

+	</div>

+	<div class="dummyr">

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

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/mods/mod_weight/overview_row_end.phtml b/views/mods/mod_weight/overview_row_end.phtml
index 12da77e..de38b35 100644
--- a/views/mods/mod_weight/overview_row_end.phtml
+++ b/views/mods/mod_weight/overview_row_end.phtml
@@ -5,11 +5,14 @@
 	 */

 

 ?>

-<tr class="wpsg_row_weight wpsg_row_small">

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

+<div class="overview_sum_row">

+	<div class="title">

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

-	</td>

-	<td class="wpsg_cell_weight_value">

+	</div>

+	<div class="value">

 		<?php echo wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>

-	</td>

-</tr>
\ No newline at end of file
+	</div>

+    <div class="value">

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

+    </div>

+</div>
\ No newline at end of file