pero1203
|
978055e528
|
Merge branch 'master' into release/produkcija
|
2022-06-18 16:23:07 +02:00 |
|
pero1203
|
9f2926d363
|
Redesign - responsive popravki
|
2022-06-13 11:23:16 +02:00 |
|
Robert
|
eacf8c6213
|
Popravek, da preveri tudi ce je paket 3.
|
2022-03-04 15:52:17 +01:00 |
|
tejagerjovic
|
7926a2fb5f
|
[Redizajn 1KA] - Naročila - v2
|
2022-01-26 23:43:21 +01:00 |
|
tejagerjovic
|
ae93768b65
|
[Redizajn 1KA] - Naročila - v1
1. fieldset s podatki aktivnega paketa
|
2022-01-26 12:04:16 +01:00 |
|
Robert
|
16d01a0854
|
Popravekpri varnostnem polju
|
2021-12-01 13:47:57 +01:00 |
|
Robert
|
ae5516931b
|
Popravek za robote, da preverja reCaptcha in varnostno polje
|
2021-12-01 13:22:24 +01:00 |
|
pero1203
|
41d86001d6
|
Prenos vseh globalnih spremenljivk v settings_optional.php v bazo
|
2021-09-29 10:37:17 +02:00 |
|
pero1203
|
7a164a0848
|
Merge branch 'master' into release/produkcija
# Conflicts:
# long_term_TODO.txt
# readme.md
# resources/sass/admin/branching/library.scss
# resources/sass/admin/dashboard/dashboard.scss
# resources/sass/admin/data/other.scss
# resources/sass/admin/main_page/main_page_base.scss
# resources/sass/admin/mobile/basic.scss
# resources/sass/admin/mobile/header.scss
# resources/sass/admin/mobile/mobile.scss
# resources/sass/admin/mobile/pages/data.scss
# resources/sass/admin/mobile/pages/new_survey.scss
# resources/sass/admin/mobile/responsive_fixes.scss
# resources/sass/admin/navigation.scss
# resources/sass/admin/new_survey_page/no_survey_page.scss
# resources/sass/admin/new_survey_page/right_content.scss
# resources/sass/admin/publish/invitations.scss
# resources/sass/admin/survey_settings/archive.scss
# resources/sass/frontend_simple/basic/basic.scss
# resources/sass/frontend_simple/basic/mobile.scss
# resources/sass/frontend_simple/modules/footer.scss
# resources/sass/frontend_simple/style.scss
|
2021-08-04 10:41:33 +02:00 |
|
pero1203
|
2d50317b9f
|
Dodan api klic za pridobitev podatkov zadnjega narocila uporabnika
|
2021-07-13 10:54:02 +02:00 |
|
pero1203
|
c2d2797783
|
Ugasnjena default drzava Slovenija pri kreiranju narocila (da detektiramo, ce se se kje poslje prazno iz drupala)
|
2021-07-12 10:03:50 +02:00 |
|
pero1203
|
cf0f55e19d
|
Pri placilih je default drzava vedno slovenija (ce slucajno ni nastavljena pri api klicu)
|
2021-07-06 10:06:22 +02:00 |
|
pero1203
|
0ffc82b55f
|
Merge branch 'master' into release/produkcija
# Conflicts:
# admin/survey/classes/class.Vprasanje.php
# admin/survey/export/latexclasses/class.LatexSurvey.php
# composer.lock
# resources/sass/admin/Settings/navigation.scss
# resources/sass/admin/admin.scss
# resources/sass/admin/basic/basic.scss
# resources/sass/admin/branching/questions/question_box.scss
# resources/sass/admin/branching/toolbox.scss
# resources/sass/admin/comments.scss
# resources/sass/admin/header.scss
# resources/sass/admin/icons/invitation.scss
# resources/sass/admin/icons/modules.scss
# resources/sass/admin/icons/question_edit.scss
# resources/sass/admin/icons/standard.scss
# resources/sass/admin/library.scss
# resources/sass/admin/payments.scss
# resources/sass/admin/publish/invitations.scss
# resources/sass/admin/publish/settings.scss
# resources/sass/admin/users.scss
# resources/sass/main/main/basic.scss
# resources/sass/main/main/content.scss
# resources/sass/main/main_mobile/content.scss
# vendor/composer/autoload_files.php
# vendor/composer/autoload_static.php
# vendor/composer/installed.json
# vendor/maxmind-db/reader/CHANGELOG.md
# vendor/maxmind-db/reader/composer.json
# vendor/maxmind-db/reader/ext/php_maxminddb.h
# vendor/maxmind-db/reader/package.xml
# vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php
|
2021-06-05 14:05:41 +02:00 |
|
pero1203
|
9285b4eb39
|
Popravek tabele narocil uporabnika
|
2021-05-27 11:00:53 +02:00 |
|
pero1203
|
029758631b
|
Dodan id narocila v admin tabelo narocil
|
2021-04-12 12:18:29 +02:00 |
|
pero1203
|
41e0905854
|
Popravki id-ja narocila pri tebeli narocil in naslova predracuna za referenco
|
2021-04-12 12:12:20 +02:00 |
|
pero1203
|
393bf48aaf
|
Merge branch 'master' into release/produkcija
# Conflicts:
# .gitignore
# composer.lock
# resources/sass/admin/branching/branching_collapsed.scss
# resources/sass/admin/branching/branching_expanded.scss
# resources/sass/admin/branching/form.scss
# resources/sass/admin/branching/voting.scss
# resources/sass/admin/footer.scss
# resources/sass/admin/icons/standard.scss
# resources/sass/admin/main_page/survey_list.scss
# resources/sass/admin/media.scss
# resources/sass/admin/popup/basic.scss
# resources/sass/admin/popup/popup.scss
# resources/sass/admin/users.scss
# resources/sass/main/main/admin.scss
# resources/sass/main/main_mobile/content.scss
# vendor/autoload.php
# vendor/composer/autoload_files.php
# vendor/composer/autoload_real.php
# vendor/composer/autoload_static.php
# vendor/composer/installed.json
|
2021-03-06 17:20:12 +01:00 |
|
pero1203
|
dcf54c9ae1
|
Popravek texta v mailu za prejem racuna
|
2021-02-01 12:51:10 +01:00 |
|
pero1203
|
0da6b81046
|
Moznost "placaj eracun" pri narocilih - izda racun z rokom 30 dni (neplacan) in ustvari placilo
|
2021-02-01 12:45:19 +01:00 |
|
pero1203
|
b59759e733
|
Popravek casa od katerega se uporablja nova cena paketov
|
2020-12-07 11:27:02 +01:00 |
|
pero1203
|
c2295ec15b
|
Popravek cen - pred 7.12 se morajo upostevati stare
|
2020-12-07 11:07:54 +01:00 |
|
pero1203
|
069b95a658
|
Popravek izvoza racuna
|
2020-12-07 09:44:49 +01:00 |
|
pero1203
|
1fea0b9f5b
|
Popravek generiranja racuna.
|
2020-12-07 09:41:48 +01:00 |
|
pero1203
|
4595f7abdf
|
Popravek izpisa predracuna - preko ajax-a namesto preko api-ja
|
2020-12-05 11:51:24 +01:00 |
|
pero1203
|
285dbe4861
|
Popravek api klica za preverjanje ddv - vracamo ddv - true/false in pri preverjanju pocistimo crke iz davcne stevilke
|
2020-12-02 10:49:04 +01:00 |
|
Peter Hrvatin
|
34cceb83e5
|
Manjsi popravek pri oznacevanju ddv-ja pri nakupu paketa
|
2020-11-26 09:08:33 +01:00 |
|
Peter Hrvatin
|
b19a964651
|
Dodano filtriranje narocil po statusu, popravek racunanja DDV (3. drzave ga nimajo), dodan clen za brez DDV na predracun in racun
|
2020-11-25 10:26:10 +01:00 |
|
pero1203
|
24b410f338
|
Sprememba cen paketov
|
2020-11-18 10:15:59 +01:00 |
|
Robert
|
b18ac6653f
|
Stripe merge
|
2020-11-17 06:32:42 +01:00 |
|
pero1203
|
01d4fd2209
|
Dodan api klic za preverjanje placevanja ddv-ja pri placilih
|
2020-11-12 11:49:43 +01:00 |
|
pero1203
|
da5913d779
|
Prenova stripe placil na sca
|
2020-11-10 14:15:44 +01:00 |
|
pero1203
|
061d161076
|
Popravek urejanja narocila - ddv
|
2020-11-04 14:11:20 +01:00 |
|
pero1203
|
6f0d9312f1
|
Preverjanje pri nakupu ce je podjetje iz EU in zavezanec - potem se mu ne obracuna ddv
|
2020-11-04 13:46:53 +01:00 |
|
pero1203
|
2f0964e086
|
Dokoncano placevanje preko paypala
|
2020-10-25 10:44:41 +01:00 |
|
Robert
|
1439392448
|
Merge paypal
|
2020-10-05 13:44:17 +02:00 |
|
pero1203
|
dd75be0d77
|
Poporavki izgleda admin tabele narocil na mobitelu
|
2020-09-25 12:12:26 +02:00 |
|
pero1203
|
ddbd380be2
|
Eracun se nastavi pri ustvarjanju narocila ce se samo poslje "podjetje_eracun" ne glede na vrednost
|
2020-09-24 13:21:16 +02:00 |
|
pero1203
|
b2980fcd51
|
Mobile datatables za narocila in placila, nastavljen meta viewport v admin vmesniku, da mobile ne scale-a
|
2020-09-23 10:25:59 +02:00 |
|
pero1203
|
fdc950f1e1
|
Racuni in predracuni se posiljajo preko drugega smtp racuna (invoice@1ka.si)
|
2020-09-22 09:30:32 +02:00 |
|
pero1203
|
c68eabe467
|
Dodano polje za eracun na backendu pri narocilu
|
2020-09-16 10:21:17 +02:00 |
|
pero1203
|
7e7602a495
|
Dodana moznost za storniranje placila
|
2020-09-11 09:53:35 +02:00 |
|
pero1203
|
4f9bb1b658
|
Narejen paypal paypalCreateOrder in paypalCaptureOrder
|
2020-09-09 11:22:20 +02:00 |
|
pero1203
|
192d97bcee
|
Dodana sql tabela za paypal transakcije, dodan razred za placevanje s paypal (v delu), dodani skripti za obvestila s strani paypala (v delu)
|
2020-09-07 12:53:52 +02:00 |
|
pero1203
|
0e6a7adc9b
|
Popravek ddv-ja na racunu pri podjetjih iz tujine - ce ima uporabnik ang. vmesnik in je drzava "Slovenia"
|
2020-08-24 17:27:36 +02:00 |
|
pero1203
|
ad7728b6d1
|
Popravek buga pri podaljsevanju paketa, skripta za preverjanje paketov
|
2020-08-21 09:52:26 +02:00 |
|
pero1203
|
0fa9693bf9
|
Dodan nov repozitorij
|
2020-08-14 13:36:36 +02:00 |
|