From ad50ebbd9baaf82d17652f2e319d5d8e339905f1 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 20 Nov 2020 13:59:13 +0100 Subject: [PATCH] Drupal: Stripe popravki. --- .../sites/all/themes/pro1ka/js/script.js | 11 +++++++++++ .../templates/nakupovanje-1ka-kosarica.tpl.php | 18 ++++++++++++++++-- .../nakupovanje-1ka-stripe-return.tpl.php | 5 +++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index ee3a9b2af..a6556952e 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -1218,7 +1218,18 @@ window.addEventListener('beforeinstallprompt', function (e) { function oddajNarociloNaStreznik() { jQuery('.pregled-narocila').hide(); + jQuery('.procesiram-posamezno-narocilo').hide(); + jQuery('.procesiram-narocilo').show(); + var nacinPlacila = jQuery('[name="payment_method"]:checked').val(); + jQuery('.procesiram-narocilo .procesiram-narocilo-'+nacinPlacila).show(); + if(nacinPlacila == 2){ + jQuery('.procesiram-narocilo .procesiram-narocilo-ime').text('PayPal'); + } else if (nacinPlacila == 3){ + jQuery('.procesiram-narocilo .procesiram-narocilo-ime').text('Stripe'); + } + + // V kolikor je omenjeno polje izpolnjeno potem gre za robota in preusmerimo na začetno stran if (jQuery('[name="narocilo-robotsko-narocilo"]').val().length > 0) { diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php index 1c844dec6..292ab4b79 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php @@ -781,9 +781,23 @@
language == 'sl'): ?> - Naročilo se obdeluje. Prosimo počakajte trenutek +
+ Naročilo se obdeluje. Prosimo počakajte trenutek +
+ +
+ Sedaj vas bomo preusmerili na platformo Stripe, kjer boste vnesli podatke za plačilo. + Po uspešnem plačilu vas bo preusmerilo nazaj na spletno mesto 1KA. Prosimo počakajte trenutek +
- The order is being processed. Please wait a moment +
+ The order is being processed. Please wait a moment +
+ +
+ We will now redirect you to the Stripe platform, where you will enter your payment information. + After a successful payment, you will be redirected back to the 1KA website. Please, wait a moment + diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-stripe-return.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-stripe-return.tpl.php index a803fe7f6..bcfcfd821 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-stripe-return.tpl.php +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-stripe-return.tpl.php @@ -6,9 +6,10 @@

language == 'sl'): ?> - Zahvaljujemo se vam za vaš nakup preko Stripe plačilnea sistema. Vaš novi paket je aktiven in ga lahko pričnete uporabljati. + Zahvaljujemo se vam za vaš nakup. Plačilo preko Stripe plačilnega sistema je bilo uspešno izvedeno. + Vaš novi paket je aktiviran in ga lahko pričnete uporabljati. - Thank you for your purchase using Strpe! Your new package is now active and you can use it. + Thank you for your purchase. Payment using Stripe system was successful. Your new package is now activated and ready to use.