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

External product url #430

Merged
merged 9 commits into from
Apr 19, 2023
Merged

Conversation

robertdijk
Copy link
Member

This PR adds the option to add a URL instead of products to an Event.
Using this you can have your event in events but have the registration somewhere else.

@robertdijk
Copy link
Member Author

robertdijk commented Apr 16, 2023

This is how I made it work now:

  • You can add an external product URL to an event.
  • You can not have both an external product URL and products in an event. (This is enforced by both the backend and the frontend)
  • If an event has an external product URL, it will render (on both the overview and event page) a box with the description and a "Register here" button instead of the add to basket button.
  • This button with open the URL in a new tab.

I do have 2 questions (@WISVCH/beheer)

  • I have now the long description as text in the box. But if this is too long, the box becomes larger, and all the other boxes also become larger, which is not very nice. How long are those descriptions usually? And are those the synced to the activities calendar?
  • How do I update the script.min.js file?

@robertdijk
Copy link
Member Author

Scherm­afbeelding 2023-04-18 om 19 40 29

This is how the homepage looks with an event with an external URL.
The description is now used as a text in the box. This could be a problem since the texts used could be very long.

Another option could be just having the button, like this:

Scherm­afbeelding 2023-04-18 om 19 45 37

I think that option is nicer. @julian9499 What do you think?

@JoepdeJong
Copy link
Contributor

JoepdeJong commented Apr 18, 2023

Personally I prefer the first one, but I think it does not really matter. If we want a better looking events page, we just have to redesign is. Both are fine by me.

@robertdijk
Copy link
Member Author

Personally I prefer the first one, but I think it does not really matter. If we want a better looking events page, we just have to redesign is. Both are fine by me.

Yea the problem is, is that when the description gets long, this happens.

Scherm­afbeelding 2023-04-19 om 09 36 55

@JoepdeJong
Copy link
Contributor

Yea the problem is, is that when the description gets long, this happens.

hmm, can't we just keep these descriptions short? or is this the general description of the event? What if you place a shorter version of the description after the i:

Screenshot 2023-04-19 at 10 02 47

@robertdijk
Copy link
Member Author

The Description is the one that is synced to the calendar, so I don't think we have an influence on the length.

@JoepdeJong
Copy link
Contributor

The Description is the one that is synced to the calendar, so I don't think we have an influence on the length.

Maybe I do not understand the problem. You want to show an additional description when tickets are sold externally? Or do you just want to fill up the space?

@robertdijk
Copy link
Member Author

The Description is the one that is synced to the calendar, so I don't think we have an influence on the length.

Maybe I do not understand the problem. You want to show an additional description when tickets are sold externally? Or do you just want to fill up the space?

I just wanted to fill up the space with possibly useful information. But I think it's best to keep it empty. If someone wants more information there, then can add it to the short description, which will automatically use up that space.

@robertdijk
Copy link
Member Author

Great, then i think with this look, it is ready!
Scherm­afbeelding 2023-04-19 om 10 28 33

@robertdijk robertdijk marked this pull request as ready for review April 19, 2023 08:31
@julian9499 julian9499 merged commit 1627379 into WISVCH:master Apr 19, 2023
@robertdijk robertdijk deleted the external_product_url branch April 19, 2023 15:03
JoepdeJong pushed a commit that referenced this pull request Oct 11, 2023
* Add external product URL to Event

* Add rendering of external URL when there is one

* Add rendering of external URL on event page

* Fix double text in external product url field

* Add validation checking for both products and url in one event

* Add validation checking for both products and url in one event in admin panel

* Add migration for external_product_url in event table

* Update script.min

* Remove description from external url event in webshop overview
JoepdeJong added a commit that referenced this pull request Oct 12, 2023
* initial commit devcontainer

* add devcontainer yml

* WIP: devcontainer

* External product url (#430)

* Add external product URL to Event

* Add rendering of external URL when there is one

* Add rendering of external URL on event page

* Fix double text in external product url field

* Add validation checking for both products and url in one event

* Add validation checking for both products and url in one event in admin panel

* Add migration for external_product_url in event table

* Update script.min

* Remove description from external url event in webshop overview

* Added feature to make sure users have to agree to the General terms a… (#432)

* Added feature to make sure users have to agree to the General terms and conditions

* Edited link to GTC.

* removed unnecessary margins from css

* Revert "Added feature to make sure users have to agree to the General terms a… (#432)" (#433)

This reverts commit 5a262b0.

* Add pull_request as workflow trigger for docker build and tests (#434)

* Added feature to make sure users have to agree to the General terms and Conditions (#435)

* Added feature to make sure users have to agree to the General terms and conditions

* Edited link to GTC.

* removed unnecessary margins from css

* fix and add tests

* refactoring

* added statement in mail that participant agreed to GTC

* Update src/main/java/ch/wisv/events/webshop/controller/WebshopCheckoutController.java

Co-authored-by: Julian van Dijk <[email protected]>

* Extracted link to GTC as variable

* Put GTC link in yml

---------

Co-authored-by: Julian van Dijk <[email protected]>

* Update docker.yml (#437)

* Add gtc checkbox to event page (#438)

* Feature/integrity (#440)

* Add jquery-3.2.1 sha

* Add jquery-3.2.1.slim sha

* Add popper.js sha

* Add datatables sha

* Bump nokogiri from 1.13.3 to 1.14.3 in /docs

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.14.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.13.3...v1.14.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump activesupport from 6.0.4.6 to 6.0.6.1 in /docs

Bumps [activesupport](https://github.com/rails/rails) from 6.0.4.6 to 6.0.6.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.0.4.2/activesupport/CHANGELOG.md)
- [Commits](rails/rails@v6.0.4.6...v6.0.6.1)

---
updated-dependencies:
- dependency-name: activesupport
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Add sha

* Implement VAT (#436)

* Implement VAT

* Add VAT table

* Update tests

* Update tests

* Fix tests

* Round price on 2 decimals

* Fix test GTC:

* Add gtc checkbox to event page (#438)

* Update tests

* Fix test

* KLote test

* Add order vat tests

* Add enumerated to VatRate

* Add vat column migrations

* Update V202306030__Add_vat_fields.java

* Update V202306030__Add_vat_fields.java

* Fix Beheer group (#445)

* Fix/logo size (#444)

* Fix logo alignment in webshop

* Fix header in event view

* Feature/scanned progress (#443)

* Add ScannedCount to Attendence class

* Move calculating attendance from controller to service and repository

* Add attendance to model for event overview page

* Add Scanned Tickets progress bar to event overview page

* Fix alignment of text in progress bars

* Remove example value

* Implement apple wallet passes (#446)

* Fix product test data

* Implement Apple Wallet Passes

* Remove redundant code

* Add cascade to Ticket - Order relation

* Add name to passes (#447)

* Add walletpasses to email (#448)

* Add name to passes

* Add wallet passes to email

* Fix MailService (#449)

* Fix/mailservice (#450)

* Fix MailService

* Fix tests

* Add connect devtokens to devcontainer

* Add try-catch to seeder

* Add datarunners to devcontainer

* Update devcontainer

* Remove oidc

* Rename

* Rename dockerfile

* Change port to 80

* Revert cascade on ticket to all

* Update workflow

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Julian <[email protected]>
Co-authored-by: Robert van Dijk <[email protected]>
Co-authored-by: KasperVaessen <[email protected]>
Co-authored-by: Julian van Dijk <[email protected]>
Co-authored-by: Julian van Dijk <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants