Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow products to be excluded from ticket-generation #456

Closed
pc-coholic opened this issue Apr 5, 2017 · 9 comments
Closed

Allow products to be excluded from ticket-generation #456

pc-coholic opened this issue Apr 5, 2017 · 9 comments

Comments

@pc-coholic
Copy link
Member

It would be nice to have a checkbox for every product to dis-/enable the generation of tickets (PDF, passbook, etc.).

Usecase: In addition to an entrance-ticket for an event, also offer a donation-product. When generating the downloadable tickets, the donations do not trigger a (useless) printout with a barcode which no one is going to use.

So basically we could either add a "is a downloadable ticket"-property to each product or add a "generate only admission tickets"-checkbox to the ticket generation process.

@raphaelm
Copy link
Member

raphaelm commented Apr 6, 2017

"generate only admission tickets"-checkbox to the ticket generation process.

I believe this is the way to go.

@hd719
Copy link

hd719 commented Apr 18, 2017

Hello I am new to Open source can I work on this?

@raphaelm
Copy link
Member

Sure!

First of all, you need pretix running locally on your machine. We have a guide on the developer installation over here. Play around with it and get a feeling for what pretix is and how it works :) Try to find the places in the interface mentioned in this issue where something needs to change. Maybe try to find the same places in the code? Just searching for characteristic words can be a powerful tool to find your way around.

If you have any questions, just let me know!

@hd719
Copy link

hd719 commented May 1, 2017

Hey @raphaelm sorry, but I cannot work on this.

@raphaelm
Copy link
Member

raphaelm commented May 1, 2017

Hi @hd719, sure, we'll find someone else :)

@aph3rson
Copy link
Contributor

aph3rson commented May 1, 2017

