may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2021-07-12 12:48:11 +02:00
commit b30c38dbbb
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
View File

@ -162,8 +162,8 @@ class SurveyTTest
# ali imamo testne podatke # ali imamo testne podatke
if ($this->_HAS_TEST_DATA) { if ($this->_HAS_TEST_DATA) {
# izrišemo bar za testne podatke # izrišemo bar za testne podatke
$SSH -> displayTestDataBar(true);
$SSH = new SurveyStaticHtml($this->sid); $SSH = new SurveyStaticHtml($this->sid);
$SSH -> displayTestDataBar(true);
} }
/*echo '<div id="dataOnlyValid">'; /*echo '<div id="dataOnlyValid">';

25
frontend/drupal/sites/all/themes/pro1ka/js/script.js
View File

@ -286,7 +286,11 @@
jQuery('#register-form [name="agree"]').addClass('error').siblings('#agreelabel, .checkbox-display').addClass('error'); 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('#register-form [name="email"]').val().length == 0 ||
jQuery('#register-form [name="ime"]').val().length == 0 ||
!jQuery('#register-form [name="agree"]').is(':checked')
) {
return false; return false;
} }
@ -736,13 +740,19 @@
if(!jQuery('[name="trajanje"]').is(":checked")){ if(!jQuery('[name="trajanje"]').is(":checked")){
jQuery('[name="trajanje"]').siblings().addClass('error-field'); jQuery('[name="trajanje"]').siblings().addClass('error-field');
} }
1
if(jQuery('#tuje-bancno-nakazilo[required]').is(':visible')){ if(jQuery('#tuje-bancno-nakazilo[required]').is(':visible')){
if(!jQuery('#tuje-bancno-nakazilo[required]').is(':checked')) { if(!jQuery('#tuje-bancno-nakazilo[required]').is(':checked')) {
jQuery('#tuje-bancno-nakazilo').parent().addClass('error-field error-color'); 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 // Dodamo opozorilov input polja in tudi sklop obarvamo rdeče
jQuery(':input[required]:visible').each(function () { jQuery(':input[required]:visible').each(function () {
if (jQuery(this).val() == '') { if (jQuery(this).val() == '') {
@ -1002,14 +1012,19 @@
// IP lokacija // IP lokacija
jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) {
jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
val = JSON.parse(val); val = JSON.parse(val);
jQuery('#nakup-1ka #polje-drzava').val(val.drzava); if(val.drzava && val.drzava.length > 1){
if(jQuery('#nakup-1ka #polje-drzava').val() == null){ if(val.drzava == 'Slovenia' && jQuery('[name="lang"]').val() == 'sl'){
jQuery('#nakup-1ka #polje-drzava').val('Slovenija'); val.drzava = "Slovenija";
} }
jQuery('#nakup-1ka #polje-drzava').val(val.drzava);
jQuery('#nakup-1ka #polje-drzava').attr('disabled', true); jQuery('#nakup-1ka #polje-drzava').attr('disabled', true);
}
}); });
} }

2
frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
View File

@ -385,7 +385,7 @@
<div class="w-clearfix"> <div class="w-clearfix">
<div class="col _3-3-3-12"> <div class="col _3-3-3-12">
<select name="podjetje_drzava" class="input-field w-input" id="polje-drzava" required="required"> <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): ?> <?php foreach($country_list as $country): ?>
<option value="<?php printf($country); ?>" <?php printf ($language->language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?>><?php printf($country); ?></option> <option value="<?php printf($country); ?>" <?php printf ($language->language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?>><?php printf($country); ?></option>
<?php endforeach; ?> <?php endforeach; ?>

2
frontend/payments/classes/class.ApiNarocilaController.php
View File

@ -349,7 +349,7 @@ class ApiNarocilaController{
$podatki = $reader->city($this->data['ip']); $podatki = $reader->city($this->data['ip']);
// Vrnemo ime države // Vrnemo ime države
$this->response['drzava'] = $podatki->country->name; $this->response['drzava'] = $podatki->country->name ?? '';
break; break;
} }

6
frontend/payments/classes/class.UserNarocila.php
View File

@ -732,9 +732,9 @@ class UserNarocila{
return $response; return $response;
} }
// Ce je slucajno drzava prazna jo nastavimo na slovenijo // 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 == '') /*if($podjetje_drzava == '')
$podjetje_drzava = 'Slovenija'; $podjetje_drzava = 'Slovenija';*/
// Nastavimo ce placa DDV (zavezanci iz EU ga ne placajo) // Nastavimo ce placa DDV (zavezanci iz EU ga ne placajo)
if(self::checkPayDDV($podjetje_davcna, $podjetje_drzava)) if(self::checkPayDDV($podjetje_davcna, $podjetje_drzava))