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

Popravki pri registraciji in trgovini

Browse Source
This commit is contained in:
Robert 2022-06-28 16:44:02 +02:00
parent f1f9f7049f
commit 9a6ad82bb4
12 changed files with 3164 additions and 2033 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
frontend/api/class.ApiLogin.php
View File

@ -21,6 +21,8 @@ class ApiLogin
var $prijava = ''; var $prijava = '';
var $data;
var $EncPass; var $EncPass;
var $page_urls = []; // Url-ji za podstrani - to se bo verjetno nastavljalo v settings.php var $page_urls = []; // Url-ji za podstrani - to se bo verjetno nastavljalo v settings.php
@ -310,6 +312,9 @@ class ApiLogin
if (isset($data['method'])){ if (isset($data['method'])){
$this->method = $data['method']; $this->method = $data['method'];
} }
if (isset($data)){
$this->data = $data;
}
if (!isset($params['action'])) { if (!isset($params['action'])) {
$response = 'Napaka! Manjkajo parametri!'; $response = 'Napaka! Manjkajo parametri!';
@ -1160,18 +1165,26 @@ class ApiLogin
$error = []; $error = [];
$email = (isset($_POST['email'])) ? $_POST['email'] : ''; $email = (isset($this->data['email'])) ? $this->data['email'] : '';
$ime = (isset($_POST['ime'])) ? $_POST['ime'] : ''; $ime = (isset($this->data['ime'])) ? $this->data['ime'] : '';
$geslo = (isset($_POST['geslo'])) ? $_POST['geslo'] : ''; $geslo = (isset($this->data['geslo'])) ? $this->data['geslo'] : '';
$geslo2 = (isset($_POST['geslo2'])) ? $_POST['geslo2'] : ''; $geslo2 = (isset($this->data['geslo2'])) ? $this->data['geslo2'] : '';
$agree = (isset($_POST['agree'])) ? $_POST['agree'] : '0'; $agree = (isset($this->data['agree'])) ? $this->data['agree'] : '0';
$gdprAgree = (isset($_POST['gdpr-agree'])) ? $_POST['gdpr-agree'] : '0'; $gdprAgree = (isset($this->data['gdpr-agree'])) ? $this->data['gdpr-agree'] : '0';
$ajaxKlic = (isset($_POST['ajax'])) ? $_POST['ajax'] : '0'; // Če izvajamo registracjo preko drupala, ker se pošlje post request preko ajaxa $ajaxKlic = (isset($this->data['ajax'])) ? $this->data['ajax'] : '0'; // Če izvajamo registracjo preko drupala, ker se pošlje post request preko ajaxa
$varnostno_polje = (isset($_POST['varnostno-polje'])) ? $_POST['varnostno-polje'] : false; $varnostno_polje = (isset($_POST['varnostno-polje'])) ? $_POST['varnostno-polje'] : false;
if (!empty($varnostno_polje)) { if (!empty($varnostno_polje)) {
header('Location: '.$this->page_urls['page_robot_redirect']);
die(); if($this->method == 'AJAX'){
return $this->ajaxResponse('error', [
'url' => $this->page_urls['page_robot_redirect'],
'message' => 'Robot'
]);
} else {
header('Location: ' . $this->page_urls['page_robot_redirect']);
die();
}
} }
@ -1185,7 +1198,6 @@ class ApiLogin
} }
} }
// Preverimo ce imamo vse podatke // Preverimo ce imamo vse podatke
if ($email == '') { if ($email == '') {
$error['missing_email'] = '1'; $error['missing_email'] = '1';
@ -1247,11 +1259,11 @@ class ApiLogin
// Nekaj ni ok - posljemo na isto stran z errorji v GET-u // Nekaj ni ok - posljemo na isto stran z errorji v GET-u
if (!empty($error)) { if (!empty($error)) {
if($ajaxKlic){ if($ajaxKlic || $this->method == 'AJAX'){
echo json_encode($this->preveriNapake($error)); return $this->ajaxResponse('error', $this->preveriNapake($error));
die();
} }
// Ime in email posljemo nazaj v urlju // Ime in email posljemo nazaj v urlju
$params = 'email='.$email.'&ime='.$ime.'&gdpr='.$gdprAgree.'&'; $params = 'email='.$email.'&ime='.$ime.'&gdpr='.$gdprAgree.'&';
@ -1266,11 +1278,8 @@ class ApiLogin
} // Vse je ok - preusmerimo na potrditveno stran } // Vse je ok - preusmerimo na potrditveno stran
else { else {
if($ajaxKlic){ if($ajaxKlic || $this->method == 'AJAX'){
echo json_encode([ return $this->ajaxResponse('success');
'success' => '1'
]);
die();
} }
// Hidden form, ki ga z js potem postamo naprej (da prenesemo vnesene podatke na naslednjo stran) // Hidden form, ki ga z js potem postamo naprej (da prenesemo vnesene podatke na naslednjo stran)
@ -1306,7 +1315,7 @@ class ApiLogin
} }
if(is_numeric($language)){ if(is_numeric($language)){
include_once('../../lang/'.$language.'.php'); include('../../lang/'.$language.'.php');
} }
$napaka = []; $napaka = [];
@ -1393,25 +1402,25 @@ class ApiLogin
global $app_settings; global $app_settings;
$email = (isset($_POST['email']) ? $_POST['email'] : ''); $email = (isset($this->data['email']) ? $this->data['email'] : '');
$ime = (isset($_POST['ime']) ? $_POST['ime'] : ''); $ime = (isset($this->data['ime']) ? $this->data['ime'] : '');
//$geslo = (isset($_POST['geslo']) ? base64_decode($_POST['geslo']) : ''); //$geslo = (isset($this->data['geslo']) ? base64_decode($this->data['geslo']) : '');
$geslo = (isset($_POST['geslo']) ? $_POST['geslo'] : ''); $geslo = (isset($this->data['geslo']) ? $this->data['geslo'] : '');
$gdprAgree = (isset($_POST['gdpr-agree']) ? $_POST['gdpr-agree'] : 0); $gdprAgree = (isset($this->data['gdpr-agree']) ? $this->data['gdpr-agree'] : 0);
$ajax = (isset($_POST['ajax']) ? $_POST['ajax'] : 0); // če je Drupal ajax request $ajax = (isset($this->data['ajax']) ? $this->data['ajax'] : 0); // če je Drupal ajax request
// Nastavimo jezik // Nastavimo jezik
$language = 1; $language = 1;
if(isset($_POST['language'])){ if(isset($this->data['language'])){
$language = $_POST['language']; $language = $this->data['language'];
} }
elseif(isset($_POST['jezik'])){ elseif(isset($this->data['jezik'])){
$language = ($_POST['jezik'] == 'en' ? 2 : 1); $language = ($this->data['jezik'] == 'en' ? 2 : 1);
} }
if(is_numeric($language)){ if(is_numeric($language)){
include_once('../../lang/'.$language.'.php'); include('../../lang/'.$language.'.php');
} }
@ -1527,11 +1536,8 @@ class ApiLogin
} }
if($ajax){ if($ajax || $this->method == 'AJAX'){
echo json_encode([ return $this->ajaxResponse('success');
'success' => 1
]);
die();
} }
@ -2040,7 +2046,7 @@ class ApiLogin
} }
} }
private function ajaxResponse($type, $data) private function ajaxResponse($type, $data = [])
{ {
echo json_encode([ echo json_encode([
'type' => $type, 'type' => $type,

4
frontend/api/class.ApiLoginController.php
View File

@ -31,9 +31,9 @@ class ApiLoginController{
echo '<br>Data:'; echo '<br>Data:';
var_dump($this->data); var_dump($this->data);
echo 'Metoda: '.$this->method;*/ echo 'Metoda: '.$this->method;*/
// Izvedemo akcijo // Izvedemo akcijo
$login = new ApiLogin(); $login = new ApiLogin();
$login->executeAction($this->params, $this->data, $this->method); $login->executeAction($this->params, $this->data, $this->method);
} }

4
frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
View File

@ -20,7 +20,7 @@
</div> </div>
<div class="w-form"> <div class="w-form">
<form name="registracija" id="registracija-uporabnika" class="{{ jezik }}" action="{{ register_url }}" method="post"> <div name="registracija" id="registracija-uporabnika" class="{{ jezik }}" action="{{ register_url }}" method="post">
<input type="hidden" name="jezik" value="{{ jezik }}"/> <input type="hidden" name="jezik" value="{{ jezik }}"/>
<div class="w-clearfix"> <div class="w-clearfix">
@ -89,7 +89,7 @@
</div> </div>
</form> </div>
</div> </div>

4814
frontend/drupal9/web/themes/custom/pro1ka/css/style.css
View File

File diff suppressed because it is too large Load Diff

33
frontend/drupal9/web/themes/custom/pro1ka/js/nakupovanje.js Normal file
View File

@ -0,0 +1,33 @@
/**
* JS povezani z nakupom
*/
(function ($) {
'use strict';
jQuery(document).ready(function () {
jQuery('.cas-trajanja .mesec').on('click', function(){
var trajanje = jQuery('[name="trajanje"]:checked').val();
jQuery('#prikazTrajanjeSt').text(trajanje);
var mesecIme = jQuery('#prikazTrajanjeMesec').attr('data-text');
if(trajanje == 1){
mesecIme = mesecIme.substring(0, mesecIme.length-2);
} else if(trajanje == 3){
mesecIme = mesecIme.substring(0, mesecIme.length-1);
}
jQuery('#prikazTrajanjeMesec').text(mesecIme);
});
});
})(jQuery);

60
frontend/drupal9/web/themes/custom/pro1ka/js/script.js
View File

@ -273,14 +273,16 @@
event.preventDefault(); event.preventDefault();
var sendVariables = jQuery('#registracija-uporabnika').serialize(); var sendVariables = jQuery('#registracija-uporabnika :input').serialize();
sendVariables += '&ajax=1'; sendVariables += '&ajax=1';
jQuery.post('/frontend/api/api.php?action=register', sendVariables, function (data) { jQuery.post('/api/drupal/register', sendVariables, function (data) {
jQuery('.napaka-registracija').hide();
var response = JSON.parse(data); var response = JSON.parse(data);
jQuery('.error-field').removeClass('error-field'); jQuery('.error-field').removeClass('error-field');
if (response.success && response.success == 1) { if (response.type && response.type == 'success') {
jQuery('#reg-confirm-email').text(jQuery('#register-form [name="email"]').val()); jQuery('#reg-confirm-email').text(jQuery('#register-form [name="email"]').val());
jQuery('#reg-confirm-ime').text(jQuery('#register-form [name="ime"]').val()); jQuery('#reg-confirm-ime').text(jQuery('#register-form [name="ime"]').val());
jQuery('#reg-confirm-geslo').text('****'); jQuery('#reg-confirm-geslo').text('****');
@ -309,32 +311,34 @@
} else { } else {
// Izpišemo napake // Izpišemo napake
if (response.napaka && response.napaka.length > 0) { if(response.type == 'error') {
jQuery('.napaka-registracija').show(); if (response.data.napaka && response.data.napaka.length > 0) {
jQuery('.napaka-registracija').show();
var napake = ''; var napake = '';
jQuery.each(response.napaka, function (key, val) { jQuery.each(response.data.napaka, function (key, val) {
napake += '<div>' + val + '</div>'; napake += '<div>' + val + '</div>';
}); });
jQuery('.napaka-registracija').html(napake); jQuery('.napaka-registracija').html(napake);
}
if (response.error_email) {
jQuery('#register-form [name="email"]').addClass('error-field');
}
if (response.error_ime) {
jQuery('#register-form [name="ime"]').addClass('error-field');
}
if (response.error_geslo) {
jQuery('#register-form [name="geslo"]').addClass('error-field');
jQuery('#register-form [name="geslo2"]').addClass('error-field');
}
} }
if (response.error_email) { if (response.data.new_username.length > 0) {
jQuery('#register-form [name="email"]').addClass('error-field'); jQuery('#register-form #registracija-vzdevek').val(response.data.new_username);
}
if (response.error_ime) {
jQuery('#register-form [name="ime"]').addClass('error-field');
}
if (response.error_geslo) {
jQuery('#register-form [name="geslo"]').addClass('error-field');
jQuery('#register-form [name="geslo2"]').addClass('error-field');
}
if (response.new_username.length > 0) {
jQuery('#register-form #registracija-vzdevek').val(response.new_username);
} }
//Ponastavi reCaptcho //Ponastavi reCaptcho
@ -356,13 +360,13 @@
jQuery('#reg-confirm-next').on('click', function (event) { jQuery('#reg-confirm-next').on('click', function (event) {
event.preventDefault(); event.preventDefault();
var sendVariables = jQuery('#registracija-uporabnika').serialize(); var sendVariables = jQuery('#registracija-uporabnika :input').serialize();
sendVariables += '&ajax=1'; sendVariables += '&ajax=1';
jQuery.post('/frontend/api/api.php?action=register_confirm', sendVariables, function (data) { jQuery.post('/api/drupal/register_confirm', sendVariables, function (data) {
var response = JSON.parse(data); var response = JSON.parse(data);
if (response.success && response.success == 1) { if (response.type && response.type == 'success') {
var text = jQuery('#register-form-email-sent').html().replace("SFMAIL", jQuery('#reg-confirm-email').text()); var text = jQuery('#register-form-email-sent').html().replace("SFMAIL", jQuery('#reg-confirm-email').text());
jQuery('#register-form-email-sent').html(text); jQuery('#register-form-email-sent').html(text);

1
frontend/drupal9/web/themes/custom/pro1ka/pro1ka.libraries.yml
View File

@ -10,6 +10,7 @@ global-styling:
# js/enka-21.js: {} # js/enka-21.js: {}
js/script.js: {} js/script.js: {}
js/login.js: {} js/login.js: {}
js/nakupovanje.js: {}
js/modernizr-custom.js: {} js/modernizr-custom.js: {}
dependencies: dependencies:

19
frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss
View File

@ -163,6 +163,21 @@
margin-top: -10px; margin-top: -10px;
} }
.registracija {
#gdpr-vec-text {
display: none;
}
}
#register-form-confirm{
display: none;
}
#register-form-email-sent {
display: none;
}
} }
} }
@ -246,6 +261,7 @@
background: #ff000024; background: #ff000024;
padding: 0.25rem 0.75rem; padding: 0.25rem 0.75rem;
color: red; color: red;
display: none;
} }
} }
@ -328,3 +344,6 @@
} }
} }
} }

6
frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
View File

@ -27,7 +27,7 @@
<h1 class="slider-title">Do dragocenih vpogledov z enim klikom</h1> <h1 class="slider-title">Do dragocenih vpogledov z enim klikom</h1>
<p class="slider-subtitle">ZMOGLJIVO, HITRO IN ENOSTAVNO ORODJE ZA ANKETIRANJE</p> <p class="slider-subtitle">ZMOGLJIVO, HITRO IN ENOSTAVNO ORODJE ZA ANKETIRANJE</p>
<div class="buttons-row"> <div class="buttons-row">
<a href="#" class="button main-button w-inline-block"> <a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
<div class="button-flyin main" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div> <div class="button-flyin main" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div>
<div class="button-label">Ustvarite brezplačno anketo</div> <div class="button-label">Ustvarite brezplačno anketo</div>
<img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg); transform-style: preserve-3d;"> <img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg); transform-style: preserve-3d;">
@ -294,7 +294,7 @@
{# Gumb #} {# Gumb #}
<div class="row flex-desna flex"> <div class="row flex-desna flex">
<div class="gumb"> <div class="gumb">
<a href="#" class="button shrink main-button w-inline-block" class="ustvari-anketo"> <a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button shrink main-button w-inline-block" class="ustvari-anketo">
<div class="button-label">Ustvarite anketo</div> <div class="button-label">Ustvarite anketo</div>
<img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" class="button-right-arrow"> <img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" class="button-right-arrow">
<div class="button-flyin"></div> <div class="button-flyin"></div>
@ -356,7 +356,7 @@
<div class="row flex"> <div class="row flex">
<div class="col c-33 gumb"> <div class="col c-33 gumb">
<div class="buttons-row buttons-center" style="width: 200px"> <div class="buttons-row buttons-center" style="width: 200px">
<a href="#" class="button main-button w-inline-block"> <a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button w-inline-block">
<div class="button-label">Ustvarite anketo</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d;"> <div class="button-label">Ustvarite anketo</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d;">
<div class="button-flyin" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div> <div class="button-flyin" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div>
</a> </a>

174
frontend/drupal9/web/themes/custom/pro1ka/templates/page--nakup-paketa.html.twig
View File

@ -33,7 +33,7 @@
</span> </span>
</div> </div>
<div class="col packet"> <div class="col packet">
<input type="radio" id="paket3ka" name="package_id" <input type="radio" id="paket3ka" name="package_id"
value="3" {% if paket == 3 %} checked="checked" {% endif %}> value="3" {% if paket == 3 %} checked="checked" {% endif %}>
<span class="paket col packet"> <span class="paket col packet">
@ -292,9 +292,17 @@
<div class="desna"> <div class="desna">
<div class="dleva"> <div class="dleva">
<h3>Informacije o naročilu</h3> <h3>Informacije o naročilu</h3>
<h4>{% if paket == 2 %} Paket 2ka {% else %} Paket 3ka {% endif %}</h4> <h4>
X mesece {% if paket == 2 %}
<h4>Način plačila: XZY</h4> Paket <span id="prikazStPaketa">2</span>ka
{% else %}
Paket <span id="prikazStPaketa">3</span>ka
{% endif %}
</h4>
<div class="prikazTrajanje">
<span id="prikazTrajanjeSt"></span> <span id="prikazTrajanjeMesec" data-text="mesecev"></span>
</div>
<h4>Način plačila: <span id="prikazNacinPlacila"></span></h4>
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
<div class="text-small">*Naročnina se zaračuna v enkratnem znesku.</div> <div class="text-small">*Naročnina se zaračuna v enkratnem znesku.</div>
{% else %} {% else %}
@ -319,7 +327,7 @@
{% endif %} {% endif %}
</h1> </h1>
</div> #} </div> #}
<div class="w-clearfix pregled-narocila"> <div class="w-clearfix pregled-narocila">
<div class="col _narocilo"> <div class="col _narocilo">
<div class="col"> <div class="col">
@ -331,56 +339,56 @@
</div> </div>
<div class="col"> <div class="col">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Zakup paketa za: Zakup paketa za:
{% else %} {% else %}
Package lease for: Package lease for:
{% endif %} {% endif %}
<span id="forma-trajanje">/</span> <span id="forma-trajanje">/</span>
</div> </div>
<div class="col"> <div class="col">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Elektronski naslov: Elektronski naslov:
{% else %} {% else %}
E-mail address: E-mail address:
{% endif %} {% endif %}
<span id="forma-email">/</span> <span id="forma-email">/</span>
</div> </div>
<div class="col podatki-za-placilo-racuna" data-clarity-mask="True"> <div class="col podatki-za-placilo-racuna" data-clarity-mask="True">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Ime in priimek: Ime in priimek:
{% else %} {% else %}
First and last name: First and last name:
{% endif %} {% endif %}
<span id="forma-ime">/</span> <span id="forma-ime">/</span>
</div> </div>
<div class="col" style="display: none;" id="col-forma-telefon" data-clarity-mask="True"> <div class="col" style="display: none;" id="col-forma-telefon" data-clarity-mask="True">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Telefon: Telefon:
{% else %} {% else %}
Phone: Phone:
{% endif %} {% endif %}
<span id="forma-telefon">/</span> <span id="forma-telefon">/</span>
</div> </div>
<div class="col" id="col-forma-d-drzava" data-clarity-mask="True"> <div class="col" id="col-forma-d-drzava" data-clarity-mask="True">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Država: Država:
{% else %} {% else %}
Country: Country:
{% endif %} {% endif %}
<span id="forma-d-drzava" data-clarity-mask="True">/</span> <span id="forma-d-drzava" data-clarity-mask="True">/</span>
</div> </div>
<!-- Račun na podjetje --> <!-- Račun na podjetje -->
<div class="podatki-za-podjetje"> <div class="podatki-za-podjetje">
<div class="col"> <div class="col">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Naziv podjetja: Naziv podjetja:
{% else %} {% else %}
Company name: Company name:
{% endif %} {% endif %}
<span id="forma-p-naziv" data-clarity-mask="True">/</span> <span id="forma-p-naziv" data-clarity-mask="True">/</span>
</div> </div>
<div class="col p-e-racun" style="display: none;"> <div class="col p-e-racun" style="display: none;">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
E-račun (proračunski uporabnik): <span> Da</span> E-račun (proračunski uporabnik): <span> Da</span>
@ -388,12 +396,12 @@
E-invoice (budget user): <span> Yes</span> E-invoice (budget user): <span> Yes</span>
{% endif %} {% endif %}
</div> </div>
<div class="col"> <div class="col">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Naslov: Naslov:
{% else %} {% else %}
Address: Address:
{% endif %} {% endif %}
<span id="forma-d-naslov" data-clarity-mask="True"></span>, <span id="forma-d-postna-st" <span id="forma-d-naslov" data-clarity-mask="True"></span>, <span id="forma-d-postna-st"
data-clarity-mask="True"></span> data-clarity-mask="True"></span>
@ -401,16 +409,16 @@
id="forma-d-posta-ime" data-clarity-mask="True"></span> id="forma-d-posta-ime" data-clarity-mask="True"></span>
</div> </div>
</div> </div>
<div class="col podatki-za-placilo-racuna"> <div class="col podatki-za-placilo-racuna">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Način plačila: Način plačila:
{% else %} {% else %}
Payment method: Payment method:
{% endif %} {% endif %}
<span id="forma-nacin-placila" data-clarity-mask="True">/</span> <span id="forma-nacin-placila" data-clarity-mask="True">/</span>
</div> </div>
<div class="col cena-brez-popusta-sklop"> <div class="col cena-brez-popusta-sklop">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Cena brez popusta: <span class="cena-brez-popusta"> 0,00</span> € <span class="cena-z-ddv-text"> z DDV</span> Cena brez popusta: <span class="cena-brez-popusta"> 0,00</span> € <span class="cena-z-ddv-text"> z DDV</span>
@ -419,7 +427,7 @@
class="cena-z-ddv-text"> including VAT</span> class="cena-z-ddv-text"> including VAT</span>
{% endif %} {% endif %}
</div> </div>
<div class="col oranzna"> <div class="col oranzna">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Skupaj za plačilo: <span class="cena-paketa"> 0,00</span> € <span Skupaj za plačilo: <span class="cena-paketa"> 0,00</span> € <span
@ -428,17 +436,17 @@
Total payment: <span class="cena-paketa"> 0,00</span> € <span class="cena-z-ddv-text"> including VAT</span> Total payment: <span class="cena-paketa"> 0,00</span> € <span class="cena-z-ddv-text"> including VAT</span>
{% endif %} {% endif %}
</div> </div>
<input type="hidden" id="stripe-token" name="stripe-token" value="{{ stripe_key }}" /> <input type="hidden" id="stripe-token" name="stripe-token" value="{{ stripe_key }}" />
</div> </div>
<div class="gumbi"> <div class="gumbi">
<a class="nazaj w-button button secondary-button" href="#" id="nazaj-na-nakup-1ka"> <a class="nazaj w-button button secondary-button" href="#" id="nazaj-na-nakup-1ka">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Popravi naročilo Popravi naročilo
{% else %} {% else %}
Fix the order Fix the order
{% endif %} {% endif %}
</a> </a>
<input type="button" value="{{ prevod['nakup_oddaj_narocilo'] }}" data-wait="..." <input type="button" value="{{ prevod['nakup_oddaj_narocilo'] }}" data-wait="..."
@ -464,13 +472,13 @@
<h1>0 €</h1> <h1>0 €</h1>
</div> </div>
</div> </div>
<div class="w-clearfix procesiram-narocilo"> <div class="w-clearfix procesiram-narocilo">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
<div class="procesiram-narocilo-1 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-1 procesiram-posamezno-narocilo">
Naročilo se obdeluje. Prosimo počakajte trenutek Naročilo se obdeluje. Prosimo počakajte trenutek
</div> </div>
<div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo">
Sedaj vas bomo preusmerili na platformo <span class="procesiram-narocilo-ime">Stripe</span>, kjer Sedaj vas bomo preusmerili na platformo <span class="procesiram-narocilo-ime">Stripe</span>, kjer
boste vnesli podatke za plačilo. boste vnesli podatke za plačilo.
@ -480,7 +488,7 @@
<div class="procesiram-narocilo-1 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-1 procesiram-posamezno-narocilo">
The order is being processed. Please wait a moment The order is being processed. Please wait a moment
</div> </div>
<div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo">
We will now redirect you to the <span class="procesiram-narocilo-ime">Stripe</span> platform, where We will now redirect you to the <span class="procesiram-narocilo-ime">Stripe</span> platform, where
you will enter your payment information. you will enter your payment information.
@ -505,7 +513,7 @@
<form id="narocilo-paketa-podatki" METHOD="post"> <form id="narocilo-paketa-podatki" METHOD="post">
<input type="hidden" name="lang" value="{{ language.id }}" /> <input type="hidden" name="lang" value="{{ language.id }}" />
<input type="hidden" name="narocilo-robotsko-narocilo" value="" /> <input type="hidden" name="narocilo-robotsko-narocilo" value="" />
<div class="accordion"> <div class="accordion">
<div class="accordion-head" data-open="1"> <div class="accordion-head" data-open="1">
<div class="div-block-12 w-clearfix"> <div class="div-block-12 w-clearfix">
@ -541,7 +549,7 @@
{% endif %} {% endif %}
</label> </label>
</span> </span>
<input type="radio" id="paket3ka" name="package_id" <input type="radio" id="paket3ka" name="package_id"
value="3" {% if paket == 3 %} checked="checked" {% endif %}> value="3" {% if paket == 3 %} checked="checked" {% endif %}>
<span class="paket"> <span class="paket">
@ -555,7 +563,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop izbira cas-trajanja"> <div class="sklop izbira cas-trajanja">
<h4> <h4>
@ -577,7 +585,7 @@
{% endif %} {% endif %}
</label> </label>
</span> </span>
<input type="radio" id="trajanje3m" name="trajanje" value="3" required="required"> <input type="radio" id="trajanje3m" name="trajanje" value="3" required="required">
<span class="mesec"> <span class="mesec">
<label for="trajanje3m"> <label for="trajanje3m">
@ -590,7 +598,7 @@
{% endif %} {% endif %}
</label> </label>
</span> </span>
<input type="radio" id="trajanje12m" name="trajanje" value="12" required="required"> <input type="radio" id="trajanje12m" name="trajanje" value="12" required="required">
<span class="mesec"> <span class="mesec">
<label for="trajanje12m"> <label for="trajanje12m">
@ -605,7 +613,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop izbira cas-trajanja"> <div class="sklop izbira cas-trajanja">
<div id="skupaj-placilo"> <div id="skupaj-placilo">
@ -635,14 +643,14 @@
of a discount (proportional part for the unused period). of a discount (proportional part for the unused period).
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="accordion podatki-za-placilo-racuna"> <div class="accordion podatki-za-placilo-racuna">
<div class="accordion-head" data-open="2"> <div class="accordion-head" data-open="2">
<div class="div-block-12 w-clearfix"> <div class="div-block-12 w-clearfix">
@ -656,7 +664,7 @@
</div> </div>
</div> </div>
<div class="accordion-toggle data-2"> <div class="accordion-toggle data-2">
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="email" id="f-email" <input type="email" id="f-email"
@ -671,7 +679,7 @@
> >
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="text" id="f-ime" class="input-field w-input" name="ime" value="" size="30" <input type="text" id="f-ime" class="input-field w-input" name="ime" value="" size="30"
@ -679,8 +687,8 @@
required="required"> required="required">
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<select name="podjetje_drzava" class="input-field w-input" id="polje-drzava" <select name="podjetje_drzava" class="input-field w-input" id="polje-drzava"
@ -693,7 +701,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<div class="checkbox-field w-checkbox racun-na-podjetje"> <div class="checkbox-field w-checkbox racun-na-podjetje">
@ -712,7 +720,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="podatki-za-podjetje"> <div class="podatki-za-podjetje">
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
@ -722,8 +730,8 @@
placeholder="{{ prevod['placeholder_podjetje_davcna'] }}"> placeholder="{{ prevod['placeholder_podjetje_davcna'] }}">
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_ime" <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_ime"
@ -731,7 +739,7 @@
placeholder="{{ prevod['placeholder_podjetje_ime'] }}"> placeholder="{{ prevod['placeholder_podjetje_ime'] }}">
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="text" class="input-field w-input polje-za-podjetje" <input type="text" class="input-field w-input polje-za-podjetje"
@ -740,7 +748,7 @@
placeholder="{{ prevod['placeholder_podjetje_naslov'] }}"> placeholder="{{ prevod['placeholder_podjetje_naslov'] }}">
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="text" class="input-field w-input polje-za-podjetje" <input type="text" class="input-field w-input polje-za-podjetje"
@ -749,7 +757,7 @@
placeholder="{{ prevod['placeholder_podjetje_postna'] }}"> placeholder="{{ prevod['placeholder_podjetje_postna'] }}">
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="text" class="input-field w-input polje-za-podjetje" <input type="text" class="input-field w-input polje-za-podjetje"
@ -758,7 +766,7 @@
placeholder="{{ prevod['placeholder_podjetje_ime_poste'] }}"> placeholder="{{ prevod['placeholder_podjetje_ime_poste'] }}">
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<div class="checkbox-field w-checkbox polje-za-podjetje" id="polje-podjetje-eracun" <div class="checkbox-field w-checkbox polje-za-podjetje" id="polje-podjetje-eracun"
@ -778,10 +786,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="w-clearfix"> <div class="w-clearfix">
<div class="sklop"> <div class="sklop">
<input type="text" id="f-telefon" class="input-field w-input " name="phone" value="" <input type="text" id="f-telefon" class="input-field w-input " name="phone" value=""
@ -791,7 +799,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="accordion podatki-za-placilo-racuna"> <div class="accordion podatki-za-placilo-racuna">
<div class="accordion-head" data-open="3"> <div class="accordion-head" data-open="3">
<div class="div-block-12 w-clearfix"> <div class="div-block-12 w-clearfix">
@ -805,7 +813,7 @@
</div> </div>
</div> </div>
<div class="accordion-toggle data-3"> <div class="accordion-toggle data-3">
<div class="w-clearfix"> <div class="w-clearfix">
<div class="izbira paketov {{ language.id }}"> <div class="izbira paketov {{ language.id }}">
<input type="radio" id="paymentMethod1" name="payment_method" value="1" <input type="radio" id="paymentMethod1" name="payment_method" value="1"
@ -819,7 +827,7 @@
{% endif %} {% endif %}
</label> </label>
</span> </span>
<input type="radio" id="paymentMethod2" name="payment_method" value="2" <input type="radio" id="paymentMethod2" name="payment_method" value="2"
required="required"> required="required">
<span class="paket vrsta-placila"> <span class="paket vrsta-placila">
@ -833,7 +841,7 @@
<img src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' <img src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='
data-src="/d/sites/all/themes/pro1ka/img/paypal_logo.png" class="logo b-lazy"> data-src="/d/sites/all/themes/pro1ka/img/paypal_logo.png" class="logo b-lazy">
</span> </span>
<input type="radio" id="paymentMethod3" name="payment_method" value="3" <input type="radio" id="paymentMethod3" name="payment_method" value="3"
required="required"> required="required">
<span class="paket vrsta-placila"> <span class="paket vrsta-placila">
@ -850,7 +858,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class='col w-clearfix tuje-bancno-nakazilo' style='padding-top: 4rem;display: none;'> <div class='col w-clearfix tuje-bancno-nakazilo' style='padding-top: 4rem;display: none;'>
<div class='sklop'> <div class='sklop'>
<div class='checkbox-field w-checkbox'> <div class='checkbox-field w-checkbox'>
@ -882,15 +890,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="gumbi"> <div class="gumbi">
<div class="posamezni"> <div class="posamezni">
<a class="nazaj" href="/d/"> <a class="nazaj" href="/d/">
{{ prevod['nakup_nazaj'] }} {{ prevod['nakup_nazaj'] }}
</a> </a>
</div> </div>
<div class="posamezni"> <div class="posamezni">
<input type="button" value="{{ prevod['nakup_naprej'] }}" <input type="button" value="{{ prevod['nakup_naprej'] }}"
data-wait="Prosim počakajte..." class="submit-btn naprej w-button"> data-wait="Prosim počakajte..." class="submit-btn naprej w-button">
@ -899,8 +907,8 @@
</form> </form>
</div> </div>
</div> </div>
<!-- Predogled naročila --> <!-- Predogled naročila -->
<div id="predogled-nakupa-1ka" class="nakup-1ka" data-clarity-mask="True"> <div id="predogled-nakupa-1ka" class="nakup-1ka" data-clarity-mask="True">
<div class="header"> <div class="header">
@ -912,7 +920,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="w-clearfix pregled-narocila"> <div class="w-clearfix pregled-narocila">
<div class="col _narocilo"> <div class="col _narocilo">
<div class="col"> <div class="col">
@ -962,7 +970,7 @@
{% endif %} {% endif %}
<span id="forma-d-drzava" data-clarity-mask="True">/</span> <span id="forma-d-drzava" data-clarity-mask="True">/</span>
</div> </div>
<!-- Račun na podjetje --> <!-- Račun na podjetje -->
<div class="podatki-za-podjetje"> <div class="podatki-za-podjetje">
<div class="col"> <div class="col">
@ -973,7 +981,7 @@
{% endif %} {% endif %}
<span id="forma-p-naziv" data-clarity-mask="True">/</span> <span id="forma-p-naziv" data-clarity-mask="True">/</span>
</div> </div>
<div class="col p-e-racun" style="display: none;"> <div class="col p-e-racun" style="display: none;">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
E-račun (proračunski uporabnik): <span>Da</span> E-račun (proračunski uporabnik): <span>Da</span>
@ -981,7 +989,7 @@
E-invoice (budget user): <span>Yes</span> E-invoice (budget user): <span>Yes</span>
{% endif %} {% endif %}
</div> </div>
<div class="col"> <div class="col">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Naslov: Naslov:
@ -994,7 +1002,7 @@
id="forma-d-posta-ime" data-clarity-mask="True"></span> id="forma-d-posta-ime" data-clarity-mask="True"></span>
</div> </div>
</div> </div>
<div class="col podatki-za-placilo-racuna"> <div class="col podatki-za-placilo-racuna">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Način plačila: Način plačila:
@ -1003,7 +1011,7 @@
{% endif %} {% endif %}
<span id="forma-nacin-placila" data-clarity-mask="True">/</span> <span id="forma-nacin-placila" data-clarity-mask="True">/</span>
</div> </div>
<div class="col cena-brez-popusta-sklop"> <div class="col cena-brez-popusta-sklop">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Cena brez popusta: <span class="cena-brez-popusta">0,00</span> € <span class="cena-z-ddv-text">z DDV</span> Cena brez popusta: <span class="cena-brez-popusta">0,00</span> € <span class="cena-z-ddv-text">z DDV</span>
@ -1012,7 +1020,7 @@
class="cena-z-ddv-text">including VAT</span> class="cena-z-ddv-text">including VAT</span>
{% endif %} {% endif %}
</div> </div>
<div class="col oranzna"> <div class="col oranzna">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
Skupaj za plačilo: <span class="cena-paketa">0,00</span> € <span Skupaj za plačilo: <span class="cena-paketa">0,00</span> € <span
@ -1021,11 +1029,11 @@
Total payment: <span class="cena-paketa">0,00</span> € <span class="cena-z-ddv-text">including VAT</span> Total payment: <span class="cena-paketa">0,00</span> € <span class="cena-z-ddv-text">including VAT</span>
{% endif %} {% endif %}
</div> </div>
<input type="hidden" id="stripe-token" name="stripe-token" value="{{ stripe_key }}" /> <input type="hidden" id="stripe-token" name="stripe-token" value="{{ stripe_key }}" />
</div> </div>
<div class="gumbi"> <div class="gumbi">
<div> <div>
<a class="nazaj" href="#" id="nazaj-na-nakup-1ka"> <a class="nazaj" href="#" id="nazaj-na-nakup-1ka">
@ -1043,13 +1051,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="w-clearfix procesiram-narocilo"> <div class="w-clearfix procesiram-narocilo">
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
<div class="procesiram-narocilo-1 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-1 procesiram-posamezno-narocilo">
Naročilo se obdeluje. Prosimo počakajte trenutek Naročilo se obdeluje. Prosimo počakajte trenutek
</div> </div>
<div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo">
Sedaj vas bomo preusmerili na platformo <span class="procesiram-narocilo-ime">Stripe</span>, kjer Sedaj vas bomo preusmerili na platformo <span class="procesiram-narocilo-ime">Stripe</span>, kjer
boste vnesli podatke za plačilo. boste vnesli podatke za plačilo.
@ -1059,7 +1067,7 @@
<div class="procesiram-narocilo-1 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-1 procesiram-posamezno-narocilo">
The order is being processed. Please wait a moment The order is being processed. Please wait a moment
</div> </div>
<div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo"> <div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo">
We will now redirect you to the <span class="procesiram-narocilo-ime">Stripe</span> platform, where We will now redirect you to the <span class="procesiram-narocilo-ime">Stripe</span> platform, where
you will enter your payment information. you will enter your payment information.
@ -1068,4 +1076,4 @@
{% endif %} {% endif %}
</div> </div>
</div> #} </div> #}
</div> </div>

2
frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig
View File

@ -6,7 +6,7 @@
<div class="div-block-17"> <div class="div-block-17">
<h3 class="side-title">Orodje za anketiranje 1KA lahko z omejenimi funkcionalnostmi preizkusite tudi brezplačno</h3> <h3 class="side-title">Orodje za anketiranje 1KA lahko z omejenimi funkcionalnostmi preizkusite tudi brezplačno</h3>
<div class="buttons-row"> <div class="buttons-row">
<a href="#" class="button main-button-white shrink w-inline-block"> <a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button-white shrink w-inline-block {% if uporabnik is empty%}modal-goto-registration{% endif %}">
<div class="button-label">Preizkusite</div><img src="/tema1ka/svg/icons8-chevron-right.svg" loading="lazy" alt="" class="button-right-arrow"> <div class="button-label">Preizkusite</div><img src="/tema1ka/svg/icons8-chevron-right.svg" loading="lazy" alt="" class="button-right-arrow">
<div class="button-flyin main"></div> <div class="button-flyin main"></div>
</a> </a>

2
frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
View File

@ -30,7 +30,7 @@
{# LOGO #} {# LOGO #}
<a href="/" class="inline-block 1ka-clearfix"> <a href="/d/{{ language.id }}" class="inline-block 1ka-clearfix">
<img src="/tema1ka/svg/1ka_logo_{{ language.id ?? 'sl' }}.svg" loading="lazy" alt="Logo 1ka" class="logo"> <img src="/tema1ka/svg/1ka_logo_{{ language.id ?? 'sl' }}.svg" loading="lazy" alt="Logo 1ka" class="logo">
</a> </a>