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

FIX: Drupal popravek procesiranja narocila in preusmeritev.

Browse Source
This commit is contained in:
Robert 2020-12-01 13:32:47 +01:00
parent b8f44d003a
commit 361dd42739
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/drupal/sites/all/themes/pro1ka/js/script.js
View File

@ -1232,6 +1232,7 @@ function oddajNarociloNaStreznik() {
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){
@ -1284,20 +1285,24 @@ function oddajNarociloNaStreznik() {
} else if (paymentMethod == 2) {
// PayPal redirect
setTimeout(function() {
urlRedirect = val.paypal_link;
}, 2000);
return window.location = val.paypal_link
}, 1000);
} else if (paymentMethod == 3) {
// Nastavimo Stripe instanco
var stripe = Stripe(jQuery('#stripe-token').val());
setTimeout(function(){
return stripe.redirectToCheckout({ sessionId: val.session_id });
}, 2000);
}, 1000);
}
window.location = urlRedirect;
}

4
frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
View File

@ -792,7 +792,7 @@
Naročilo se obdeluje. Prosimo počakajte trenutek
</div>
<div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo"></div>
<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 boste vnesli podatke za plačilo.
Po uspešnem plačilu vas bo preusmerilo nazaj na spletno mesto 1KA. Prosimo počakajte trenutek
</div>
@ -801,7 +801,7 @@
The order is being processed. Please wait a moment
</div>
<div class="procesiram-narocilo-2 procesiram-narocilo-3 procesiram-posamezno-narocilo"></div>
<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 you will enter your payment information.
After a successful payment, you will be redirected back to the 1KA website. Please, wait a moment
</div>