From 629819db91d85a7babd6c4a3ebee48580e7cf796 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Sat, 20 Nov 2021 22:45:09 +0100 Subject: [PATCH 01/11] Popravek aai prijave (uuid), popravek vrstnega reda querijev v sql update --- admin/survey/classes/class.User.php | 4 ++-- sql/update2.sql | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/survey/classes/class.User.php b/admin/survey/classes/class.User.php index 01582f8f9..95fb262bd 100644 --- a/admin/survey/classes/class.User.php +++ b/admin/survey/classes/class.User.php @@ -115,7 +115,7 @@ class User { if(!empty($user_id)){ // Ce se nimamo zabelezenega aai_id-ja (uuid), ga pri prvi novi prijavi zabelezimo - sisplet_query("UPDATE users SET aai_id='".$aai_id."' WHERE user_id='".$user_id->id."' AND email='".$email."' AND aai_id=''"); + sisplet_query("UPDATE users SET aai_id='".$aai_id."' WHERE id='".$user_id->id."' AND email='".$email."' AND aai_id=''"); return $user_id->id; } @@ -125,7 +125,7 @@ class User { if(!empty($user_id)){ // Ce obstaja pomeni da je bil aai email spremenjen - ga popravimo se v bazi - sisplet_query("UPDATE users SET email='".$email."' WHERE user_id='".$user_id->id."' AND aai_id='".$aai_id."'"); + sisplet_query("UPDATE users SET email='".$email."' WHERE id='".$user_id->id."' AND aai_id='".$aai_id."'"); return $user_id->id; } diff --git a/sql/update2.sql b/sql/update2.sql index e78c12971..ae0a82494 100644 --- a/sql/update2.sql +++ b/sql/update2.sql @@ -9571,11 +9571,12 @@ UPDATE misc SET value='21.09.21' WHERE what="version"; ## Ankete vec ne stevilcimo ampak jih identificiramo po hashu ALTER TABLE srv_anketa ADD hash VARCHAR(8) CHARACTER SET utf8 NOT NULL DEFAULT '' AFTER id; -ALTER TABLE srv_anketa ADD UNIQUE (hash); ## Stare ankete imajo za hash kar id (da je kompatibilno za nazaj ker so ze objavljene) UPDATE srv_anketa SET hash=id; +ALTER TABLE srv_anketa ADD UNIQUE (hash); + UPDATE misc SET value='22.09.30' WHERE what="version"; INSERT INTO srv_help (what, help) VALUES ('srv_glasovanje_archive', 'Dodaj anketo v arhiv glasovanja'); From 5417da02ce9d40c4974bd8a6b6a165e1060976d0 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Sun, 21 Nov 2021 20:25:52 +0100 Subject: [PATCH 02/11] Popravek napake "Manjka id respondenta" pri placljivih paketih in hashu ankete --- frontend/payments/classes/class.UserAccess.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/payments/classes/class.UserAccess.php b/frontend/payments/classes/class.UserAccess.php index c171a52d7..d29efc483 100644 --- a/frontend/payments/classes/class.UserAccess.php +++ b/frontend/payments/classes/class.UserAccess.php @@ -132,7 +132,11 @@ class UserAccess{ if(isset($_POST['anketa']) || isset($_GET['anketa'])){ $ank_id = (isset($_GET['anketa'])) ? $_GET['anketa'] : $_POST['anketa']; - + + // Ce ni numeric imammo hash in pridobimo id iz njega + if(!is_numeric($ank_id)) + $ank_id = getSurveyIdFromHash($ank_id); + $sqlU = sisplet_query("SELECT insert_uid FROM srv_anketa WHERE id='".$ank_id."'"); $rowU = mysqli_fetch_array($sqlU); From 50ace9942dd4e1ef86f50cc89b80e65fcf25d868 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Mon, 22 Nov 2021 10:14:19 +0100 Subject: [PATCH 03/11] Popravek meta admina --- admin/survey/classes/class.Dostop.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php index 47b04bcdd..979b04a43 100644 --- a/admin/survey/classes/class.Dostop.php +++ b/admin/survey/classes/class.Dostop.php @@ -81,13 +81,14 @@ class Dostop { static function isMetaAdmin(){ global $global_user_id; global $admin_type; - global $meta_admin_ids; // Ce ni admin ni nikoli metaadmin if($admin_type != '0'){ return FALSE; } + $meta_admin_ids = AppSettings::getInstance()->getSetting('meta_admin_ids'); + // Ce imamo nastavljene id-je za metaadmine v settings_optional if(isset($meta_admin_ids) && !empty($meta_admin_ids)){ From ae5516931b51a7b1defd0234cef9aaade7c3b21d Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 1 Dec 2021 13:22:24 +0100 Subject: [PATCH 04/11] Popravek za robote, da preverja reCaptcha in varnostno polje --- .../nakupovanje_1ka/nakupovanje_1ka.module | 4 +++- .../drupal/sites/all/themes/pro1ka/js/script.js | 4 +++- ...-poslovni-uporabniki-virtualna-domena.tpl.php | 13 +++++++++++++ frontend/payments/classes/class.UserNarocila.php | 16 ++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module index 5a5d048b6..de3efac05 100755 --- a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module +++ b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module @@ -357,7 +357,9 @@ function cenik_paketov_1ka_poslovni_uporabniki() function nakupovanje_1ka_instalacija_na_1ka() { - return theme('nakupovanje_1ka_virtualna_domena'); + require(drupal_get_path('module', 'nakupovanje_1ka') . '/../../../../../../settings_optional.php'); + + return theme('nakupovanje_1ka_virtualna_domena', compact('recaptcha_sitekey')); } function nakupovanje_1ka_lastna_instalacija() diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index e77db8448..983baba99 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -1122,7 +1122,9 @@ } ); - if (jQuery('.error-field, .error-color').length > 0) { + jQuery('g-recaptcha-response') + + if (jQuery('.error-field, .error-color').length > 0 || jQuery('#varnostno-polje').val().length > 0 ) { return ''; } diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php index c265c4492..ecee6a5d3 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php @@ -111,6 +111,19 @@ + +
+
+
+
+
+ + + + +

diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index b7d5ffb72..5ee2aca53 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -1342,6 +1342,22 @@ class UserNarocila{ // Lastna instalacija - paket $strinjanje_s_pogoji = isset($narocilo_data['strinjanje_s_pogoji']) ? $narocilo_data['strinjanje_s_pogoji'] : ''; + // Varnostno preverimo, če robot izpolni polje + $varnostno_polje = isset($narocilo_data['varnostno-polje']) ? isset($narocilo_data['varnostno-polje']) : ''; + if(!empty($varnostno_polje)){ + return ['false' => true]; + } + + // Preverimo ReCaptcha + if (in_array($paket, [1,2]) && AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) { + $recaptchaResponse = isset($narocilo_data['g-recaptcha-response']) ? $narocilo_data['g-recaptcha-response'] : ''; + $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse); + + if (!strstr($requestReCaptcha, 'true')) { + return ['false' => true]; + } + } + // Posljemo mail s podatki povprasevanja $subject = $lang['srv_narocilo_poslovni_email_1ka_subject']; From 16d01a085487baacf5d1f58caa52d04f72b2b534 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 1 Dec 2021 13:47:57 +0100 Subject: [PATCH 05/11] Popravekpri varnostnem polju --- 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 5ee2aca53..975f691f1 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -1343,7 +1343,7 @@ class UserNarocila{ $strinjanje_s_pogoji = isset($narocilo_data['strinjanje_s_pogoji']) ? $narocilo_data['strinjanje_s_pogoji'] : ''; // Varnostno preverimo, če robot izpolni polje - $varnostno_polje = isset($narocilo_data['varnostno-polje']) ? isset($narocilo_data['varnostno-polje']) : ''; + $varnostno_polje = isset($narocilo_data['varnostno-polje']) ? $narocilo_data['varnostno-polje'] : ''; if(!empty($varnostno_polje)){ return ['false' => true]; } From 99adf02df90cfc54f9301d58d5e13cb0a237cc6d Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 1 Dec 2021 13:59:57 +0100 Subject: [PATCH 06/11] Porpavek JS pri posiljanju --- frontend/drupal/sites/all/themes/pro1ka/js/script.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index 983baba99..ccb52d465 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -1122,14 +1122,15 @@ } ); - jQuery('g-recaptcha-response') - if (jQuery('.error-field, .error-color').length > 0 || jQuery('#varnostno-polje').val().length > 0 ) { return ''; } //Onemogočimo dvojno pošiljanje var pocakaj = jQuery(this).attr('data-wait'); + var textOddaj = jQuery(this).val(); + + jQuery(this).attr('data-wait', textOddaj); jQuery(this).val(pocakaj).attr('disabled', 'disabled'); @@ -1142,6 +1143,9 @@ jQuery('#narocilo-poslovni-uporabniki').hide(); jQuery('#nakup-1ka-poslovni-uporabniki .uspesno-oddano-narocilo').show(); jQuery('.vsebina h1').text('Uspešno oddano naročilo'); + } else if(val.error) { + jQuery(this).attr('data-wait', pocakaj); + jQuery(this).val(textOddaj).attr('disabled', ''); } }); From 42bb95cf34dea568c1099e4d1258f770f703459d Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 4 Dec 2021 12:07:52 +0100 Subject: [PATCH 07/11] =?UTF-8?q?Input=20polje=20dr=C5=BEava?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sites/all/themes/pro1ka/js/script.js | 28 +++++++++---------- .../nakupovanje-1ka-kosarica.tpl.php | 19 +++++++++---- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index ccb52d465..13174fc6a 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -26,7 +26,6 @@ jQuery(document).ready(function () { // Odjava v Drupalu jQuery('#poslji-odjavo').on('click', function(e){ - console.log('klik odjava') e.preventDefault(); jQuery('[name="odjava"]').submit(); @@ -702,8 +701,8 @@ jQuery('#polje-drzava, [name="payment_method"]').on('change', function(){ if( jQuery('[name="payment_method"]:checked').val() == 1 && - jQuery('[name="podjetje_drzava"] :selected').val() != 'Slovenija' && - jQuery('[name="podjetje_drzava"] :selected').val() != 'Slovenia' + jQuery('[name="podjetje_drzava"]').val() != 'Slovenija' && + jQuery('[name="podjetje_drzava"]').val() != 'Slovenia' ) { jQuery('.tuje-bancno-nakazilo').show(); @@ -748,10 +747,11 @@ } //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('readonly', false); - jQuery('[name="podjetje_drzava"]').addClass('error error-field'); - } + // 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('readonly', 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 () { @@ -778,7 +778,7 @@ jQuery.post('/d/nakupovanje-api/check_ddv', { cena: skupnaCena, - podjetje_drzava: jQuery('[name="podjetje_drzava"] :selected').val(), + podjetje_drzava: jQuery('[name="podjetje_drzava"]').val(), podjetje_davcna: jQuery('[name="podjetje_davcna"]').val() }).done(function (val) { val = JSON.parse(val); @@ -812,7 +812,7 @@ jQuery('#forma-telefon').text(jQuery('#f-telefon').val()); jQuery('#col-forma-telefon').show(); } - jQuery('#forma-d-drzava').text(jQuery('[name="podjetje_drzava"] :selected').val()); + jQuery('#forma-d-drzava').text(jQuery('[name="podjetje_drzava"]').val()); // Iz forme poberemo pdoatke o podjetju if (jQuery('#racun-na-podjetje').is(':checked')) { @@ -1013,7 +1013,7 @@ // IP lokacija jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { - jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); + // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); val = JSON.parse(val); @@ -1030,7 +1030,7 @@ // Preverimo, če je že prej opravil nakup jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { - jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); + // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); val = JSON.parse(val); @@ -1058,7 +1058,7 @@ var davcna = jQuery('[name="podjetje_davcna"]').val().replace(/\D/g, ''); // samo številke if(davcna.length > 7) { - jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); + // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); // $("#obvestilceDavcna").val("Iščemo ime podjetja s to davčno številko ..."); // $.ajax({ // url: "https://www.go-tel.si/tecaji/poizvedba.php", @@ -1465,8 +1465,8 @@ function posodobiCenoPaketa() { jQuery('.cena-z-ddv-text').show(); jQuery('.zavezanec-za-ddv').hide(); if (jQuery('#zavezanec-za-ddv').is(':checked') && jQuery('#racun-na-podjetje').is(':checked') && - jQuery('[name="podjetje_drzava"] :selected').val() != 'Slovenija' && - jQuery('[name="podjetje_drzava"] :selected').val() != 'Slovenia') { + jQuery('[name="podjetje_drzava"]').val() != 'Slovenija' && + jQuery('[name="podjetje_drzava"]').val() != 'Slovenia') { cenaIzpisGledeNaDDV = '_without_tax'; jQuery('.cena-z-ddv-text').hide(); jQuery('.zavezanec-za-ddv').show(); 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 737363764..c482c2a03 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 @@ -384,12 +384,19 @@ );?>

- + + +language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> + +language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?> + + + + + + + +
From ade45676f8e2b47438e9fbb8555d8b41b90039cc Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 4 Dec 2021 14:41:36 +0100 Subject: [PATCH 08/11] Popravek, da dovoli samo ajax request. --- .../all/modules/nakupovanje_1ka/nakupovanje_1ka.module | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module index de3efac05..10d2e41c2 100755 --- a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module +++ b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module @@ -237,6 +237,13 @@ function nakupovanje_1ka_menu() function nakupovanje_1ka_api() { + if(empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') { + header('Location: //1ka.si'); + die(); + } + + + require($_SERVER['DOCUMENT_ROOT'] . '/settings.php'); $api_url = $site_url . 'frontend/payments/api.php'; From 249b6f88a37af967d69aca3fc1ed6f5e845b3f72 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 6 Dec 2021 14:42:58 +0100 Subject: [PATCH 09/11] Nakupovanje: Prikazi selec in input readonly glede na drzavo. --- .../sites/all/themes/pro1ka/js/script.js | 89 ++++++++++++------- .../nakupovanje-1ka-kosarica.tpl.php | 16 ++-- 2 files changed, 65 insertions(+), 40 deletions(-) diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index 13174fc6a..4e7c818a6 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -689,11 +689,22 @@ prikaziPoljeEracun(); if (jQuery('#racun-na-podjetje').is(':checked')) { + jQuery('.polje-za-podjetje').attr('required', 'required'); + + jQuery('#polje-drzava').hide(); + jQuery('#polje-drzava-select').show(); + } else { + jQuery('.polje-za-podjetje').removeAttr('required'); jQuery('.polje-za-podjetje').val(''); jQuery('#zavezanec-za-ddv').prop('checked', false); + + pridobiLokacijoNakupovalca(); + jQuery('#polje-drzava').show(); + jQuery('#polje-drzava-select').hide(); + } }); @@ -1011,38 +1022,7 @@ posodobiCenoPaketa(); // IP lokacija - jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { - - // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); - - 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('readonly', true); - } - }); - - // Preverimo, če je že prej opravil nakup - jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { - - // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); - - 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('readonly', true); - } - }); + pridobiLokacijoNakupovalca(); } jQuery('#nakup-1ka .izbira').on('change', function () { @@ -1053,11 +1033,34 @@ prikaziPoljeEracun(); }); + jQuery('#nakup-1ka #polje-drzava-select').on('change', function(){ + jQuery('#nakup-1ka #polje-drzava').val(jQuery(this).val()); + }); + jQuery('[name="podjetje_davcna"]').keyup(function () { jQuery('#nakup-1ka #polje-drzava').attr('readonly', true); var davcna = jQuery('[name="podjetje_davcna"]').val().replace(/\D/g, ''); // samo številke if(davcna.length > 7) { + + jQuery.post('/d/nakupovanje-api/get_lokacija', { + podjetje_davcna: davcna + }).done(function (val) { + + // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); + + 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('readonly', true); + } + }); + // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); // $("#obvestilceDavcna").val("Iščemo ime podjetja s to davčno številko ..."); // $.ajax({ @@ -1557,4 +1560,26 @@ function prikaziPoljeEracun(){ } +function pridobiLokacijoNakupovalca(){ + + jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { + + // jQuery('#nakup-1ka #polje-drzava').attr('readonly', false); + + 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('readonly', true); + } + + }); + +} + 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 c482c2a03..fe114d184 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,14 +385,14 @@
- -language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> - -language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?> - - - - + From 081558729baed6e19f3f356b22bfa66552210b90 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 6 Dec 2021 14:56:06 +0100 Subject: [PATCH 10/11] Nakupovanje: popravek, da select postavi na ''. --- frontend/drupal/sites/all/themes/pro1ka/js/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index 4e7c818a6..9cca654fc 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -692,8 +692,8 @@ jQuery('.polje-za-podjetje').attr('required', 'required'); - jQuery('#polje-drzava').hide(); - jQuery('#polje-drzava-select').show(); + jQuery('#polje-drzava').val('').hide(); + jQuery('#polje-drzava-select').val('').show(); } else { From baaa2521cdc51783d0f5e364499f6354d86e9b9a Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 6 Dec 2021 15:12:09 +0100 Subject: [PATCH 11/11] Nakupovanje: popravek, da oznaci napako, ce je error select --- .../drupal/sites/all/themes/pro1ka/js/script.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index 9cca654fc..9ae4a3e48 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -757,12 +757,14 @@ } } - //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('readonly', false); - // jQuery('[name="podjetje_drzava"]').addClass('error error-field'); - // } + //Preverjanje polja država select za podjetje + if(jQuery('#polje-drzava-select').is(':visible') && + (jQuery('#polje-drzava-select :selected').val() == '' || + jQuery('#polje-drzava-select :selected').val() == undefined || + jQuery('#polje-drzava-select :selected').val().length < 2)){ + + jQuery('#polje-drzava-select').addClass('error error-field'); + } // Dodamo opozorilov input polja in tudi sklop obarvamo rdeče jQuery(':input[required]:visible').each(function () {