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

frontend/api/class.ApiLogin.php

@@ -256,8 +256,7 @@ class ApiLogin
                         if ($cookie_pass != $r[0]) {
                             // najprej poradiraij cookije!
                             setcookie('uid', "", time() - 3600, $cookie_domain);
-                            setcookie('secret', "", time() - 3600,
+                            setcookie('secret', "", time() - 3600, $cookie_domain);
-                              $cookie_domain);
 
                             if (substr_count($cookie_domain, ".") > 1) {
                                 $nd = substr($cookie_domain,
@@ -1257,8 +1256,7 @@ class ApiLogin
         if (!empty($error)) {
 
             if($ajaxKlic){
-               echo json_encode($this->preveriNapake($error));
+                return $this->ajaxResponse('error', $this->preveriNapake($error));
-               die();
             }
 
             // Ime in email posljemo nazaj v urlju

frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module

@@ -119,12 +119,15 @@ function prijava_1ka_theme()
 function prijava_1ka_preprocess(&$variables)
 {
   if(!empty($variables['plugin_id']) && in_array($variables['plugin_id'], [
+      'prijava_intro_block',
       'prijava_block',
       'prijava_obnovitev_gesla_block',
       'prijava_obnovitev_gesla_aktivacija_blok',
       'prijava_podatki_o_uporabniku_block'
     ])
   ){
-    $variables['#cache'] ['max-age'] = 0;
+    $variables['#cache']['max-age'] = 0;
   }
+
+  return $variables;
 }

frontend/drupal9/web/themes/custom/pro1ka/js/login.js

@@ -68,7 +68,7 @@
         jQuery('#modal-lost-password  .w-form-fail').hide();
 
         if (val.type == 'success') {
-          jQuery('#modal-lost-password  .w-form-done').html('<div>' + val.text + '</div>').show();
+          jQuery('#modal-lost-password  .w-form-done').html('<div>' + val.data.text + '</div>').show();
 
           // Če je bil email uspešno poslal potem okno zapremo po 5 sekundah
           setTimeout(function () {
@@ -488,7 +488,7 @@ function odpriAaiLoginObvestilo(){
       jQuery('.nakup-prijava').css('display', 'flex');
     }
   } else {
-    jQuery('#modal-open-login-obrazec').css('display', 'flex');
+    jQuery('#modal-login').css('display', 'flex');
   }
 }
 

frontend/drupal9/web/themes/custom/pro1ka/js/script.js

@@ -71,9 +71,9 @@
         var jezikText = jQuery('.language-link:not(.is-active)').text().substring(0, 3);
         jQuery('.language-link').text(jezikText);
 
-
+        function pridobiJezik() {
-
+          return jQuery('html')[0].lang;
-
+        }
 
         /**
          * Napredno iskanje
@@ -211,8 +211,14 @@
           jQuery('.modal-intro-title').hide();
           jQuery('.modal-intro-registration-text').css('display', 'flex');
 
+          if(pridobiJezik() == 'sl') {
             jQuery('#modal-open-1ka').removeClass('modal-open-login-obrazec').addClass('modal-goto-registration');
             jQuery('#modal-info-login').css('display', 'flex');
+          }
+          else{
+            jQuery('.rexister-modal').hide();
+            jQuery('#modal-registration').css('display', 'flex');
+          }
         });
 
         jQuery('.modal-open-intro-obrazec').on('click', function () {

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

@@ -353,6 +353,7 @@
 
         &:hover {
           background: #f8f8f8;
+          //background: rgba(30, 136, 229, 0.05);
         }
 
         img {

frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig

@@ -87,9 +87,9 @@ END HEADER #}
                         </li>
                       </ul>
                       {% if email_uporabnika %}
-                        <a href="/admin/survey" class="button-pricechart pcb1 w-button">Preizkusi brezplačno</a>
+                        <a href="/admin/survey" class="button-pricechart pcb1 w-button brezplacni-nakup-samo-registracija">Preizkusi brezplačno</a>
                       {%  else %}
-                        <a href="#" class="button-pricechart pcb1 w-button">Preizkusi brezplačno</a>
+                        <a href="#" class="button-pricechart pcb1 w-button brezplacni-nakup-samo-registracija">Preizkusi brezplačno</a>
                       {% endif %}
                     </div>
                   </div>

utils/Docker/docker-compose.yml

@@ -55,7 +55,7 @@ services:
             - PMA_HOST=mysql
             - PMA_PORT=3306
             - UPLOAD_LIMIT=300M
-            - MAX_EXECUTION_TIME=300
+            - MAX_EXECUTION_TIME=1200
             - MEMORY_LIMIT=1024M
             - REALPATH_CACHE_SIZE=32M
         networks: