Popravki pri nakupovanju in prijavi v administratorja

frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-obnovitev-gesla-block.html.twig

@@ -11,10 +11,9 @@
                 </div>
             </div>
 
-
             {#            // LOGIN FORMA#}
             <div class="w-form">
-              <form name="Obnovitev gesla" id="obnovitev-gesla" action="/api/drupal/obnovitev-gesla" method="post">
+              <div name="Obnovitev gesla" id="obnovitev-gesla" method="post">
                 <input type="hidden" name="jezik" value="{{  jezik }}"/>
 
                 <div class="w-clearfix">
@@ -37,14 +36,12 @@
                   </a>
                 </div>
               </div>
-
+            </div>
-
 
             <div class="error-message" id="error-lost-password">
                 <div>'{{  error }}</div>
             </div>
 
-
             <div class="w-form-done"></div>
 
     </div>

frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php

@@ -208,7 +208,7 @@ class NarociloController extends ControllerBase
                 'placeholder_ime' => 'Vpišite vaše ime in priimek (obvezno)',
                 'nakup_select_disabled_drzava' => 'Izberite državo',
                 'nakup_email_title' => 'E-naslova ni mogoče spremeniti. To je e-naslov s katerim ste prijavljeni v 1KA in bo nanj vezan paket, ki ga boste kupili.',
-                'nakup_naprej' => 'Naprej',
+                'nakup_naprej' => 'Naslednji korak',
                 'nakup_nazaj' => 'Nazaj',
                 'nakup_oddaj_narocilo' => 'Oddaj naročilo',
                 'poslovni_ime' => 'Ime in priimek (kontaktna oseba)',

frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml

@@ -11,7 +11,7 @@ trgovina_1ka.izvedi_nakup:
   path: '/izvedi-nakup/{paket}/podatki'
   defaults:
     _controller: '\Drupal\trgovina_1ka\Controller\NarociloController::nakupPaketa'
-    _title: 'Nakup izbranega paketa'
+    _title: 'Nakup paketa'
   requirements:
     _access: 'TRUE'
 

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

@@ -1,3 +1,22 @@
+input.form-text, input.form-submit{
+  display: block;
+  width: 100%;
+  height: 38px;
+  padding: 8px 12px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 1.428571429;
+  color: #333;
+  vertical-align: middle;
+  background-color: #fff;
+  border: 1px solid #ccc;
+}
+input.form-submit{
+  background: #1e88e5;
+  color: #ffffff;
+}
+
+
 input.error-field {
     border-color: $rdeca !important;
 }

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

@@ -269,3 +269,47 @@
 
 
 }
+
+nav.tabs {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  margin-top: 40px;
+  margin-bottom: 40px;
+  -webkit-box-pack:start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: center;
+  justify-content: flex-start;
+  border-bottom: 1px none #b3d8eb;
+
+  li{
+    margin-right: 20px;
+    margin-left: 20px;
+    border-bottom: 2px solid #d3d3d3;
+    font-size: 20px;
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    text-decoration: none;
+    padding: 9px 30px;
+    text-align: left;
+    cursor: pointer;
+
+    a {
+      background: none;
+      color: #999;
+
+      &:hover, &.is-active{
+        background-color: #fff;
+        color: #1e88e5;
+      }
+    }
+
+    &:hover, &.is-active{
+      border-bottom-color: #1e88e5;
+      background-color: #fff;
+      color: #1e88e5;
+    }
+  }
+}

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

@@ -87,6 +87,12 @@
 
 #predogled-nakupa-1ka {
   display: none;
+
+  .naslov-predogled{
+    h1{
+      margin-bottom: 0;
+    }
+  }
 }
 
 .nakup-1ka {
@@ -355,12 +361,14 @@
     .col {
       padding-top: 6px;
       display: flex;
-    }
+      flex-direction: column;
-  }
+      padding-right: 0;
-
+      padding-left: 0;
-  .pregled-narocila {
-    span {
       font-weight: bold;
+
+      span{
+        font-weight: normal;
+      }
     }
   }
 

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

@@ -297,7 +297,7 @@
     <!-- Predogled naročila -->
     <div id="predogled-nakupa-1ka" class="nakup-1ka" data-clarity-mask="True">
         <div class="leva">
-            {# <div>
+            <div class="naslov-predogled">
                 <h1>
                     {% if language.id == 'sl' %}
                         Predogled vašega naročila
@@ -305,25 +305,17 @@
                         Preview your order
                     {% endif %}
                 </h1>
-            </div> #}
+            </div>
 
             <div class="w-clearfix pregled-narocila">
                 <div class="col _narocilo">
-                    <div class="col">
+                    <h4>
                       {% if language.id == 'sl' %}
-                            Vrsta paketa: <span> Paket <span class="prikazStPaketa">1</span>ka</span>
+                        Preverite svoje podatke
                       {% else %}
-                            Package type: <span> Package <span class="prikazStPaketa">1</span>ka</span>
+                        Check your data
                       {% endif %}
-                    </div>
+                    </h4>
-                    <div class="col">
-                        {% if language.id == 'sl' %}
-                            Zakup paketa za:
-                        {% else %}
-                            Package lease for:
-                        {% endif %}
-                      <span class="prikazTrajanjeSt">/</span> <span class="prikazTrajanjeMesec" data-text="mesecev"></span>
-                    </div>
                     <div class="col">
                         {% if language.id == 'sl' %}
                             Elektronski naslov:
@@ -340,14 +332,6 @@
                         {% endif %}
                         <span id="forma-ime">/</span>
                     </div>
-                    <div class="col" style="display: none;" id="col-forma-telefon" data-clarity-mask="True">
-                        {% if language.id == 'sl' %}
-                            Telefon:
-                        {% else %}
-                            Phone:
-                        {% endif %}
-                        <span id="forma-telefon">/</span>
-                    </div>
                     <div class="col" id="col-forma-d-drzava" data-clarity-mask="True">
                         {% if language.id == 'sl' %}
                             Država:
@@ -356,6 +340,14 @@
                         {% endif %}
                         <span id="forma-d-drzava" data-clarity-mask="True">/</span>
                     </div>
+                    <div class="col" style="display: none;" id="col-forma-telefon" data-clarity-mask="True">
+                      {% if language.id == 'sl' %}
+                        Telefon:
+                      {% else %}
+                        Phone:
+                      {% endif %}
+                      <span id="forma-telefon">/</span>
+                    </div>
 
                     <!--        Račun na podjetje -->
                     <div class="podatki-za-podjetje">
@@ -398,23 +390,23 @@
                         <span id="forma-nacin-placila" data-clarity-mask="True">/</span>
                     </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>#}
-                        {% else %}
+{#                        {% else %}#}
-                            Price without discount: <span class="cena-brez-popusta"> 0,00</span> € <span
+{#                            Price without discount: <span class="cena-brez-popusta"> 0,00</span> € <span#}
-                                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#}
-                                class="cena-z-ddv-text"> z DDV</span>
+{#                                class="cena-z-ddv-text"> z DDV</span>#}
-                        {% else %}
+{#                        {% else %}#}
-                            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 }}" />