#443 (comment)
@raphaelm I can take a crack at it. The description is a bit vague, though - what I'm getting is that you'd like products to have a property that tickets should be generated for them (so donations/etc. don't generate tickets). I'll need to look through the code a bit more to determine the program flow around when tickets are generated, though.

@raphaelm
Copy link
Member

raphaelm commented May 1, 2017

@aph3rson

The description is a bit vague, though - what I'm getting is that you'd like products to have a property that tickets should be generated for them (so donations/etc. don't generate tickets)

Nearly correct: There already is a property Item.admission that we want to re-use here. You would now need to:

  • Add a setting to TicketSettingsForm that says "Generate tickets for non-admission products". For backwards compatibility, you should set the default to True in pretix/base/settings.py.
  • Disable the download button in pretix/presale/templates/pretixpresale/event/fragment_cart.html if the setting is unchecked and a product is not an admission product
  • Enforce the new setting in OrderDownload (pretix/presale/views/order.py) when downloading a single ticket
  • Add a check to BaseTicketOutput.generate_order (pretix/base/ticketoutput.py) and PdfTicketOutput.generate_order (pretix/plugins/ticketoutputpdf/ticketoutput.py) to exclude non-admission products from multi-ticket downloads

If you have any further questions here, just let me know, I'm happy to help

@aph3rson
Copy link
Contributor

aph3rson commented May 1, 2017

@raphaelm One more question, regarding PRs. The contribution guide says I need to squash my commits, though I don't see other PRs doing this. Do you prefer squashed commits for this? I generally fork master (or develop, if there is one) to an issue branch, then non-ff merge back to the appropriate branch, and submitting a PR on that (roughly following Vincent Driessen's model).

@raphaelm
Copy link
Member

raphaelm commented May 1, 2017

Hi @aph3rson, thanks for the hint, I'll drop that from the contribution guides. The guide was written before GitHub had a "Squash and merge" button, so it's easier to review if you keep your work in "natural" commits. I will then rebase/merge against master once the PR is done so we have a mostly-linear history in the repository.

Should you have a long-running PR that has merge conflicts with master once its complete, I prefer you to do a rebase over a merge of master into the issue branch, as I believe it keeps the history easier to read.

aph3rson added a commit to aph3rson/pretix that referenced this issue May 5, 2017
`ticket_download_nonadm` now setting in storage. Still need logic for
order page/PDF generation.
Works on pretix#456.
aph3rson added a commit to aph3rson/pretix that referenced this issue May 5, 2017
Modified Django tags to look at item admission attribute and
`ticket_download_nonadm` setting.
Works on pretix#456.
aph3rson added a commit to aph3rson/pretix that referenced this issue May 5, 2017
PDFs/etc. will only be permitted/generated for items with the
`admission` attribute, or if the `ticket_download_nonadm` event setting
is true. Applies to single and whole-order ticket downloads.
Works on pretix#456.
aph3rson added a commit to aph3rson/pretix that referenced this issue May 5, 2017
Forgot PDF output was a plugin, now includes same check as base
`BaseTicketOutput.generate_order`.
Works on pretix#456
raphaelm pushed a commit that referenced this issue May 6, 2017
* Added non-admission setting to event

`ticket_download_nonadm` now setting in storage. Still need logic for
order page/PDF generation.
Works on #456.

* Download button considers `ticket_download_nonadm`

Modified Django tags to look at item admission attribute and
`ticket_download_nonadm` setting.
Works on #456.

* Ticket output for non-admission disabled

PDFs/etc. will only be permitted/generated for items with the
`admission` attribute, or if the `ticket_download_nonadm` event setting
is true. Applies to single and whole-order ticket downloads.
Works on #456.

* Fixed product exclusion in PDF output

Forgot PDF output was a plugin, now includes same check as base
`BaseTicketOutput.generate_order`.
Works on #456
aph3rson added a commit to aph3rson/pretix that referenced this issue May 11, 2017
Sync master with master of pretix/pretix@300f8f6

* Automatically sort new products to the end

* Drop "squash your commits" from the dev guide

* Add variation descriptions and allow to order addons

* Link to Django's runserver options in dev docs

* Allow <br> tags in rich text

* Copy from event: deal with deleted items

* Make validate_cart useful together with addons

* Fix collapsing panels in the addon choice step

* Button text change if addons are present

* Update translations

* Squash migrations and bump version

* Ticket PDFs: Do not hide attendee name if code is hidden

* Add a user guide on payments

* Link PayPal and Stripe documentation in the respective forms

* Hide payment fees if they are all equal to 0.00

* Refs pretix#39 -- New concept of "teams" (pretix#478)

* New models

* CRUD UI

* UI for adding/removing team members

* Log display for teams

* Fix invitations, move frontend

* Drop old models (incomplete)

* Drop more old stuff

* Drop even more old stuff

* Fix tests

* Fix permission test

* flake8 fix

* Add tests fore the new code

* Rebase migrations

* Fix typo in method name

* Update translations

* Force ordering of events on dashboard

* Fix typos in events

* Prepare the pretixdroid API for an async mode in the app

* Pretixdroid tests: Ignore microseconds (chopped by mysql)

* pretixdroid API: Add related lookups

* Add idempotenty nonces to pretixdroid API

* pretixdroid: force-accepting unpaids and time display

* Marked webfonts as binary files (pretix#487)

Webfonts now listed as binary in `.gitattributes`.
Works on pretix#486

* Fix pretix#456 -- Allow products to be excluded from ticket-generation (pretix#483)

* Added non-admission setting to event

`ticket_download_nonadm` now setting in storage. Still need logic for
order page/PDF generation.
Works on pretix#456.

* Download button considers `ticket_download_nonadm`

Modified Django tags to look at item admission attribute and
`ticket_download_nonadm` setting.
Works on pretix#456.

* Ticket output for non-admission disabled

PDFs/etc. will only be permitted/generated for items with the
`admission` attribute, or if the `ticket_download_nonadm` event setting
is true. Applies to single and whole-order ticket downloads.
Works on pretix#456.

* Fixed product exclusion in PDF output

Forgot PDF output was a plugin, now includes same check as base
`BaseTicketOutput.generate_order`.
Works on pretix#456

* Mail signature (pretix#485)

* added signature field -- no function yet

* added mail signature feature

* fixed style issue

* fixed problem with signature default

* added unit test for mail signatures

* added unit test for mail signatures

* [WIP] Fix pretix#447 -- Sendmail plugin: Create new mail based on an old one (pretix#476)

* send old email content to the new one

* error key event

* test commit

* query bad ID

* query bad ID

* query bad ID

* query bad ID

* Update pretixdroid API version

* Refs pretix#447 -- Extend copying old mails to subject and receipients

* Fixed bugs and added test for date range rendering (pretix#488)

* fixed bug for same dates, added unit check for daterange

* fixed local language override in unit test

* Fix pretix#297 -- pretixdroid: Show metrics in the control panel (pretix#481)

* add checkin status page

add dashboard widget
add checkin page under orders

* modify checkin logic

added new fields in checkin page
added filter items

* add tests for checkins & minor improvement

* support addin_product & noadm setting logic

* remove name ordering check test case

* Fix pretix#379 -- Add logo to event organizers (pretix#431)

* [WIP] Add logo to event organizers.

* Fix indentation issues.

* Refactor code

Refactor code

Refactor code

* Add new migration

* Take files into account for organizer sform (settings form)

* Fix grammer

* Make bootstrap form errors specific to each fieldset

* Display logo on organizer's page

* Fix PR issues

Fix PR issues

Fix PR issues

* Reorder imports

* Remove conflicting migration

* Fix rebase conflict

* Fix pretix#41 -- Drag-and-drop ticket editor

Undo/redo

Useful toolbox

Font selection

Add text content

Use hex for colors

JS-side dump and load

Save

Load layout, proper undo/redo

First steps to Python rendering

More PDF rendering

Copy and paste

Buttons for keyboard actions

Splash Screen

Block unbeforeunload in dirty state

Remove debugging output

Preview

Upload new PDFs via the editor

Fix bugs during PDF reload, link in settings form

New default ticket

Add OpenSans BI

Custom fonts, fix tests

* Added bootstrap-colorpicker

* Allow inline PDF display in CSP header

* Add fontpack to list of plugins

* Update German translation

* Add ticketoutputpdf's assets to MANIFEST.i

* Fix migration of old ticket styles

* Fix iCal download URL

* Multi-line location field, new field for admission time

* Admission date and time in editor

* Remove icon from "add to calendar"

* Try to fix PDF display problems in Safari

* Proxy cachedfiles that are used as editor previews

* Check Event.presale_is_running in more places

* Fix CSS generation with an empty color field

* Fix missing placeholders and reformat the sendmail view

* Fix bug that lead to wrong payment amount when switching payment method to PayPal later

* Update translation
raphaelm pushed a commit that referenced this issue May 17, 2017
* Syncing fork to upstream (#1)

Sync master with master of 300f8f6

* Automatically sort new products to the end

* Drop "squash your commits" from the dev guide

* Add variation descriptions and allow to order addons

* Link to Django's runserver options in dev docs

* Allow <br> tags in rich text

* Copy from event: deal with deleted items

* Make validate_cart useful together with addons

* Fix collapsing panels in the addon choice step

* Button text change if addons are present

* Update translations

* Squash migrations and bump version

* Ticket PDFs: Do not hide attendee name if code is hidden

* Add a user guide on payments

* Link PayPal and Stripe documentation in the respective forms

* Hide payment fees if they are all equal to 0.00

* Refs #39 -- New concept of "teams" (#478)

* New models

* CRUD UI

* UI for adding/removing team members

* Log display for teams

* Fix invitations, move frontend

* Drop old models (incomplete)

* Drop more old stuff

* Drop even more old stuff

* Fix tests

* Fix permission test

* flake8 fix

* Add tests fore the new code

* Rebase migrations

* Fix typo in method name

* Update translations

* Force ordering of events on dashboard

* Fix typos in events

* Prepare the pretixdroid API for an async mode in the app

* Pretixdroid tests: Ignore microseconds (chopped by mysql)

* pretixdroid API: Add related lookups

* Add idempotenty nonces to pretixdroid API

* pretixdroid: force-accepting unpaids and time display

* Marked webfonts as binary files (#487)

Webfonts now listed as binary in `.gitattributes`.
Works on #486

* Fix #456 -- Allow products to be excluded from ticket-generation (#483)

* Added non-admission setting to event

`ticket_download_nonadm` now setting in storage. Still need logic for
order page/PDF generation.
Works on #456.

* Download button considers `ticket_download_nonadm`

Modified Django tags to look at item admission attribute and
`ticket_download_nonadm` setting.
Works on #456.

* Ticket output for non-admission disabled

PDFs/etc. will only be permitted/generated for items with the
`admission` attribute, or if the `ticket_download_nonadm` event setting
is true. Applies to single and whole-order ticket downloads.
Works on #456.

* Fixed product exclusion in PDF output

Forgot PDF output was a plugin, now includes same check as base
`BaseTicketOutput.generate_order`.
Works on #456

* Mail signature (#485)

* added signature field -- no function yet

* added mail signature feature

* fixed style issue

* fixed problem with signature default

* added unit test for mail signatures

* added unit test for mail signatures

* [WIP] Fix #447 -- Sendmail plugin: Create new mail based on an old one (#476)

* send old email content to the new one

* error key event

* test commit

* query bad ID

* query bad ID

* query bad ID

* query bad ID

* Update pretixdroid API version

* Refs #447 -- Extend copying old mails to subject and receipients

* Fixed bugs and added test for date range rendering (#488)

* fixed bug for same dates, added unit check for daterange

* fixed local language override in unit test

* Fix #297 -- pretixdroid: Show metrics in the control panel (#481)

* add checkin status page

add dashboard widget
add checkin page under orders

* modify checkin logic

added new fields in checkin page
added filter items

* add tests for checkins & minor improvement

* support addin_product & noadm setting logic

* remove name ordering check test case

* Fix #379 -- Add logo to event organizers (#431)

* [WIP] Add logo to event organizers.

* Fix indentation issues.

* Refactor code

Refactor code

Refactor code

* Add new migration

* Take files into account for organizer sform (settings form)

* Fix grammer

* Make bootstrap form errors specific to each fieldset

* Display logo on organizer's page

* Fix PR issues

Fix PR issues

Fix PR issues

* Reorder imports

* Remove conflicting migration

* Fix rebase conflict

* Fix #41 -- Drag-and-drop ticket editor

Undo/redo

Useful toolbox

Font selection

Add text content

Use hex for colors

JS-side dump and load

Save

Load layout, proper undo/redo

First steps to Python rendering

More PDF rendering

Copy and paste

Buttons for keyboard actions

Splash Screen

Block unbeforeunload in dirty state

Remove debugging output

Preview

Upload new PDFs via the editor

Fix bugs during PDF reload, link in settings form

New default ticket

Add OpenSans BI

Custom fonts, fix tests

* Added bootstrap-colorpicker

* Allow inline PDF display in CSP header

* Add fontpack to list of plugins

* Update German translation

* Add ticketoutputpdf's assets to MANIFEST.i

* Fix migration of old ticket styles

* Fix iCal download URL

* Multi-line location field, new field for admission time

* Admission date and time in editor

* Remove icon from "add to calendar"

* Try to fix PDF display problems in Safari

* Proxy cachedfiles that are used as editor previews

* Check Event.presale_is_running in more places

* Fix CSS generation with an empty color field

* Fix missing placeholders and reformat the sendmail view

* Fix bug that lead to wrong payment amount when switching payment method to PayPal later

* Update translation

* Revert "Syncing fork to upstream (#1)"

This reverts commit 847d409.
Merged wrong, my bad.

* Formatted OTP secret

New variable `secretGrouped` in `2fa_confirm_totp.html`, user-friendly
version of OTP secret (split every 4 characters).
Works on #443.

* Adds manual secret entry OTP setup screen

`secretGrouped` exposed in user-friendly fashion. Includes short
instructions, copy-to-clipboard button, and js to hide instructions
unless user clicks on "Can't scan the barcode?" link.
Works on #443.

* Minor indentation issuer

Fixed indentation issue (L40).
Works on #443.

* Minor spacing issues

L265 of `user.py` failing flake8 tests, minor spacing fixes.

* Fixes indentation in `2fa_confirm_totp.html`

Per #490 (comment),
fixes an issue with indentation.
Works on #443, member of #490.

* Removed `aria-*` attributes

Per #490 (comment),
removes `aria` attributes from sub-tutorial.
Works on #443, member of #490.

* Pretix capitalization issue

Per #490 (comment),
fixes an issue with capitalization of pretix.
Works on #443, member of #490.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants