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