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

Feature/integrity #440

Merged
merged 4 commits into from
Jun 30, 2023
Merged

Feature/integrity #440

merged 4 commits into from
Jun 30, 2023

Conversation

JoepdeJong
Copy link
Contributor

No description provided.

@JoepdeJong JoepdeJong merged commit 9df0629 into master Jun 30, 2023
4 checks passed
@JoepdeJong JoepdeJong deleted the feature/integrity branch October 5, 2023 07:20
JoepdeJong added a commit that referenced this pull request Oct 11, 2023
* Add jquery-3.2.1 sha

* Add jquery-3.2.1.slim sha

* Add popper.js sha

* Add datatables sha
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.

1 participant