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] 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;
             }