Skip to content

Commit

Permalink
change is_checked to is_check
Browse files Browse the repository at this point in the history
  • Loading branch information
imperosol committed Jul 4, 2024
1 parent 9f393b2 commit 97039d1
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 17 deletions.
1 change: 0 additions & 1 deletion club/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,6 @@ def test_delete_remove_from_meta_group(self):
Test that when a club is deleted, all its members are removed from the
associated metagroup
"""
print(self.club)
memberships = self.club.members.select_related("user")
users = [membership.user for membership in memberships]
meta_group = self.club.unix_name + settings.SITH_MEMBER_SUFFIX
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 4.2 on 2024-07-04 08:29

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("counter", "0021_rename_check_cashregistersummaryitem_is_checked"),
]

operations = [
migrations.RenameField(
model_name="cashregistersummaryitem",
old_name="is_checked",
new_name="is_check",
),
migrations.AlterField(
model_name="cashregistersummaryitem",
name="is_check",
field=models.BooleanField(
default=False,
help_text="True if this is a bank check, else False",
verbose_name="check",
),
),
]
26 changes: 15 additions & 11 deletions counter/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -930,25 +930,25 @@ def __getattribute__(self, name):
if name[:5] == "check":
checks = self.items.filter(check=True).order_by("value").all()
if name == "ten_cents":
return self.items.filter(value=0.1, is_checked=False).first()
return self.items.filter(value=0.1, is_check=False).first()
elif name == "twenty_cents":
return self.items.filter(value=0.2, is_checked=False).first()
return self.items.filter(value=0.2, is_check=False).first()
elif name == "fifty_cents":
return self.items.filter(value=0.5, is_checked=False).first()
return self.items.filter(value=0.5, is_check=False).first()
elif name == "one_euro":
return self.items.filter(value=1, is_checked=False).first()
return self.items.filter(value=1, is_check=False).first()
elif name == "two_euros":
return self.items.filter(value=2, is_checked=False).first()
return self.items.filter(value=2, is_check=False).first()
elif name == "five_euros":
return self.items.filter(value=5, is_checked=False).first()
return self.items.filter(value=5, is_check=False).first()
elif name == "ten_euros":
return self.items.filter(value=10, is_checked=False).first()
return self.items.filter(value=10, is_check=False).first()
elif name == "twenty_euros":
return self.items.filter(value=20, is_checked=False).first()
return self.items.filter(value=20, is_check=False).first()
elif name == "fifty_euros":
return self.items.filter(value=50, is_checked=False).first()
return self.items.filter(value=50, is_check=False).first()
elif name == "hundred_euros":
return self.items.filter(value=100, is_checked=False).first()
return self.items.filter(value=100, is_check=False).first()
elif name == "check_1":
return checks[0] if 0 < len(checks) else None
elif name == "check_2":
Expand Down Expand Up @@ -996,7 +996,11 @@ class CashRegisterSummaryItem(models.Model):
)
value = CurrencyField(_("value"))
quantity = models.IntegerField(_("quantity"), default=0)
is_checked = models.BooleanField(_("check"), default=False)
is_check = models.BooleanField(
_("check"),
default=False,
help_text=_("True if this is a bank check, else False"),
)

class Meta:
verbose_name = _("cash register summary item")
Expand Down
10 changes: 5 additions & 5 deletions counter/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1204,35 +1204,35 @@ def save(self, counter=None):
cash_summary=summary,
value=cd["check_1_value"],
quantity=cd["check_1_quantity"],
is_checked=True,
is_check=True,
).save()
if cd["check_2_quantity"]:
CashRegisterSummaryItem(
cash_summary=summary,
value=cd["check_2_value"],
quantity=cd["check_2_quantity"],
is_checked=True,
is_check=True,
).save()
if cd["check_3_quantity"]:
CashRegisterSummaryItem(
cash_summary=summary,
value=cd["check_3_value"],
quantity=cd["check_3_quantity"],
is_checked=True,
is_check=True,
).save()
if cd["check_4_quantity"]:
CashRegisterSummaryItem(
cash_summary=summary,
value=cd["check_4_value"],
quantity=cd["check_4_quantity"],
is_checked=True,
is_check=True,
).save()
if cd["check_5_quantity"]:
CashRegisterSummaryItem(
cash_summary=summary,
value=cd["check_5_value"],
quantity=cd["check_5_quantity"],
is_checked=True,
is_check=True,
).save()
if summary.items.count() < 1:
summary.delete()
Expand Down

0 comments on commit 97039d1

Please sign in to comment.