add a PosReport field for HAX sold through webshop tickets

This commit is contained in:
Thomas Steen Rasmussen 2020-09-03 00:16:44 +02:00
parent 399b6dc16d
commit c35eac9fe8
5 changed files with 32 additions and 0 deletions

View file

@ -28,6 +28,7 @@
<td>{{ pr.pos_end_hax }} HAX / {{ pr.pos_count_dkk_end }} DKK</td> <td>{{ pr.pos_end_hax }} HAX / {{ pr.pos_count_dkk_end }} DKK</td>
<td>{{ pr.pos_json_sales.1 }} HAX ({{ pr.pos_json_sales.0 }} tx)</td> <td>{{ pr.pos_json_sales.1 }} HAX ({{ pr.pos_json_sales.0 }} tx)</td>
<td>{{ pr.hax_sold_izettle }} HAX</td> <td>{{ pr.hax_sold_izettle }} HAX</td>
<td>{{ pr.hax_sold_website }} HAX</td>
<td>{{ pr.hax_balance }} HAX</td> <td>{{ pr.hax_balance }} HAX</td>
<td class="text-center">{{ pr.allok | truefalseicon }}</td> <td class="text-center">{{ pr.allok | truefalseicon }}</td>
<td> <td>

View file

@ -59,6 +59,10 @@ PosReport {{ posreport.date }} {{ posreport.pos.name }} | Pos | BackOffice | {{
<th>Hax Sold from iZettle</th> <th>Hax Sold from iZettle</th>
<td>{{ posreport.hax_sold_izettle }} HAX</td> <td>{{ posreport.hax_sold_izettle }} HAX</td>
</tr> </tr>
<tr>
<th>Hax Sold from website</th>
<td>{{ posreport.hax_sold_website }} HAX</td>
</tr>
<tr> <tr>
<th>Hax Balance (we want 0 here)</th> <th>Hax Balance (we want 0 here)</th>
<td>{{ posreport.hax_balance }} HAX</td> <td>{{ posreport.hax_balance }} HAX</td>

View file

@ -2076,6 +2076,7 @@ class PosReportUpdateView(PosViewMixin, UpdateView):
"bank_responsible", "bank_responsible",
"pos_responsible", "pos_responsible",
"hax_sold_izettle", "hax_sold_izettle",
"hax_sold_website",
"comments", "comments",
] ]
template_name = "posreport_form.html" template_name = "posreport_form.html"

View file

@ -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",
),
),
]

View file

@ -559,6 +559,11 @@ class PosReport(CampRelatedModel, UUIDModel):
default=0, help_text="The number of HAX sold through the iZettle from the POS", 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 start of day
bank_count_dkk_start = models.PositiveIntegerField( bank_count_dkk_start = models.PositiveIntegerField(