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

Merge branch 'master' of https://bitbucket.org/1ka/1ka

Browse Source
This commit is contained in:
pero1203 2020-08-27 21:17:57 +02:00
commit 0dd632160b
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drupal/sites/all/themes/pro1ka/css/pro1ka_compiled.css
View File

File diff suppressed because one or more lines are too long

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

@ -841,6 +841,10 @@
return window.location.href = '/'; return window.location.href = '/';
} }
//Nastavimo prevzeto plačevanje s karticam
jQuery('[name="payment_method"][value="3"]').prop('checked', true);
preverimoZaVrstoPlacila();
posodobiCenoPaketa(); posodobiCenoPaketa();
} }
@ -1235,12 +1239,15 @@ function posodobiCenoPaketa() {
jQuery('.zavezanec-za-ddv').show(); jQuery('.zavezanec-za-ddv').show();
} }
jQuery('#nakup-1ka .ime-paketa, #predogled-nakupa-1ka .ime-paketa').text(val.paketi[paket].name); if(val.paketi[paket] && trajanje > 0) {
jQuery('#nakup-1ka .cena-paketa, #predogled-nakupa-1ka .cena-paketa').text(val.paketi[paket].price[trajanje]['final' + cenaIzpisGledeNaDDV]); jQuery('#nakup-1ka .ime-paketa, #predogled-nakupa-1ka .ime-paketa').text(val.paketi[paket].name);
jQuery('#nakup-1ka .cena-paketa, #predogled-nakupa-1ka .cena-paketa').text(val.paketi[paket].price[trajanje]['final' + cenaIzpisGledeNaDDV]);
}
jQuery('#cena-trajanje1m').text(val.paketi[paket].price[1]['monthly' + cenaIzpisGledeNaDDV]);
jQuery('#cena-trajanje3m').text(val.paketi[paket].price[3]['monthly' + cenaIzpisGledeNaDDV]);
jQuery('#cena-trajanje12m').text(val.paketi[paket].price[12]['monthly' + cenaIzpisGledeNaDDV]);
jQuery('#cena-trajanje1m').text(val.paketi[paket].price[1]['monthly' + cenaIzpisGledeNaDDV]);
jQuery('#cena-trajanje3m').text(val.paketi[paket].price[3]['monthly' + cenaIzpisGledeNaDDV]);
jQuery('#cena-trajanje12m').text(val.paketi[paket].price[12]['monthly' + cenaIzpisGledeNaDDV]);
// Preverimo, če ima kak popust od prej // Preverimo, če ima kak popust od prej
jQuery('.podatki-za-placilo-racuna').show(); jQuery('.podatki-za-placilo-racuna').show();

3
frontend/drupal/sites/all/themes/pro1ka/sass/parts/tabs.scss
View File

@ -32,7 +32,7 @@
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-color: $siva; border-color: $siva;
background-color: #fff; background-color: transparent;
-webkit-transition: border 200ms ease; -webkit-transition: border 200ms ease;
transition: border 200ms ease; transition: border 200ms ease;
color: #333; color: #333;
@ -72,6 +72,7 @@
> li.active { > li.active {
border-bottom-color: #FFFFFF; border-bottom-color: #FFFFFF;
background-color: #ffffff;
> a { > a {
font-weight: 500; font-weight: 500;