diff --git a/src/backoffice/templates/includes/posreport_list_table.html b/src/backoffice/templates/includes/posreport_list_table.html
index 56d6f044..515ae517 100644
--- a/src/backoffice/templates/includes/posreport_list_table.html
+++ b/src/backoffice/templates/includes/posreport_list_table.html
@@ -5,10 +5,8 @@
Date |
Pos |
Responsible |
- Bank Start |
- Pos Start |
- Bank End |
- Pos End |
+ DKK Cash iZettle |
+ DKK Balance |
Hax Income |
Hax Sold iZettle |
Hax Sold Website |
@@ -23,10 +21,13 @@
{{ pr.date }} |
{{ pr.pos.name }} |
Bank: {{ pr.bank_responsible }} Pos: {{ pr.pos_responsible }} |
- {{ pr.bank_start_hax }} HAX / {{ pr.bank_count_dkk_start }} DKK |
- {{ pr.pos_start_hax }} HAX / {{ pr.pos_count_dkk_start }} DKK |
- {{ pr.bank_end_hax }} HAX / {{ pr.bank_count_dkk_end }} DKK |
- {{ pr.pos_end_hax }} HAX / {{ pr.pos_count_dkk_end }} DKK |
+ {{ pr.dkk_sales_izettle }} DKK |
+
+ {{ pr.bank_count_dkk_start }}
+ + {{ pr.dkk_sales_izettle }}
+ - {{ pr.bank_count_dkk_end }}
+ = {{ pr.dkk_balance }}
+ |
{{ pr.pos_json_sales.1 }} HAX ({{ pr.pos_json_sales.0 }} tx) |
{{ pr.hax_sold_izettle }} HAX |
{{ pr.hax_sold_website }} HAX |
diff --git a/src/backoffice/templates/posreport_detail.html b/src/backoffice/templates/posreport_detail.html
index b8d453fb..7d2fbaf9 100644
--- a/src/backoffice/templates/posreport_detail.html
+++ b/src/backoffice/templates/posreport_detail.html
@@ -55,6 +55,39 @@ PosReport {{ posreport.date }} {{ posreport.pos.name }} | Pos | BackOffice | {{
All OK? |
{{ posreport.allok | truefalseicon }}
+ |
+ DKK cash sales from iZettle |
+ {{ posreport.dkk_sales_izettle }} DKK |
+
+
+ DKK balance |
+
+
+
+
+ |
+ {{ posreport.bank_count_dkk_start }} DKK |
+ Bank start count |
+
+
+ - |
+ {{ posreport.dkk_sales_izettle }} DKK |
+ DKK cash income through iZettle |
+
+
+ - |
+ {{ posreport.bank_count_dkk_end }} DKK |
+ Returned to the bank at day end |
+
+
+ = |
+ {{ posreport.dkk_balance }} DKK |
+ Final balance. Negative means the POS returned too many DKK, positive means the POS returned too few DKK. |
+
+
+
+ |
+
Hax Sold from iZettle |
{{ posreport.hax_sold_izettle }} HAX |
diff --git a/src/economy/migrations/0018_posreport_dkk_sales_izettle.py b/src/economy/migrations/0018_posreport_dkk_sales_izettle.py
new file mode 100644
index 00000000..41450828
--- /dev/null
+++ b/src/economy/migrations/0018_posreport_dkk_sales_izettle.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1 on 2020-09-02 23:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("economy", "0017_posreport_hax_sold_website"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="posreport",
+ name="dkk_sales_izettle",
+ field=models.PositiveIntegerField(
+ default=0, help_text="The total DKK amount in iZettle cash sales"
+ ),
+ ),
+ ]
diff --git a/src/economy/models.py b/src/economy/models.py
index e260438f..a31a7b26 100644
--- a/src/economy/models.py
+++ b/src/economy/models.py
@@ -555,6 +555,10 @@ class PosReport(CampRelatedModel, UUIDModel):
blank=True, help_text="Any comments about this PosReport",
)
+ dkk_sales_izettle = models.PositiveIntegerField(
+ default=0, help_text="The total DKK amount in iZettle cash sales"
+ )
+
hax_sold_izettle = models.PositiveIntegerField(
default=0, help_text="The number of HAX sold through the iZettle from the POS",
)
@@ -840,3 +844,16 @@ class PosReport(CampRelatedModel, UUIDModel):
balance -= self.bank_end_hax
# all good
return balance
+
+ @property
+ def dkk_balance(self):
+ """Return the DKK balance all things considered."""
+ balance = 0
+ # start with the bank count at the start of the day
+ balance += self.bank_count_dkk_start
+ # then add the iZettle sales for the day
+ balance += self.dkk_sales_izettle
+ # then substract what was returned to the bank at days end
+ balance -= self.bank_count_dkk_end
+ # all good
+ return balance