CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-27 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,130 Commits 395 Branches 211 Tags
2848d855119acf6331f2071bdca8f95610581c57
Commit Graph
2904 Commits
Author SHA1 Message Date
Mira Weller c401e54831 improve formatting for subevents 2024-10-14 10:23:34 +02:00
MiraandRichard Schreiber 6c52cc8157 Apply suggestions from code review 
Co-authored-by: Richard Schreiber <schreiber@rami.io>
 2024-10-11 11:11:08 +02:00
Mira Weller b312a21e5e remove erroneous paste 2024-10-09 12:15:30 +02:00
Mira Weller f9ca9a781e one loop less 2024-10-09 12:13:11 +02:00
Mira Weller a314d219b8 fix iteration 2024-10-09 12:01:47 +02:00
Mira Weller 9a6756ce5d show discount notice on all categories with an available discount, not only those with cross_selling_condition=discount 2024-10-09 11:52:46 +02:00
Mira Weller 88936b5e7a improve wording of category types 2024-10-09 11:37:41 +02:00
Mira Weller 3856095088 improve category type label for CROSS_SELLING_MODES=both 2024-10-02 09:57:16 +02:00
Mira Weller a84a27cc0b transfer cross_selling_match_products on event clone 2024-10-02 09:53:32 +02:00
Mira Weller 7d6b2d6df8 better description for CROSS_SELLING_CONDITION=discounts 2024-10-02 09:31:59 +02:00
Mira Weller bef88bf0d0 fix SUBEVENT_MODE_DISTINCT discounts 2024-10-01 18:46:44 +02:00
Mira Weller 159717c19f formatting 2024-10-01 18:36:24 +02:00
Mira Weller 5e9b5a9c24 support for variations 2024-10-01 18:35:07 +02:00
Mira Weller 52849f8fdd bugfix 2024-10-01 18:34:57 +02:00
Mira Weller d5e480b7fd fix cross selling recommendations for SUBEVENT_MODE_SAME discounts 2024-10-01 18:14:46 +02:00
Mira Weller 94733135f0 add failing test for SUBEVENT_MODE_SAME 2024-10-01 17:29:25 +02:00
Mira 0947476b41 Update src/pretix/base/services/cross_selling.py 2024-09-30 21:19:24 +02:00
MiraandRaphael Michel 44de4bb26b Apply suggestions from code review 
Co-authored-by: Raphael Michel <michel@rami.io>
 2024-09-30 21:13:19 +02:00
