- Füllmengenanzeige angeglichen Warenkob/Zusammenfassung/Produkt

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

7 files changed, 42 insertions, 43 deletions

diff --git a/views/mods/mod_fuellmenge/basket_row.phtml b/views/mods/mod_fuellmenge/basket_row.phtml
index cc43694..c200567 100644
--- a/views/mods/mod_fuellmenge/basket_row.phtml
+++ b/views/mods/mod_fuellmenge/basket_row.phtml
@@ -3,31 +3,17 @@
 	/**

 	 * Template für die Anzeige der Füllmenge im Warenkorb

 	 */

-	//wpsg_debug($this->view);

+	 

 ?>

 <div class="product_info">

-	<div 

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

+	

+    <div>

 		

-		<?php /* if (($this->view['data']['fmenge']) > '0') { */ ?>

-		

-			<span class="fa  fa-balance-scale"></span>

-				

-			<span class="label label_fuellmenge"><?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?></span>

-						

-			<?php echo wpsg_translate(__('#1# (#2# / #3#)', 'wpsg'),							

-				'<span class="wpsg_fmenge">'.wpsg_ff($this->view['data']['fmenge'], '', true).'</span> '.$this->view['data']['feinheit'],

-				'<span class="fmenge_preis">'.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).'</span> ',

-				wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])

-			); ?>

-

-			<?php /* ?>

-			

-		<?php  } else { ?>

-				

-			<label><?php echo wpsg_translate(__('', 'wpsg')); ?></label>

-					

-		<?php }  */?>

+        <span class="fa  fa-balance-scale"></span>

+            

+        <?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?>

+        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['feinheit'], 1]); ?>            

+        

 	</div>

-	<br />

+        

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/overview_row.phtml b/views/mods/mod_fuellmenge/overview_row.phtml
index c8490c4..9344f37 100644
--- a/views/mods/mod_fuellmenge/overview_row.phtml
+++ b/views/mods/mod_fuellmenge/overview_row.phtml
@@ -6,11 +6,14 @@
 

 ?>

 <div class="product_info">

-	<div 

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

-		<span class="fa  fa-balance-scale"></span>

-		<?php echo __("Füllmenge", "wpsg"); ?>:

-		<strong><?php echo wpsg_ff($this->view['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?></strong>

-	</div>

-	<br />

+

+    <div>

+

+        <span class="fa  fa-balance-scale"></span>

+

+        <?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?>

+        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['feinheit'], 1]); ?>

+

+    </div>

+

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/priceinfo.phtml b/views/mods/mod_fuellmenge/priceinfo.phtml
index 8531cd6..1fd63f6 100644
--- a/views/mods/mod_fuellmenge/priceinfo.phtml
+++ b/views/mods/mod_fuellmenge/priceinfo.phtml
@@ -4,8 +4,23 @@
 	 * Anzeige der Grundpreisinformationen im Produkttemplate

 	 */

 

-?><div class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(

-	__('(#1# / #2#)', 'wpsg'),

-	wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),

-	wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])

-); ?></div>
\ No newline at end of file
+?>

+

+<?php if ($this->view['wpsg_mod_fuellmenge']['layout'] === 1) { ?>

+

+    <span class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(

+        __('#1# (#2# / #3#)', 'wpsg'),

+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge'], $this->view['wpsg_mod_fuellmenge']['feinheit']),

+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),

+        wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])

+    ); ?></span>

+    

+<?php } else { ?>

+

+    <div class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(

+        __('(#1# / #2#)', 'wpsg'),

+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),

+        wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])

+    ); ?></div>

+

+<?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_produktattribute/basket_row.phtml b/views/mods/mod_produktattribute/basket_row.phtml
index cb8dcfe..3555a79 100644
--- a/views/mods/mod_produktattribute/basket_row.phtml
+++ b/views/mods/mod_produktattribute/basket_row.phtml
@@ -13,7 +13,6 @@
 		<span class="fa fa-ellipsis-v"></span>

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

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

-	</div>

-	<br />

+	</div> 

 </div>

 <?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 f06cad2..0829bf2 100644
--- a/views/mods/mod_produktattribute/overview_row.phtml
+++ b/views/mods/mod_produktattribute/overview_row.phtml
@@ -14,7 +14,5 @@
 		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>:

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

 	</div>

-	<br />

-

 </div>

 <?php }?>
\ No newline at end of file
diff --git a/views/mods/mod_weight/basket_row.phtml b/views/mods/mod_weight/basket_row.phtml
index b2f301b..9038f0b 100644
--- a/views/mods/mod_weight/basket_row.phtml
+++ b/views/mods/mod_weight/basket_row.phtml
@@ -11,6 +11,5 @@
 		<span class="fa  fa-balance-scale"></span>

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

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

-	</div>

-	<br />

+	</div> 

 </div>
\ 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 8eb50ac..a1cd49e 100644
--- a/views/mods/mod_weight/overview_row.phtml
+++ b/views/mods/mod_weight/overview_row.phtml
@@ -11,6 +11,5 @@
 		<span class="fa  fa-balance-scale"></span>

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

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

-	</div>

-	<br />

+	</div> 

 </div>
\ No newline at end of file