From 98d5223df4f94a14b5f99883216384f82d24edab Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Fri, 9 Jul 2021 13:34:04 +0200
Subject: [PATCH 1/6] Drupal: Poprave v kolikor je drzava prazna.

---
 .../sites/all/themes/pro1ka/js/script.js      | 24 +++++++++++++------
 .../classes/class.ApiNarocilaController.php   |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index 174f39e94..178bd906b 100755
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -286,7 +286,16 @@
             jQuery('#register-form [name="agree"]').addClass('error').siblings('#agreelabel, .checkbox-display').addClass('error');
           }
 
-          if (jQuery('#register-form [name="email"]').val().length == 0 || jQuery('#register-form [name="ime"]').val().length == 0 || !jQuery('#register-form [name="agree"]').is(':checked')) {
+          if(jQuery('[name="podjetje_drzava"] :selected').val() == '' || jQuery('[name="podjetje_drzava"] :selected').val().length < 2){
+            jQuery('[name="podjetje_drzava"]').addClass('error error-field');
+          }
+
+          if (jQuery('#register-form [name="email"]').val().length == 0 ||
+            jQuery('#register-form [name="ime"]').val().length == 0 ||
+            !jQuery('#register-form [name="agree"]').is(':checked') ||
+            jQuery('[name="podjetje_drzava"] :selected').val() == '' ||
+            jQuery('[name="podjetje_drzava"] :selected').val().length < 2
+          ) {
             return false;
           }
 
@@ -1002,14 +1011,15 @@
 
           // IP lokacija
           jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) {
-            val = JSON.parse(val);
 
-            jQuery('#nakup-1ka #polje-drzava').val(val.drzava);
-            if(jQuery('#nakup-1ka #polje-drzava').val() == null){
-              jQuery('#nakup-1ka #polje-drzava').val('Slovenija');
+            if(val == ''){
+              jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
+            } else {
+              val = JSON.parse(val);
+
+              jQuery('#nakup-1ka #polje-drzava').val(val.drzava);
+              jQuery('#nakup-1ka #polje-drzava').attr('disabled', true);
             }
-
-            jQuery('#nakup-1ka #polje-drzava').attr('disabled', true);
           });
         }
 
diff --git a/frontend/payments/classes/class.ApiNarocilaController.php b/frontend/payments/classes/class.ApiNarocilaController.php
index 797d8d51e..f858801e3 100644
--- a/frontend/payments/classes/class.ApiNarocilaController.php
+++ b/frontend/payments/classes/class.ApiNarocilaController.php
@@ -349,7 +349,7 @@ class ApiNarocilaController{
                   $podatki = $reader->city($this->data['ip']);
 
                   // Vrnemo ime države
-                  $this->response['drzava'] =  $podatki->country->name;
+                  $this->response['drzava'] =  $podatki->country->name ?? '';
 
                 break;
             }

From 5e1874f0afb1595272b93af6e000ae9db2a58bd4 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Fri, 9 Jul 2021 13:44:15 +0200
Subject: [PATCH 2/6] Drupal: Poprave v kolikor je drzava prazna.