Mira Weller b5fc227fca rebase migration 2024-09-27 16:36:54 +02:00
Mira Weller 1fb1696863 Merge remote-tracking branch 'origin/master' into cross-selling 2024-09-27 16:27:47 +02:00
Mira fe80f5fb78 Utils for internal plugin (#4483) 
* Add full_code property to OrderPosition

* Add inline "json_script" as supported data source for select2

* Use shorter OrderPosition.code
 2024-09-26 19:29:33 +02:00
Raphael Michel a2c15ad89e Check-in: Prevent duplicate auto check-outs (Z#23167003) (#4488) 2024-09-26 17:54:27 +02:00
Raphael Michel 4069c61054 runperiodic: Allow to list all tasks 2024-09-26 10:32:53 +02:00
Raphael Michel eb92e4d8e6 Render progress info on non-javascript fallback page for celery tasks (#4452) 
* Render progress info on non-javascript fallback page for celery tasks

* Review notes
 2024-09-17 13:29:27 +02:00
Raphael Michel 32d6ded003 Stricten password validation to match PCI DSS requirements (#4467) 
* Stricten password validation to match PCI DSS requirements

* Review fix

* Fix a file header
 2024-09-17 13:29:17 +02:00
Raphael Michel aa07533693 Order import: Allow to set check-in attention and text (Z#23165806) (#4469) 2024-09-17 11:50:19 +02:00
Raphael Michel 9616369f07 Formally deprecate eu_reverse_charge (#4470) 2024-09-17 11:39:32 +02:00
Raphael Michel 24e2b1b9ab Import: Parse iso dates 2024-09-12 09:32:25 +02:00
Martin Gross eebdce80cd OIDC: Respect token_endpoint_auth_methods_supported (Z#2164777) (#4459) 2024-09-11 16:40:42 +02:00
Raphael Michel 667c2555b2 AsyncMixin: Fix crash on invalid query string (PRETIXEU-AHG) 2024-09-10 14:00:08 +02:00
Mira Weller 939d50061b Merge remote-tracking branch 'origin/master' into cross-selling 
# Conflicts:
#	src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html
 2024-08-29 13:49:28 +02:00
Raphael Michel 0b4e99c2d8 Fix inprecise wording 2024-08-28 16:41:37 +02:00
Mira 91e69f793d Show weekday in subevent dates [Z#23161884] (#4383) 2024-08-27 22:22:44 +02:00
Mira f819f0c316 Escape HTML in placeholder samples in mail preview (#4413) 
CVE-2024-8113
 2024-08-23 14:41:25 +02:00
Raphael Michel 6087665775 Email preview: Include prefix in subject (#4395) 2024-08-23 13:42:29 +02:00
Raphael Michel a6f93b6cf0 Seats API: Add is_available filter (Z#23163419) (#4409) 
* Seats API: Add is_available filter (Z#23163419)

* docs
 2024-08-21 17:43:13 +02:00
Raphael Michel b96374fcf6 Do not create duplicate memberships on order changes (Z#23163336) (#4408) 2024-08-21 17:30:42 +02:00
Raphael Michel 0a5f3e6dd5 Fix availability of payment methods in time machine (Z#23162163) (#4390) 2024-08-13 12:52:14 +02:00
Raphael MichelandRichard Schreiber 022f44ad00 PDF editor: New text element implementation (#4246) 
* draft

* almost working

* Widgth adjustment

* Fix crash on empty text

* Change default layouts

* Fix editor bugs

* Update src/pretix/control/templates/pretixcontrol/pdf/index.html

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Show deprecated text on old text

* lockScalingFlip

* Regroup editor controls

* Update src/pretix/static/pretixcontrol/js/ui/main.js

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/static/pretixcontrol/js/ui/main.js

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/static/pretixcontrol/js/ui/main.js

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/static/pretixcontrol/js/ui/editor.js

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Increase default height even further

* Add a small version warning

* Update src/pretix/control/templates/pretixcontrol/pdf/index.html

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/control/templates/pretixcontrol/pdf/index.html

Co-authored-by: Richard Schreiber <schreiber@rami.io>

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
 2024-08-07 11:26:47 +02:00
MiraandRaphael Michel dc1973f4ff Add API endpoint /seats to event (Z#23159536) (#4321) 
* add API endpoint /seats to event

* fix logging

* add Seat annotations

* add seats endpoint for subevents

* return ids of occupying objects instead of boolean flags

* wip

* include orderposition instead of order in seat info

* add API documentation

* Apply suggestions from code review

Co-authored-by: Raphael Michel <michel@rami.io>

* Apply suggestions from code review

* Clarify API docs

* add api examples

* add test cases

* require can_view_orders permission for retrieving seats

* improve permission handling

* Revert "improve permission handling"

This reverts commit f32b532cc6.

* improve permission handling (minimal version)

* formatting

* add permission tests

* fix bug

* update permission checks

* Apply suggestions from code review

Co-authored-by: Raphael Michel <michel@rami.io>

* add tests for permission checks

* add tests for expand=voucher and expand=cartposition

* remove unused parameter

* test query count

* codestyle

---------

Co-authored-by: Raphael Michel <michel@rami.io>
 2024-08-02 09:17:46 +02:00
Mira Weller c1a5e8d912 codestyle 2024-08-01 23:01:11 +02:00
Mira Weller 106026045e fix sqlite compat 2024-08-01 22:59:51 +02:00
Raphael Michel 11e04ea3f2 ListExporter: Allow to override CSV encoding in subclass (Z#23160604) (#4367) 2024-08-01 16:20:00 +02:00
Raphael Michel ad33785f4c API: Allow to set seating_allow_blocked_seats_for_channel (Z#23159519) (#4333) 2024-07-30 16:28:08 +02:00
Raphael Michel cab360bdb6 Move auto check-in to plugin with more functionality (#4331) 
* Move auto check-in to plugin with more functionality

* Rename field

* Add to MANIFEST.in
 2024-07-29 09:46:53 +02:00
Mira Weller 537a0993b0 add more detailed description of collect_potential_discounts parameter 2024-07-26 19:40:28 +02:00
Raphael Michel f660f35766 Fix an English word usage 2024-07-26 13:54:16 +02:00
Mira Weller 9337ad1f70 add prefetching, add test cases checking number of queries 2024-07-25 14:37:19 +02:00
Raphael Michel 19f3fbc7e8 Order data export: Include ID of parent position of add-ons 2024-07-23 15:52:55 +02:00
dependabot[bot]dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>Raphael Michel
 		711f08c9e8 Update python-bidi requirement from ==0.4.* to ==0.5.* (#4325) 
* Update python-bidi requirement from ==0.4.* to ==0.5.*

Updates the requirements on [python-bidi](https://github.com/MeirKriheli/python-bidi) to permit the latest version.
- [Release notes](https://github.com/MeirKriheli/python-bidi/releases)
- [Changelog](https://github.com/MeirKriheli/python-bidi/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/MeirKriheli/python-bidi/compare/v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: python-bidi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update import

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Raphael Michel <michel@rami.io>
 2024-07-23 13:27:15 +02:00