From 499dd1ca9b7b433de86d5d181a124a10e25a60ab Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 26 Feb 2020 12:56:07 +0000
Subject: - Bugfix: Füllmengenpreisanzeige in Produktübersichten korrigiert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7680 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_productindex/css/productindex.css |  4 +++-
 views/mods/mod_productindex/layouts/grid.phtml   | 22 +++++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_productindex/css/productindex.css b/views/mods/mod_productindex/css/productindex.css
index 6262150..137b64d 100644
--- a/views/mods/mod_productindex/css/productindex.css
+++ b/views/mods/mod_productindex/css/productindex.css
@@ -34,4 +34,6 @@
 .wpsg_mod_productindex_grid .wpsg_mod_productindex_product .wpsg_mod_productindex_content .wpsg_mod_productindex_price { font-size:1.4em; font-weight:normal; color:#000000; }
 .wpsg_mod_productindex_grid .wpsg_mod_productindex_product .wpsg_mod_productindex_content .wpsg_produkt_preishinweis { font-size:0.8em; font-weight:normal; font-style:italic; }
 .wpsg_mod_productindex_grid .wpsg_produkt_soldout { color:#FF0000; }
-.wpsg_mod_productindex_kuhint { font-size:1em; line-height:125%; margin-top:20px; font-style:italic; }
\ No newline at end of file
+.wpsg_mod_productindex_kuhint { font-size:1em; line-height:125%; margin-top:20px; font-style:italic; }
+
+.wpsg_mod_productindex .wpsg_mod_fuellmenge_info { font-size:0.75em; }
\ No newline at end of file
diff --git a/views/mods/mod_productindex/layouts/grid.phtml b/views/mods/mod_productindex/layouts/grid.phtml
index 427b532..79b309e 100644
--- a/views/mods/mod_productindex/layouts/grid.phtml
+++ b/views/mods/mod_productindex/layouts/grid.phtml
@@ -110,21 +110,7 @@
 									<?php } ?>
 								<?php } ?>
 							</div>
-
-							<div class="wpsg_mod_productindex_fmenge">
-								<?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge') == '1') { ?>
-									<?php if (($p['fmenge']) > '0') { ?>
-										<?php echo wpsg_translate(__('Füllmenge: #1#', 'wpsg'), wpsg_ff($p['fmenge'], $p['feinheit'])); ?>
-										<br />
-										<?php if ($this->get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis') == '1') { ?>
-											<?php echo wpsg_translate(__('Grundpreis: #1# / #2#', 'wpsg'),
-												wpsg_ff($p['fmenge_preis'], $this->get_option('wpsg_currency')),
-												wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $p['feinheit'])
-											); ?>
-										<?php } ?>
-									<?php } ?>
-								<?php } ?>
-							</div>						
+							
 						</div>
 
 						<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProductindex') == '1') { ?>
@@ -172,6 +158,12 @@
 								<?php echo wpsg_translate(__('Preise nur für eingeloggte Benutzer', 'wpsg')); ?>
 						<?php } /* Abfrage Preisanzeige nur für eingeloggte Benutzer ENDE */?>
 
+						<div class="wpsg_mod_productindex_fmenge">
+							<?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge') == '1') { ?>
+								<?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$oProduct->getPrice($p['product_key']), $p['fmenge'], $oProduct->getId()]); ?>
+							<?php } ?>
+						</div>
+						
 						<div class="wpsg_mod_productindex_button">
 
 							<?php //if ($this->hasMod('wpsg_mod_stock') && $this->callMod('wpsg_mod_stock', 'checkBestand', array($this->getProduktID($p['id']), 1)) === false) { ?>
-- 
cgit v1.2.3