Adding rounding to farepaying status
Added route filtering by traveller ID instead of traveller object
This commit is contained in:
@@ -6,7 +6,7 @@ from django.db import models
|
|||||||
|
|
||||||
class Setting(models.Model):
|
class Setting(models.Model):
|
||||||
name = models.CharField(max_length=20, unique=True)
|
name = models.CharField(max_length=20, unique=True)
|
||||||
value = models.CharField(max_length=20, blank=True)
|
value = models.CharField(max_length=50, blank=True)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
@@ -230,7 +230,7 @@ class Traveller(models.Model):
|
|||||||
new_start_date = None
|
new_start_date = None
|
||||||
new_end_date = None
|
new_end_date = None
|
||||||
|
|
||||||
for travellerRoute in TravellerRoute.objects.filter(traveller=self):
|
for travellerRoute in TravellerRoute.objects.filter(traveller=self.id):
|
||||||
route_start = travellerRoute.travel_start_date
|
route_start = travellerRoute.travel_start_date
|
||||||
route_end = travellerRoute.travel_end_date
|
route_end = travellerRoute.travel_end_date
|
||||||
if route_start is not None:
|
if route_start is not None:
|
||||||
@@ -259,7 +259,7 @@ class Traveller(models.Model):
|
|||||||
stops += stop.active_stops()
|
stops += stop.active_stops()
|
||||||
if stops > 1:
|
if stops > 1:
|
||||||
stops = 1
|
stops = 1
|
||||||
return f"${str(cost * stops)}"
|
return f"${round(cost*stops)}"
|
||||||
|
|
||||||
def _repopulate_address(self):
|
def _repopulate_address(self):
|
||||||
families = self.get_families()
|
families = self.get_families()
|
||||||
|
|||||||
Reference in New Issue
Block a user