reynir
/
bornhack-website
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity
2,503 Commits 2 Branches 0 Tags 164 MiB
Commit Graph

2503 Commits

Author SHA1 Message Date
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
Thomas Steen Rasmussen 5c410939ed add detailed ticket stats view 2021-07-21 21:29:55 +02:00
Thomas Steen Rasmussen a8c4894b8f brush the dust off of the event system, add a new eventtype ticket_stats, add a management command to post ticket stats to irc, add a backoffice view showing ticket stats 2021-07-21 18:53:53 +02:00
Thomas Steen Rasmussen 4d06e647a2 ircbot: detect when the bot gets +o in a channel, and register it if needed 2021-07-20 11:09:53 +02:00
Thomas Steen Rasmussen efdc519c0b add skeleton on_mode() handler to ircbot 2021-07-20 08:16:32 +02:00
Thomas Steen Rasmussen 8661c423fe copy paste error 2021-07-20 07:22:01 +02:00
Thomas Steen Rasmussen 786e9d10bd add IrcOverView 2021-07-19 22:02:35 +02:00
Thomas Steen Rasmussen 949cb05ae1 remove all attempts to this the right way and do it the wrong way instead. This is fine. 2021-07-19 21:10:40 +02:00
Thomas Steen Rasmussen 4d1b96a5b8 use --ignore-init-module-imports 2021-07-19 17:09:56 +02:00
Thomas Steen Rasmussen 01687ea11a run pre-commit --all-files, it's been a while since last time 2021-07-19 15:06:10 +02:00
Thomas Steen Rasmussen a21bc1097c split backoffice views.py into multiple files, add autoflake to pre-commit 2021-07-19 15:00:59 +02:00
Thomas Steen Rasmussen f0f5a609b6
Merge pull request #852 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.3 
Bump hypothesis from 6.14.2 to 6.14.3 in /src/requirements
 2021-07-19 13:40:57 +02:00
dependabot[bot] ef929b4cd4
Bump hypothesis from 6.14.2 to 6.14.3 in /src/requirements 
Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.14.2 to 6.14.3.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.14.2...hypothesis-python-6.14.3)

---
updated-dependencies:
- dependency-name: hypothesis
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 11:26:22 +00:00
Thomas Steen Rasmussen cdd41c28f6
Merge pull request #851 from bornhack/dependabot/pip/src/requirements/black-21.7b0 
Bump black from 21.6b0 to 21.7b0 in /src/requirements
 2021-07-19 13:25:39 +02:00
dependabot[bot] e62caaa549
Bump black from 21.6b0 to 21.7b0 in /src/requirements 
Bumps [black](https://github.com/psf/black) from 21.6b0 to 21.7b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 09:00:43 +00:00
Thomas Steen Rasmussen d74c8c2b73
Merge pull request #847 from bornhack/dependabot/pip/src/requirements/channels-3.0.4 
Bump channels from 3.0.3 to 3.0.4 in /src/requirements
 2021-07-12 22:24:38 +02:00
Thomas Steen Rasmussen b5147cd875
Merge pull request #848 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.2 
Bump hypothesis from 6.13.1 to 6.14.2 in /src/requirements
 2021-07-12 22:24:22 +02:00