mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-15 18:53:25 +00:00
Fix unappropriate behavior when delete selling
This commit is contained in:
parent
11c263b6e7
commit
e98ffb5cd5
@ -55,8 +55,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for i in customer.refillings.order_by('-date').filter(
|
{% for i in customer.refillings.order_by('-date').filter( date__year=year, date__month=month) %}
|
||||||
date__year=year, date__month=month) %}
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
|
<td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
|
||||||
<td>{{ i.counter }}</td>
|
<td>{{ i.counter }}</td>
|
||||||
|
@ -223,7 +223,7 @@ class Counter(models.Model):
|
|||||||
|
|
||||||
def is_inactive(self):
|
def is_inactive(self):
|
||||||
"""
|
"""
|
||||||
Returns True if the counter self is inactive from SITH_COUNTER_MINUTE_INACTIVE's value minutes, else False
|
Returns True if the counter self is inactive from SITH_COUNTER_MINUTE_INACTIVE's value minutes, else False
|
||||||
"""
|
"""
|
||||||
return self.is_open() and ((timezone.now() - self.permanencies.order_by('-activity').first().activity) > datetime.timedelta(minutes=settings.SITH_COUNTER_MINUTE_INACTIVE))
|
return self.is_open() and ((timezone.now() - self.permanencies.order_by('-activity').first().activity) > datetime.timedelta(minutes=settings.SITH_COUNTER_MINUTE_INACTIVE))
|
||||||
|
|
||||||
@ -303,8 +303,9 @@ class Selling(models.Model):
|
|||||||
return user == self.customer.user
|
return user == self.customer.user
|
||||||
|
|
||||||
def delete(self, *args, **kwargs):
|
def delete(self, *args, **kwargs):
|
||||||
self.customer.amount += self.quantity * self.unit_price
|
if self.payment_method == "SITH_ACCOUNT":
|
||||||
self.customer.save()
|
self.customer.amount += self.quantity * self.unit_price
|
||||||
|
self.customer.save()
|
||||||
super(Selling, self).delete(*args, **kwargs)
|
super(Selling, self).delete(*args, **kwargs)
|
||||||
|
|
||||||
def send_mail_customer(self):
|
def send_mail_customer(self):
|
||||||
@ -331,7 +332,7 @@ class Selling(models.Model):
|
|||||||
self.customer.user.email_user(
|
self.customer.user.email_user(
|
||||||
subject,
|
subject,
|
||||||
message_txt,
|
message_txt,
|
||||||
html_message=message_html
|
html_message=message_html
|
||||||
)
|
)
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
|
Loading…
Reference in New Issue
Block a user