---
 frontend/drupal/sites/all/themes/pro1ka/js/script.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index 178bd906b..6693cfd4a 100755
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -1011,12 +1011,11 @@
 
           // IP lokacija
           jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) {
+            jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
 
-            if(val == ''){
-              jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
-            } else {
-              val = JSON.parse(val);
+            val = JSON.parse(val);
 
+            if(val.drzava && val.drzava.length > 1){
               jQuery('#nakup-1ka #polje-drzava').val(val.drzava);
               jQuery('#nakup-1ka #polje-drzava').attr('disabled', true);
             }

From 57ccd7dc831ca77cc6743ec568d55be3f1ca0402 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Mon, 12 Jul 2021 00:33:17 +0200
Subject: [PATCH 3/6] Drupal: Poprave v kolikor je drzava prazna.

---
 .../drupal/sites/all/themes/pro1ka/js/script.js  | 16 +++++++++-------
 .../templates/nakupovanje-1ka-kosarica.tpl.php   |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index 6693cfd4a..109bac67d 100755
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -286,15 +286,10 @@
             jQuery('#register-form [name="agree"]').addClass('error').siblings('#agreelabel, .checkbox-display').addClass('error');
           }
 
-          if(jQuery('[name="podjetje_drzava"] :selected').val() == '' || jQuery('[name="podjetje_drzava"] :selected').val().length < 2){
-            jQuery('[name="podjetje_drzava"]').addClass('error error-field');
-          }
 
           if (jQuery('#register-form [name="email"]').val().length == 0 ||
             jQuery('#register-form [name="ime"]').val().length == 0 ||
-            !jQuery('#register-form [name="agree"]').is(':checked') ||
-            jQuery('[name="podjetje_drzava"] :selected').val() == '' ||
-            jQuery('[name="podjetje_drzava"] :selected').val().length < 2
+            !jQuery('#register-form [name="agree"]').is(':checked')
           ) {
             return false;
           }
@@ -745,13 +740,19 @@
           if(!jQuery('[name="trajanje"]').is(":checked")){
             jQuery('[name="trajanje"]').siblings().addClass('error-field');
           }
-
+1
           if(jQuery('#tuje-bancno-nakazilo[required]').is(':visible')){
             if(!jQuery('#tuje-bancno-nakazilo[required]').is(':checked')) {
               jQuery('#tuje-bancno-nakazilo').parent().addClass('error-field error-color');
             }
           }
 
+          //Preverjanje polja država
+          if(jQuery('[name="podjetje_drzava"]').is(':visible') && (jQuery('[name="podjetje_drzava"] :selected').val() == '' || jQuery('[name="podjetje_drzava"] :selected').val() == undefined || jQuery('[name="podjetje_drzava"] :selected').val().length < 2)){
+            jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
+            jQuery('[name="podjetje_drzava"]').addClass('error error-field');
+          }
+
           // Dodamo opozorilov  input polja in tudi sklop obarvamo rdeče
           jQuery(':input[required]:visible').each(function () {
               if (jQuery(this).val() == '') {
@@ -1011,6 +1012,7 @@
 
           // IP lokacija
           jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) {
+
             jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
 
             val = JSON.parse(val);
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
index c18c666c8..737363764 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
@@ -385,7 +385,7 @@
           <div class="w-clearfix">
             <div class="col _3-3-3-12">
               <select name="podjetje_drzava" class="input-field w-input" id="polje-drzava" required="required">
-                <option value="" disabled="disabled" <?php printf ($language->language != 'sl' ? 'selected="selected"' : ''); ?>> - <?php printf ($language->language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> -</option>
+                <option disabled="disabled"> - <?php printf ($language->language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> -</option>
                 <?php foreach($country_list as  $country): ?>
                   <option value="<?php  printf($country); ?>" <?php printf ($language->language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?>><?php printf($country); ?></option>
                 <?php endforeach; ?>

From fdd0b91f99a0d28b06f0c6332b5e9ff308e46b99 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Mon, 12 Jul 2021 01:53:35 +0200
Subject: [PATCH 4/6] Drupal popravek.

---
 frontend/drupal/sites/all/themes/pro1ka/js/script.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index 109bac67d..2262c20b8 100755
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -1018,6 +1018,10 @@
             val = JSON.parse(val);
 
             if(val.drzava && val.drzava.length > 1){
+              if(val.drzava == 'Slovenia' && jQuery('[name="lang"]').val() == 'sl'){
+                val.drzava = "Slovenija";
+              }
+
               jQuery('#nakup-1ka #polje-drzava').val(val.drzava);
               jQuery('#nakup-1ka #polje-drzava').attr('disabled', true);
             }

From 5ed326b52fb5438e54a1999cd26e64aeb732ce3b Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 12 Jul 2021 09:42:29 +0200
Subject: [PATCH 5/6] Popravljen bug pri ttestu

---
 admin/survey/classes/surveyAnalysis/class.SurveyTTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
index c49657371..9108c1046 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
@@ -162,8 +162,8 @@ class SurveyTTest
 		# ali imamo testne podatke
 		if ($this->_HAS_TEST_DATA) {
 			# izrišemo bar za testne podatke	
-            $SSH -> displayTestDataBar(true);
             $SSH = new SurveyStaticHtml($this->sid);
+            $SSH -> displayTestDataBar(true);
 		}
 		
 		/*echo '<div id="dataOnlyValid">';

From c2d27977839db6b8f7a4f7d2c583a6e4f6605504 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 12 Jul 2021 10:03:50 +0200
Subject: [PATCH 6/6] Ugasnjena default drzava Slovenija pri kreiranju narocila
 (da detektiramo, ce se se kje poslje prazno iz drupala)

---
 frontend/payments/classes/class.UserNarocila.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index 0f75047e4..abdc0d95e 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -732,9 +732,9 @@ class UserNarocila{
             return $response;
         }
 
-        // Ce je slucajno drzava prazna jo nastavimo na slovenijo
-        if($podjetje_drzava == '')
-            $podjetje_drzava = 'Slovenija';
+        // Ce je slucajno drzava prazna jo nastavimo na slovenijo - zankrat pustimo, da vidimo, ce se se kdaj poslje prazno polje (naceloma se nebi smelo)
+        /*if($podjetje_drzava == '')
+            $podjetje_drzava = 'Slovenija';*/
         
         // Nastavimo ce placa DDV (zavezanci iz EU ga ne placajo)
         if(self::checkPayDDV($podjetje_davcna, $podjetje_drzava))