From bae985765dcdb0faa9cae493ad8d6d43bd9347bd Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Tue, 18 Sep 2018 13:25:28 +0000
Subject: - Erweiterung isInnerEU()

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7153 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverynote/deliverynote_pdf.phtml | 16 ++++++++++++----
 views/mods/mod_rechnungen/accounting_pdf.phtml     | 17 ++++++++++++-----
 views/mods/mod_rechnungen/invoice_pdf.phtml        | 11 +++++++++--
 3 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 379db1d..c6f763b 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -108,12 +108,20 @@
 			
 			if ($shop->view['oOrder']->isInnerEu())
 			{
-					
-				$pdf->SetFont('Arial', '', 9);
-				$pdf->Text($adress_left, $dndata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg"));
-			
+
+            	$pdf->SetFont('Arial', '', 9);
+                $pdf->Text($adress_left, $rdata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg"));
+
+            } else if (!$shop->view['oOrder']->isInnerEu() && $shop->view['oOrder']->getShippingCountryID() != $shop->getDefaultCountry(true)) {
+
+			// Nicht InnerEU und Nicht Inland
+
+             	$pdf->SetFont('Arial', '', 9);
+                $pdf->Text($adress_left, $rdata_top + 11.5, __("Steuerfreie Ausfuhrlieferung.", "wpsg"));
+
 			}
 			
+			
 			// Benutzerdefinierte Felder
 			$arTexte = $shop->callMod('wpsg_mod_deliverynote', 'getTexte', array($shop->view['data']['id'])); 
 			
diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml
index 8a3c612..b62c6ca 100644
--- a/views/mods/mod_rechnungen/accounting_pdf.phtml
+++ b/views/mods/mod_rechnungen/accounting_pdf.phtml
@@ -124,12 +124,19 @@
 					
 			if ($shop->view['oOrder']->isInnerEu())
 			{
-				 
-				$pdf->SetFont('Arial', '', 9);		
-				$pdf->Text($adress_left, $rdata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg"));
-				
+
+            	$pdf->SetFont('Arial', '', 9);
+                $pdf->Text($adress_left, $rdata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg"));
+
+            } else if (!$shop->view['oOrder']->isInnerEu() && $shop->view['oOrder']->getShippingCountryID() != $shop->getDefaultCountry(true)) {
+
+			// Nicht InnerEU und Nicht Inland
+
+             	$pdf->SetFont('Arial', '', 9);
+                $pdf->Text($adress_left, $rdata_top + 11.5, __("Steuerfreie Ausfuhrlieferung.", "wpsg"));
+
 			}
-			
+					
 			// Benutzerdefinierte Felder
 			$arTexte = $shop->callMod('wpsg_mod_rechnungen', 'getRechnungstexte', array($shop->view['data']['id']));
 			
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index 713b189..7693954 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -145,8 +145,15 @@
 			if ($shop->view['oOrder']->isInnerEu())
 			{
 
-				$pdf->SetFont('Arial', '', 9);
-				$pdf->Text($adress_left, $rdata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg"));
+            	$pdf->SetFont('Arial', '', 9);
+                $pdf->Text($adress_left, $rdata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg"));
+
+            } else if (!$shop->view['oOrder']->isInnerEu() && $shop->view['oOrder']->getShippingCountryID() != $shop->getDefaultCountry(true)) {
+
+			// Nicht InnerEU und Nicht Inland
+
+             	$pdf->SetFont('Arial', '', 9);
+                $pdf->Text($adress_left, $rdata_top + 11.5, __("Steuerfreie Ausfuhrlieferung.", "wpsg"));
 
 			}
 
-- 
cgit v1.2.3