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

Remove Paypal plugin #309

Open
wants to merge 42 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c1ac364
Add plugins to autodeployment with docker (#208)
AviGawande Jul 1, 2024
37815b8
Implement option to add link to privacy policy (#227)
odkhang Jul 3, 2024
9f4459b
Option to add customizable links to footer (#225)
lcduong Jul 8, 2024
10623c5
Replace pkg_resources (#232)
odkhang Jul 12, 2024
52d2dbd
Do not repeat questions in form field of ticket form (#235)
odkhang Jul 13, 2024
df5bd17
Added templates (#229)
Sak1012 Jul 13, 2024
7755761
Implement customer accounts in system (#223)
lcduong Aug 15, 2024
3041c94
change default color for new organization (#240)
lcduong Jul 15, 2024
393fc21
Use master branch in docker-pr workflow (#243)
norbusan Jul 17, 2024
5d15b66
Allows tab IDs to be set in the HTML code (#247)
lcduong Jul 20, 2024
a0a5350
skip check for empty country (#246)
lcduong Jul 20, 2024
594d0db
Revoked devices to be removed from device list (#249)
Sak1012 Jul 24, 2024
d2af280
Email template: Add {Join online event} placeholder into the email te…
odkhang Aug 1, 2024
e6be115
handle case allow all ticket to join (#271)
odkhang Aug 1, 2024
19b12b1
Implement token for the Join online event button on the ticket page (…
lcduong Aug 5, 2024
bab2323
Implement script to create customer account for customer placed order…
lcduong Aug 14, 2024
2745dda
Update content in join video online popup (#278)
lcduong Aug 6, 2024
af60dca
stay on same tab when click menu (#281)
lcduong Aug 6, 2024
fa42d17
implement API to check if user paid for event or not (#280)
lcduong Aug 6, 2024
92d87d1
update join_online_event placeholder (#284)
lcduong Aug 7, 2024
5a86468
update content of popup when join online event (#283)
lcduong Aug 7, 2024
a390b5b
Fix join online button layout (#286)
lcduong Aug 14, 2024
b6704f7
add space between notification and header (#288)
odkhang Aug 9, 2024
db237e8
Add translations of menu schedule, session, tickets, join video onlin…
odkhang Aug 12, 2024
229cb1c
localize and login should be in same line
lcduong Aug 15, 2024
23eceed
update token key
lcduong Aug 15, 2024
9ae9fa6
Update translation for user dropdown menu (#295)
lcduong Aug 16, 2024
f5aeb05
Update dummy test data (#298)
odkhang Aug 20, 2024
e63d3f3
specify the version of psycopg2 (#296)
lcduong Aug 20, 2024
dbc51c4
Rename Wikimania Katowice to a variable for {event}
lcduong Aug 21, 2024
c679914
Use translation placeholders instead of split strings
odkhang Aug 29, 2024
506fdff
format po file
odkhang Aug 29, 2024
88816c2
Unified QR response (#304)
Sak1012 Sep 9, 2024
7236d0d
Implement oauth2 authentication for SSO login from talk component (#310)
odkhang Sep 17, 2024
44bb9f0
Implement eventyay-common: organiser/team management (#317)
odkhang Sep 17, 2024
79357ae
Set base path using force_script_name (#324)
odkhang Sep 17, 2024
72fd977
Implement common component - create/update event (#323)
odkhang Sep 17, 2024
6af43db
remove unsued import
odkhang Sep 23, 2024
69a456a
Set default base path (#326)
odkhang Sep 24, 2024
de24cd3
remove paypal plugin
odkhang Aug 29, 2024
c640291
remove paypal
odkhang Aug 29, 2024
f2c6833
add eventyay-paypal to docker auto deployment
odkhang Aug 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/docker-pr-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
push: true
tags: eventyay/eventyay-ticket:development
labels: manual
build-args: GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
build-args: GITHUB_TOKEN=${{ secrets.EVENTYAY_TOKEN }}
9 changes: 7 additions & 2 deletions .github/workflows/docker-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Docker PR Build

on:
pull_request:
branches: [development, main]
branches: [development, master]

jobs:
build_docker_image:
Expand All @@ -14,4 +14,9 @@ jobs:
uses: actions/checkout@v2

- name: Build Docker image
run: docker build --build-arg GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} -t eventyay-ticket:${{ github.sha }} .
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: false
tags: eventyay-ticket:${{ github.sha }}
build-args: GITHUB_TOKEN=${{ secrets.EVENTYAY_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
build-args: GITHUB_TOKEN=${{ secrets.EVENTYAY_TOKEN }}
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v2
- uses: harmon758/postgresql-action@v1
with:
postgresql version: '11'
postgresql version: '12'
postgresql db: 'pretix'
postgresql user: 'postgres'
postgresql password: 'postgres'
Expand All @@ -45,7 +45,9 @@ jobs:
- name: Install system dependencies
run: sudo apt update && sudo apt install gettext
- name: Install Python dependencies
run: pip3 install -e ".[dev]" psycopg2-binary
run: |
sed -i '/eventyay-stripe/d' pyproject.toml
pip3 install -e ".[dev]" psycopg2-binary
- name: Run checks
run: python manage.py check
working-directory: ./src
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
COPY pyproject.toml /pretix/pyproject.toml
COPY src /pretix/src

ENV DJANGO_SETTINGS_MODULE=
RUN pip3 install -U \
pip \
setuptools \
Expand All @@ -58,6 +59,7 @@ RUN pip3 install -U \
-e ".[memcached]" \
gunicorn django-extensions ipython && \
rm -rf ~/.cache/pip
ENV DJANGO_SETTINGS_MODULE=production_settings

RUN chmod +x /usr/local/bin/pretix && \
rm /etc/nginx/sites-enabled/default && \
Expand Down
3 changes: 0 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@ recursive-include src/pretix/plugins/banktransfer/templates *
recursive-include src/pretix/plugins/banktransfer/static *
recursive-include src/pretix/plugins/manualpayment/templates *
recursive-include src/pretix/plugins/manualpayment/static *
recursive-include src/pretix/plugins/paypal/templates *
recursive-include src/pretix/plugins/pretixdroid/templates *
recursive-include src/pretix/plugins/pretixdroid/static *
recursive-include src/pretix/plugins/sendmail/templates *
recursive-include src/pretix/plugins/statistics/templates *
recursive-include src/pretix/plugins/statistics/static *
recursive-include src/pretix/plugins/stripe/templates *
recursive-include src/pretix/plugins/stripe/static *
recursive-include src/pretix/plugins/ticketoutputpdf/templates *
recursive-include src/pretix/plugins/ticketoutputpdf/static *
recursive-include src/pretix/plugins/badges/templates *
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ See the LICENSE file for the complete license text.

This project is maintained by FOSSASIA. See the AUTHORS file for a list of all the awesome contributors of this project.

.. _installation guide: https://docs.pretix.eu/en/latest/admin/installation/index.html
.. _installation guide: https://docs.eventyay.com/en/latest/admin/installation/index.html
.. _eventyay.com: https://eventyay.com
.. _blog: https://blog.eventyay.com
8 changes: 4 additions & 4 deletions doc/_templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ <h2>Useful links</h2>

<div class="sectionbox">
<div class="icon">
<a href="https://pretix.eu" target="_blank">
<a href="https://eventyay.com" target="_blank">
<span class="fa fa-globe fa-fw"></span>
</a>
</div>
<div class="text">
<a href="https://pretix.eu" target="_blank">
<a href="https://eventyay.com" target="_blank">
<strong>Project website</strong>
</a>
<p>eventyay.com is your gateway to the eventyay project, offering premier commercial hosting services all in one place.</p>
Expand All @@ -129,12 +129,12 @@ <h2>Useful links</h2>
<div class="clearfix"></div>
<div class="sectionbox">
<div class="icon">
<a href="https://pretix.eu/about/en/blog/" target="_blank">
<a href="https://eventyay.com/about/en/blog/" target="_blank">
<span class="fa fa-newspaper-o fa-fw"></span>
</a>
</div>
<div class="text">
<a href="https://pretix.eu/about/en/blog/" target="_blank">
<a href="https://eventyay.com/about/en/blog/" target="_blank">
<strong>Project blog</strong>
</a>
<p>This essential resource provides all release notes for stable eventyay releases, along with general news and updates.</p>
Expand Down
4 changes: 2 additions & 2 deletions doc/admin/installation/docker_smallscale.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This has some trade-offs in terms of performance and isolation but allows a rath

.. warning:: Even though we try to make it straightforward to run pretix, it still requires some Linux experience to
get it right. If you're not feeling comfortable managing a Linux server, check out our hosting and service
offers at `pretix.eu`_.
offers at `eventyay.com`_.

We tested this guide on the Linux distribution **Debian 8.0** but it should work very similar on other
modern distributions, especially on all systemd-based ones.
Expand Down Expand Up @@ -308,7 +308,7 @@ workers, e.g. ``docker run … taskworker -Q notifications --concurrency 32``.
.. _Postfix: https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-postfix-as-a-send-only-smtp-server-on-ubuntu-16-04
.. _nginx: https://botleg.com/stories/https-with-lets-encrypt-and-nginx/
.. _Let's Encrypt: https://letsencrypt.org/
.. _pretix.eu: https://pretix.eu/
.. _eventyay.com: https://eventyay.com/
.. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
.. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-20-04
.. _redis: https://blog.programster.org/debian-8-install-redis-server/
Expand Down
4 changes: 2 additions & 2 deletions doc/admin/installation/enterprise.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ some extra steps. Installation works similar to normal pretix plugins, but invol
Buying the license
------------------

To obtain a license, please get in touch at sales@pretix.eu. Please let us know how many tickets you roughly intend
To obtain a license, please get in touch at sales@eventyay.com. Please let us know how many tickets you roughly intend
to sell per year and how many servers you want to use the plugin on. We recommend having a look at our `price list`_
first.

Expand Down Expand Up @@ -81,4 +81,4 @@ You can now use that image ``mypretix`` instead of ``pretix/standalone:stable``
service file. Be sure to re-build your custom image after you pulled ``pretix/standalone`` if you want to perform an
update to a new version of pretix.

.. _price list: https://pretix.eu/about/en/pricing
.. _price list: https://eventyay.com/about/en/pricing
4 changes: 2 additions & 2 deletions doc/admin/installation/manual_smallscale.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ solution with many things readily set-up, look at :ref:`dockersmallscale`.

.. warning:: Even though we try to make it straightforward to run pretix, it still requires some Linux experience to
get it right. If you're not feeling comfortable managing a Linux server, check out our hosting and service
offers at `pretix.eu`_.
offers at `eventyay.com`_.

We tested this guide on the Linux distribution **Debian 10.0** but it should work very similar on other
modern distributions, especially on all systemd-based ones.
Expand Down Expand Up @@ -307,7 +307,7 @@ example::
.. _Postfix: https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-postfix-as-a-send-only-smtp-server-on-ubuntu-16-04
.. _nginx: https://botleg.com/stories/https-with-lets-encrypt-and-nginx/
.. _Let's Encrypt: https://letsencrypt.org/
.. _pretix.eu: https://pretix.eu/
.. _eventyay.com: https://eventyay.com/
.. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
.. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-20-04
.. _redis: https://blog.programster.org/debian-8-install-redis-server/
Expand Down
8 changes: 4 additions & 4 deletions doc/admin/scaling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ and what you should think of.
and helped building, scaling and load-testing pretix installations at any scale and we're looking
forward to work with you on fine-tuning your system. If you intend to sell **more than a thousand
tickets in a very short amount of time**, we highly recommend reaching out and at least talking this
through. Just get in touch at sales@pretix.eu!
through. Just get in touch at sales@eventyay.com!

Scaling reasons
---------------
Expand Down Expand Up @@ -87,7 +87,7 @@ them from a different URL <config-urls>`.

If you expect *really high traffic* for your very popular event, you might want to do some rate limiting on this layer, or,
if you want to ensure a fair and robust first-come-first-served experience and prefer letting users wait over showing them
errors, consider a queuing solution. We're happy to provide you with such systems, just get in touch at sales@pretix.eu.
errors, consider a queuing solution. We're happy to provide you with such systems, just get in touch at sales@eventyay.com.

pretix-web
""""""""""
Expand Down Expand Up @@ -156,7 +156,7 @@ on each of the other servers.

Since we use Django's file storage mechanism internally, you can in theory also use a object-storage solution like Amazon S3, Ceph, or Minio to store these files, although we currently do not expose this through pretix' configuration file and this would require you to ship your own variant of ``pretix/settings.py`` and reference it through the ``DJANGO_SETTINGS_MODULE`` environment variable.

At pretix.eu, we use a custom-built `object storage cluster`_.
At eventyay.com, we use a custom-built `object storage cluster`_.

SQL database
""""""""""""
Expand Down Expand Up @@ -233,4 +233,4 @@ throughput. If you want to use pretix for an event with 10,000+ tickets that are
within minutes, please get in touch to discuss possible solutions. We'll work something out for you!


.. _object storage cluster: https://behind.pretix.eu/2018/03/20/high-available-cdn/
.. _object storage cluster: https://behind.eventyay.com/2018/03/20/high-available-cdn/
16 changes: 8 additions & 8 deletions doc/api/deviceauth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ a new device, users can specify a list of events the device is allowed to access
device is created, users will be presented initialization instructions, consisting of an URL
and an initialization token. They will also be shown as a QR code with the following contents::

{"handshake_version": 1, "url": "https://pretix.eu", "token": "kpp4jn8g2ynzonp6"}
{"handshake_version": 1, "url": "https://eventyay.com", "token": "kpp4jn8g2ynzonp6"}

Your application should be able to scan a QR code of this type, or allow to enter the URL and the
initialization token manually. The handshake version is not used for manual initialization. When a
Expand All @@ -25,7 +25,7 @@ as well as the type of underlying hardware. Example:
.. sourcecode:: http

POST /api/v1/device/initialize HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Content-Type: application/json

{
Expand Down Expand Up @@ -79,7 +79,7 @@ like the following:
:emphasize-lines: 3

GET /api/v1/organizers/ HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd

Updating the software version
Expand All @@ -91,7 +91,7 @@ following endpoint:
.. sourcecode:: http

POST /api/v1/device/update HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Content-Type: application/json
Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd

Expand All @@ -113,7 +113,7 @@ The old API key will be invalid immediately. A request for a new key looks like
.. sourcecode:: http

POST /api/v1/device/roll HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd

The response will look like the response to the initialization request.
Expand All @@ -127,7 +127,7 @@ invalidate your API key. There is no way to reverse this operation.
.. sourcecode:: http

POST /api/v1/device/revoke HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd

This can also be done by the user through the web interface.
Expand Down Expand Up @@ -157,7 +157,7 @@ invalidate your API key. There is no way to reverse this operation.
.. sourcecode:: http

POST /api/v1/device/revoke HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd

This can also be done by the user through the web interface.
Expand All @@ -174,7 +174,7 @@ query parameters:
.. sourcecode:: http

GET /api/v1/device/eventselection?current_event=democon&current_subevent=42&current_checkinlist=542 HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd

You can get three response codes:
Expand Down
6 changes: 3 additions & 3 deletions doc/api/fundamentals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ the form of:

{
"count": 117,
"next": "https://pretix.eu/api/v1/organizers/?page=2",
"next": "https://eventyay.com/api/v1/organizers/?page=2",
"previous": null,
"results": […],
}
Expand Down Expand Up @@ -240,7 +240,7 @@ you will first need to make a separate request to our file upload endpoint:
.. sourcecode:: http

POST /api/v1/upload HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Authorization: Token e1l6gq2ye72thbwkacj7jbri7a7tvxe614ojv8ybureain92ocub46t5gab5966k
Content-Type: image/png
Content-Disposition: attachment; filename="logo.png"
Expand All @@ -266,7 +266,7 @@ be used using the same authorization method and user that was used to upload the
.. sourcecode:: http

PATCH /api/v1/organizers/test/events/test/items/3/ HTTP/1.1
Host: pretix.eu
Host: eventyay.com
Content-Type: application/json

{
Expand Down
8 changes: 4 additions & 4 deletions doc/api/guides/custom_checkout.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ calculated automatically.
.. sourcecode:: http

POST /api/v1/organizers/democon/events/3vjrh/orders/ HTTP/1.1
Host: test.pretix.eu
Host: test.eventyay.com
Accept: application/json, text/javascript
Content-Type: application/json
Authorization: …
Expand Down Expand Up @@ -100,19 +100,19 @@ The user will be redirected back to your page instead of pretix' order confirmat
**regardless of whether it was successful or not**. Make sure you use our API to check if the payment actually
worked! Your final URL could look like this::

https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234
https://test.eventyay.com/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234

You can also embed this page in an ``<iframe>`` instead. Note, however, that this causes problems with some payment
methods such as PayPal which do not allow being opened in an iframe. pretix can partly work around these issues by
opening a new window, but will only to so if you also append an ``iframe=1`` parameter to the URL::

https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234&iframe=1
https://test.eventyay.com/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234&iframe=1

If you did **not** pass a payment method since you want us to ask the user which payment method they want to use, you
need to construct the URL from the ``url`` attribute of the order and the sub-path ``pay/change```. For example, you
would end up with the following URL::

https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/change
https://test.eventyay.com/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/change

Of course, you can also use the ``iframe`` and ``return_url`` parameters here.

Expand Down
Loading
Loading