From 3a473b03b94a5bb35bc81a8aeb52aababcb7588c Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Mon, 4 Mar 2019 14:18:10 +0000
Subject: - Korrekturen Berechnung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7322 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_rechnungen/invoice_pdf.phtml | 2 +-
 views/produkttemplates/standard.phtml       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index 1e02423..64b3427 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -105,7 +105,7 @@
 			$pdf->SetFont('Arial', '', 12);
 			$pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']);
 			$pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']);
-			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr']));
+			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['nr']));
 			$pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']);
 			if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0')
 				$pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName()));
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index c1f9e1e..c47d531 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -88,11 +88,11 @@
 				<?php echo __('Stückpreis:', 'wpsg'); ?>
 
 				<?php $oldPrice = $this->view['oProduct']->getOldPrice();  ?>
-				<?php if ($oldPrice !== false && $oldPrice != $this->view['oProduct']->getPrice()) { ?>
-					<span class="wpsg_mod_productview_price wpsg_mod_productview_current"><?php echo wpsg_ff($this->view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?></span>
+				<?php if ($oldPrice !== false && $oldPrice != $this->view['oProduct']->getPrice($this->view['data']['product_key'])) { ?>
+					<span class="wpsg_mod_productview_price wpsg_mod_productview_current"><?php echo wpsg_ff($this->view['oProduct']->getPrice($this->view['data']['product_key']), $this->get_option('wpsg_currency')); ?></span>
 					<span class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></span>
 				<?php } else { ?>
-					<span class="wpsg_mod_productview_price"><?php echo wpsg_ff($this->view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?></span>
+					<span class="wpsg_mod_productview_price"><?php echo wpsg_ff($this->view['oProduct']->getPrice($this->view['data']['product_key']), $this->get_option('wpsg_currency')); ?></span>
 				<?php } ?>
 
 			</div>
-- 
cgit v1.2.3