From 8c55a2d3ff28d62918ad724a87261a926364ee74 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 24 Aug 2020 10:16:18 +0200
Subject: [PATCH 1/2] Dodan warning pri geolokaciji

---
 admin/survey/classes/class.SurveyGeoIP.php | 10 ++++++++--
 lang/1.php                                 |  1 +
 lang/2.php                                 |  3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/admin/survey/classes/class.SurveyGeoIP.php b/admin/survey/classes/class.SurveyGeoIP.php
index 3827a37be..365cf78e6 100644
--- a/admin/survey/classes/class.SurveyGeoIP.php
+++ b/admin/survey/classes/class.SurveyGeoIP.php
@@ -40,9 +40,15 @@ class SurveyGeoIP{
 		// Zakesiramo podatke o lokacijah
 		$this->calculateLocations();		
 		//var_dump($this->data);
-		
+        
+
+        // Opozorilo o nenatancnosti
+        echo '<p class="bold">'.$lang['srv_geoip_warning'].'</p>';
+
+
 		echo '<div>';
-                echo '<div class="floatLeft">';
+        echo '<div class="floatLeft">';
+        
 		// Izpis tabele frekvenc
 		echo '<table class="geoip_table">';
 		
diff --git a/lang/1.php b/lang/1.php
index 9a80412df..479fe06ee 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6318,6 +6318,7 @@ $lang = array (
 	'srv_geoip_unknown'							=>	'Neznano',
 	'srv_geoip_map_cities'						=>	'Vsa mesta',
 	'srv_geoip_map_countries'					=>	'Vse države',
+	'srv_geoip_warning'					        =>	'Prosimo, upoštevajte, da so navedene IP lokacije lahko v določenih primerih nenatančne in zgolj ocene. Ocenjene so na podlagi knjižnice IP lokacij (verzija 2019), zato lahko pride do odstopanj od realnih podatkov.',
 	'srv_edits_analysis'						=>	'Analize urejanja',
 	'srv_edits_analysis_seansa'					=>	'Kriterij seanse: ',
 	'srv_edits_analysis_seansa_1h'				=>	'1 ura',
diff --git a/lang/2.php b/lang/2.php
index 0336f44de..c5eb9cefc 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6200,7 +6200,8 @@ $lang = array (
 	'srv_geoip_freq'							=>	'Frequency',
 	'srv_geoip_unknown'							=>	'Unknown',
 	'srv_geoip_map_cities'						=>	'All cities',
-	'srv_geoip_map_countries'					=>	'All countries',
+    'srv_geoip_map_countries'					=>	'All countries',
+    'srv_geoip_warning'					        =>	'Please note that the listed IP locations may in certain cases be inaccurate and are only estimates. They are estimated based on the library of IP locations (version 2019), so there may be deviations from the real data.',
 	'srv_edits_analysis'						=>	'Edits analysis',
 	'srv_edits_analysis_seansa'					=>	'Session criteria: ',
 	'srv_edits_analysis_seansa_1h'				=>	'1 hour',

From 0e6a7adc9bca518d579b117529b4c92951642963 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 24 Aug 2020 17:27:36 +0200
Subject: [PATCH 2/2] Popravek ddv-ja na racunu pri podjetjih iz tujine - ce
 ima uporabnik ang. vmesnik in je drzava "Slovenia"

---
 frontend/payments/classes/class.UserNarocila.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index e7d2a5318..d50b4f811 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -171,7 +171,7 @@ class UserNarocila{
 
             $rowNarocilo = mysqli_fetch_array($sqlNarocilo);
 
-            if($rowNarocilo['podjetje_drzava'] != 'Slovenija' && $rowNarocilo['podjetje_zavezanec'] == '1'){
+            if($rowNarocilo['podjetje_drzava'] != 'Slovenija' && $rowNarocilo['podjetje_drzava'] != 'Slovenia' && $rowNarocilo['podjetje_zavezanec'] == '1'){
                 return true;
             }
         }