From f59b609dd925ac05c1031978a44151ae09a71269 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 16 Jun 2022 15:16:08 +0200 Subject: [PATCH] Popravek linkov pri trgovini --- .../src/Controller/NarociloController.php | 2 +- .../trgovina_1ka/trgovina_1ka.routing.yml | 2 +- .../page--paketi-poslovni-uporabniki.html.twig | 6 +++--- .../templates/page--paketi-zasebni.html.twig | 18 +++++++++++++++--- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php index 2b28e3e42..bce2fbaca 100644 --- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php +++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php @@ -153,7 +153,7 @@ class NarociloController extends ControllerBase 'language' => Drupal::languageManager()->getCurrentLanguage(), 'country_list' => $this->countryList(), 'stripe_key' => 'strikepkey', - 'email_uporabnika' => base64_decode($_COOKIE['uid']) + 'email_uporabnika' => (!empty($_COOKIE['uid']) ? base64_decode($_COOKIE['uid']) : '') ]; $build = [ diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml b/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml index fd27d7e98..48528aba8 100644 --- a/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml +++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml @@ -8,7 +8,7 @@ trgovina_1ka.cenik_zasebni_paketi: _access: 'TRUE' trgovina_1ka.izvedi_nakup: - path: '/izvedi1-nakup/{paket}/podatki' + path: '/izvedi-nakup/{paket}/podatki' defaults: _controller: '\Drupal\trgovina_1ka\Controller\NarociloController::nakupPaketa' _title: 'Nakup izbranega paketa' diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig index fce778572..0faf51eba 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig @@ -98,7 +98,7 @@ - Preizkusi brezplačno + Naročilo
@@ -154,7 +154,7 @@ - Nakup + Naročilo
@@ -219,7 +219,7 @@ - Nakup + Sestavi svoj paket
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig index 5002dede9..c6e6515a1 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig @@ -86,7 +86,11 @@ END HEADER #} - Preizkusi brezplačno + {% if email_uporabnika %} + Preizkusi brezplačno + {% else %} + Preizkusi brezplačno + {% endif %}
@@ -130,7 +134,11 @@ END HEADER #} - Nakup + {% if email_uporabnika %} + Nakup + {% else %} + + {% endif %}
@@ -183,7 +191,11 @@ END HEADER #} - Nakup + {% if email_uporabnika %} + Nakup + {% else %} + + {% endif %}