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

Drupal: Poprave v kolikor je drzava prazna.

Browse Source
This commit is contained in:
Robert 2021-07-09 13:34:04 +02:00
parent 977d707dc1
commit 98d5223df4
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,16 @@
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('[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; return false;
} }
@ -1002,14 +1011,15 @@
// IP lokacija // IP lokacija
jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) { jQuery.post('/d/nakupovanje-api/get_lokacija').done(function (val) {
if(val == ''){
jQuery('#nakup-1ka #polje-drzava').attr('disabled', false);
} else {
val = JSON.parse(val); val = JSON.parse(val);
jQuery('#nakup-1ka #polje-drzava').val(val.drzava); jQuery('#nakup-1ka #polje-drzava').val(val.drzava);
if(jQuery('#nakup-1ka #polje-drzava').val() == null){
jQuery('#nakup-1ka #polje-drzava').val('Slovenija');
}
jQuery('#nakup-1ka #polje-drzava').attr('disabled', true); jQuery('#nakup-1ka #polje-drzava').attr('disabled', true);
}
}); });
} }

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