diff --git a/src/backoffice/templates/includes/posreport_list_table.html b/src/backoffice/templates/includes/posreport_list_table.html index 4fc363e1..45c25ef9 100644 --- a/src/backoffice/templates/includes/posreport_list_table.html +++ b/src/backoffice/templates/includes/posreport_list_table.html @@ -28,6 +28,7 @@ {{ pr.pos_end_hax }} HAX / {{ pr.pos_count_dkk_end }} DKK {{ pr.pos_json_sales.1 }} HAX ({{ pr.pos_json_sales.0 }} tx) {{ pr.hax_sold_izettle }} HAX + {{ pr.hax_sold_website }} HAX {{ pr.hax_balance }} HAX {{ pr.allok | truefalseicon }} diff --git a/src/backoffice/templates/posreport_detail.html b/src/backoffice/templates/posreport_detail.html index 6d74ba6e..84a5b202 100644 --- a/src/backoffice/templates/posreport_detail.html +++ b/src/backoffice/templates/posreport_detail.html @@ -59,6 +59,10 @@ PosReport {{ posreport.date }} {{ posreport.pos.name }} | Pos | BackOffice | {{ Hax Sold from iZettle {{ posreport.hax_sold_izettle }} HAX + + Hax Sold from website + {{ posreport.hax_sold_website }} HAX + Hax Balance (we want 0 here) {{ posreport.hax_balance }} HAX diff --git a/src/backoffice/views.py b/src/backoffice/views.py index f46818e5..59bcb91e 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -2076,6 +2076,7 @@ class PosReportUpdateView(PosViewMixin, UpdateView): "bank_responsible", "pos_responsible", "hax_sold_izettle", + "hax_sold_website", "comments", ] template_name = "posreport_form.html" diff --git a/src/economy/migrations/0017_posreport_hax_sold_website.py b/src/economy/migrations/0017_posreport_hax_sold_website.py new file mode 100644 index 00000000..880d276a --- /dev/null +++ b/src/economy/migrations/0017_posreport_hax_sold_website.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1 on 2020-09-02 22:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("economy", "0016_posreport_hax_sold_izettle"), + ] + + operations = [ + migrations.AddField( + model_name="posreport", + name="hax_sold_website", + field=models.PositiveIntegerField( + default=0, + help_text="The number of HAX sold through webshop tickets being used in the POS", + ), + ), + ] diff --git a/src/economy/models.py b/src/economy/models.py index e09cb9ac..85161e08 100644 --- a/src/economy/models.py +++ b/src/economy/models.py @@ -559,6 +559,11 @@ class PosReport(CampRelatedModel, UUIDModel): default=0, help_text="The number of HAX sold through the iZettle from the POS", ) + hax_sold_website = models.PositiveIntegerField( + default=0, + help_text="The number of HAX sold through webshop tickets being used in the POS", + ) + # bank count start of day bank_count_dkk_start = models.PositiveIntegerField(