Thomas Steen Rasmussen
|
3e71a55a3a
|
add missing endif
|
2021-08-10 12:37:04 +02:00 |
|
Thomas Steen Rasmussen
|
c3fe368ca7
|
Merge pull request #863 from bornhack/dependabot/pip/src/requirements/codecov-2.1.12
Bump codecov from 2.1.11 to 2.1.12 in /src/requirements
|
2021-08-10 08:40:03 +02:00 |
|
Thomas Steen Rasmussen
|
fa9e032cac
|
Merge pull request #867 from bornhack/dependabot/pip/src/requirements/pre-commit-2.14.0
Bump pre-commit from 2.13.0 to 2.14.0 in /src/requirements
|
2021-08-10 08:39:45 +02:00 |
|
Thomas Steen Rasmussen
|
a8d88b45df
|
Merge pull request #868 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.6
Bump hypothesis from 6.14.3 to 6.14.6 in /src/requirements
|
2021-08-10 08:39:21 +02:00 |
|
Thomas Steen Rasmussen
|
2968afb1e0
|
show POS links in backoffice only for orga, bar and infoteam, show proxy link only to orga
|
2021-08-10 08:35:59 +02:00 |
|
dependabot[bot]
|
de6b3cbd17
|
Bump hypothesis from 6.14.3 to 6.14.6 in /src/requirements
Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.14.3 to 6.14.6.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.14.3...hypothesis-python-6.14.6)
---
updated-dependencies:
- dependency-name: hypothesis
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-08-09 09:01:11 +00:00 |
|
dependabot[bot]
|
ac93cdbe30
|
Bump pre-commit from 2.13.0 to 2.14.0 in /src/requirements
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.13.0...v2.14.0)
---
updated-dependencies:
- dependency-name: pre-commit
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-08-09 09:01:00 +00:00 |
|
Thomas Steen Rasmussen
|
5162a54a2d
|
enable email to submitter and speakers when an event is scheduled
|
2021-08-07 15:31:11 +02:00 |
|
dependabot[bot]
|
07197f9c53
|
Bump codecov from 2.1.11 to 2.1.12 in /src/requirements
Bumps [codecov](https://github.com/codecov/codecov-python) from 2.1.11 to 2.1.12.
- [Release notes](https://github.com/codecov/codecov-python/releases)
- [Changelog](https://github.com/codecov/codecov-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-python/compare/v2.1.11...v2.1.12)
---
updated-dependencies:
- dependency-name: codecov
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-08-03 09:00:47 +00:00 |
|
Thomas Steen Rasmussen
|
d5fa4b98d5
|
fix ordering and epaypaymentadmin
|
2021-08-03 09:03:42 +02:00 |
|
Thomas Steen Rasmussen
|
e8d10bb7a1
|
make EpayPaymentAdmin more useful
|
2021-08-03 08:45:41 +02:00 |
|
Thomas Steen Rasmussen
|
fa1aac03bb
|
allow blank values, stupid django
|
2021-08-03 07:22:00 +02:00 |
|
Thomas Steen Rasmussen
|
48952c5463
|
add used_time to BaseTicket model so we know when tickets were checked in/used
|
2021-08-02 20:11:36 +02:00 |
|
Thomas Steen Rasmussen
|
a99c546e06
|
Merge pull request #856 from bornhack/dependabot/pip/src/requirements/django-bleach-0.7.2
Bump django-bleach from 0.7.0 to 0.7.2 in /src/requirements
|
2021-08-02 19:48:45 +02:00 |
|
Thomas Steen Rasmussen
|
0b34203b0f
|
Merge pull request #857 from bornhack/dependabot/pip/src/requirements/isort-5.9.3
Bump isort from 5.9.2 to 5.9.3 in /src/requirements
|
2021-08-02 19:48:31 +02:00 |
|
Thomas Steen Rasmussen
|
ab21c01cdc
|
Merge pull request #860 from bornhack/dependabot/pip/src/requirements/pipdeptree-2.1.0
Bump pipdeptree from 2.0.0 to 2.1.0 in /src/requirements
|
2021-08-02 19:48:19 +02:00 |
|
Thomas Steen Rasmussen
|
25496c5575
|
Merge pull request #861 from bornhack/dependabot/pip/src/requirements/django-3.2.6
Bump django from 3.2.5 to 3.2.6 in /src/requirements
|
2021-08-02 19:48:06 +02:00 |
|
Thomas Steen Rasmussen
|
a71443c62b
|
Merge pull request #862 from bornhack/dependabot/pip/src/requirements/ipython-7.26.0
Bump ipython from 7.25.0 to 7.26.0 in /src/requirements
|
2021-08-02 19:47:50 +02:00 |
|
dependabot[bot]
|
e5df49cc94
|
Bump ipython from 7.25.0 to 7.26.0 in /src/requirements
Bumps [ipython](https://github.com/ipython/ipython) from 7.25.0 to 7.26.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](https://github.com/ipython/ipython/compare/7.25.0...7.26.0)
---
updated-dependencies:
- dependency-name: ipython
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-08-02 09:00:54 +00:00 |
|
dependabot[bot]
|
69836d9529
|
Bump django from 3.2.5 to 3.2.6 in /src/requirements
Bumps [django](https://github.com/django/django) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/commits)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-08-02 09:00:51 +00:00 |
|
dependabot[bot]
|
0366bff6fd
|
Bump pipdeptree from 2.0.0 to 2.1.0 in /src/requirements
Bumps [pipdeptree](https://github.com/naiquevin/pipdeptree) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/naiquevin/pipdeptree/releases)
- [Changelog](https://github.com/naiquevin/pipdeptree/blob/master/CHANGES.md)
- [Commits](https://github.com/naiquevin/pipdeptree/compare/2.0.0...2.1.0)
---
updated-dependencies:
- dependency-name: pipdeptree
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-08-02 09:00:48 +00:00 |
|
Thomas Steen Rasmussen
|
7d4ad533f7
|
remove oooold typo
|
2021-08-01 18:12:58 +02:00 |
|
Thomas Steen Rasmussen
|
792fc2bfc0
|
unbreak refund order function, while here show on order list and detail pages if an order is refunded, also fix tickettype detail stats so they dont include refunded orders
|
2021-08-01 17:45:37 +02:00 |
|
Thomas Steen Rasmussen
|
929cde010e
|
do not crap out when no tickets exist
|
2021-08-01 17:43:53 +02:00 |
|
Víðir Valberg Guðmundsson
|
b5dd97e935
|
Initial docker-compose setup
|
2021-07-30 09:26:50 +02:00 |
|
Thomas Steen Rasmussen
|
db7d4909c7
|
Merge pull request #859 from bornhack/add_ticket_stats_on_overview_take_two
Ticket stats take two
|
2021-07-30 07:28:33 +02:00 |
|
Víðir Valberg Guðmundsson
|
1889d3bf15
|
income not cost.
|
2021-07-29 20:35:14 +02:00 |
|
Víðir Valberg Guðmundsson
|
34dcacea0c
|
DRYing the method up a bit.
|
2021-07-29 20:33:43 +02:00 |
|
Víðir Valberg Guðmundsson
|
4ed6392554
|
Avoid rounding down.
|
2021-07-29 17:13:58 +02:00 |
|
Víðir Valberg Guðmundsson
|
198f6d26c7
|
Added avg. price per ticket per ticket type.
|
2021-07-29 17:08:43 +02:00 |
|
Víðir Valberg Guðmundsson
|
4ed1b51ba2
|
This time the numbers add up.
|
2021-07-29 16:47:42 +02:00 |
|
Víðir Valberg Guðmundsson
|
67ac9ee820
|
It was being used.
|
2021-07-29 15:23:18 +02:00 |
|
Thomas Steen Rasmussen
|
e96b8a9e44
|
Merge pull request #858 from bornhack/add_ticket_stats_on_overview
Add annotations that provide a per ticket type sales information.
|
2021-07-29 15:16:52 +02:00 |
|
Víðir Valberg Guðmundsson
|
1006b926c5
|
Add annotations that provide a per ticket type sales information.
|
2021-07-29 15:08:20 +02:00 |
|
Thomas Steen Rasmussen
|
2ca5fb5314
|
fix ticket view after order<>opr change
|
2021-07-29 12:30:35 +02:00 |
|
dependabot[bot]
|
846564959a
|
Bump isort from 5.9.2 to 5.9.3 in /src/requirements
Bumps [isort](https://github.com/pycqa/isort) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.9.2...5.9.3)
---
updated-dependencies:
- dependency-name: isort
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-07-29 09:00:43 +00:00 |
|
Thomas Steen Rasmussen
|
02424115f2
|
enable save as new for Facility, FacilityType, facilityOpeningHours admin
|
2021-07-29 09:32:07 +02:00 |
|
Thomas Steen Rasmussen
|
517f29940a
|
remove FK from ShopTicket to Order and replace with an FK to OrderProductRelation
|
2021-07-29 09:03:52 +02:00 |
|
dependabot[bot]
|
37ab7e3633
|
Bump django-bleach from 0.7.0 to 0.7.2 in /src/requirements
Bumps [django-bleach](https://github.com/marksweb/django-bleach) from 0.7.0 to 0.7.2.
- [Release notes](https://github.com/marksweb/django-bleach/releases)
- [Changelog](https://github.com/marksweb/django-bleach/blob/master/CHANGELOG.md)
- [Commits](https://github.com/marksweb/django-bleach/compare/0.7.0...0.7.2)
---
updated-dependencies:
- dependency-name: django-bleach
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-07-28 09:00:54 +00:00 |
|
Thomas Steen Rasmussen
|
4c6eca2a6d
|
backoffice: add average price across all tickets of the given type to the tickettype stats detail view
|
2021-07-26 18:47:34 +02:00 |
|
Thomas Steen Rasmussen
|
a494bdfd4b
|
backoffice: add totals to the bottom of ticket type details table
|
2021-07-26 18:09:11 +02:00 |
|
Thomas Steen Rasmussen
|
02b796e90b
|
rename to paid_order_count
|
2021-07-22 08:06:43 +02:00 |
|
Thomas Steen Rasmussen
|
f61d0b85e8
|
use Count() to get the number of paid orders for the product
|
2021-07-22 08:02:28 +02:00 |
|
Thomas Steen Rasmussen
|
b76cc2ed64
|
remove wrong info for now
|
2021-07-22 07:55:58 +02:00 |
|
Thomas Steen Rasmussen
|
21b479e253
|
only count paid orders
|
2021-07-22 07:12:13 +02:00 |
|
Thomas Steen Rasmussen
|
41467447a8
|
always mark OPR as ticket_generated=True
|
2021-07-22 00:35:07 +02:00 |
|
Thomas Steen Rasmussen
|
0e0374b577
|
calculate profit in the database, skip the margin calculation for now
|
2021-07-22 00:07:30 +02:00 |
|
Thomas Steen Rasmussen
|
ec816a5c11
|
realise there can be more than one thing on each ticket, fix
|
2021-07-21 23:14:48 +02:00 |
|
Thomas Steen Rasmussen
|
0973709ef0
|
fix profit margin calculation
|
2021-07-21 21:36:50 +02:00 |
|
Thomas Steen Rasmussen
|
21111e0c2c
|
typo
|
2021-07-21 21:32:46 +02:00 |
|