From 19b61315651b952fba239df2400ef3525479adf3 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 31 Jan 2017 23:24:38 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20AbonStreets=20=D0=B2=20AbonStr?= =?UTF-8?q?eet=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/models.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/abonapp/models.py b/abonapp/models.py index a6fb158..ab60604 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -147,7 +147,7 @@ class AbonTariff(models.Model): ) -class AbonStreets(models.Model): +class AbonStreet(models.Model): name = models.CharField(max_length=64) group = models.ForeignKey(AbonGroup) @@ -162,7 +162,7 @@ class Abon(UserProfile): ip_address = models.OneToOneField(IpPoolItem, on_delete=models.SET_NULL, null=True, blank=True) #TODO: надо ж пароль для абонента создавать description = models.TextField(null=True, blank=True) - street = models.ForeignKey(AbonStreets, on_delete=models.SET_NULL, null=True, blank=True) + street = models.ForeignKey(AbonStreet, on_delete=models.SET_NULL, null=True, blank=True) house = models.CharField(max_length=12, null=True, blank=True) _act_tar_cache = None @@ -311,6 +311,35 @@ class InvoiceForPayment(models.Model): db_table = 'abonent_inv_pay' +# Log for pay system "AllTime" +class AllTimePayLog(models.Model): + pay_id = models.CharField(max_length=36, unique=True, primary_key=True) + date_add = models.DateTimeField(auto_now_add=True) + summ = models.FloatField(default=0.0) + + def __str__(self): + return self.pay_id + + class Meta: + db_table = 'all_time_pay_log' + ordering = ('date_add',) + + +# log for all terminals +class AllPayLog(models.Model): + pay_id = models.CharField(max_length=64, primary_key=True) + date_action = models.DateTimeField(auto_now_add=True) + summ = models.FloatField(default=0.0) + pay_system_name = models.CharField(max_length=16) + + def __str__(self): + return self.pay_system_name + + class Meta: + db_table = 'all_pay_log' + ordering = ('date_action',) + + def abon_post_save(sender, instance, **kwargs): if instance.ip_address: user_ip = instance.ip_address.int_ip()