Change the resultset from the yearly and monthly billing data queries.

Fix some formatting of the return objects.
This commit is contained in:
Rebecca Law
2017-04-27 15:43:57 +01:00
committed by Ken Tsang
parent fdbadf967e
commit 1a64509186
6 changed files with 121 additions and 108 deletions

View File

@@ -847,7 +847,7 @@ class NotificationHistory(db.Model, HistoryModel):
international = db.Column(db.Boolean, nullable=False, default=False)
phone_prefix = db.Column(db.String, nullable=True)
rate_multiplier = db.Column(db.Float(), nullable=True)
rate_multiplier = db.Column(db.Float(asdecimal=False), nullable=True)
@classmethod
def from_original(cls, notification):
@@ -968,5 +968,5 @@ class Rate(db.Model):
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
valid_from = db.Column(db.DateTime, nullable=False)
rate = db.Column(db.Numeric(asdecimal=False), nullable=False)
rate = db.Column(db.Float(asdecimal=False), nullable=False)
notification_type = db.Column(notification_types, index=True, nullable=False)