sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.9 funcs for raise and highlight routes

Browse Source
This commit is contained in:
SDE
2024-06-03 02:46:58 +03:00
parent a83ff0e080
commit e319a8af46
11 changed files with 249 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SubscribesApp/admin.py
View File

@@ -45,7 +45,7 @@ class Admin_SubscribeOption(Admin_Trans_BaseModel):
(None, {
'classes': ['wide'],
'fields': (
'allow_route_rising_count', 'allow_route_select_count'
'allow_route_rising_count', 'allow_route_highlight_count'
)
}),
)
@@ -82,7 +82,7 @@ class Admin_SubscribeForUser(Admin_Trans_BaseModel):
list_display = [
'id', 'enable',
'name', 'user', 'subscribe',
'used_route_rising_count', 'used_route_select_count',
'used_route_rising_count', 'used_route_highlight_count',
'last_paid_DT', 'paid_period_from_DT', 'paid_period_to_DT',
'auto_continue', 'receive_finish_subscribe_msg',
'order', 'modifiedDT', 'createDT'

18
SubscribesApp/migrations/0005_rename_used_route_select_count_subscribeforuser_used_route_highlight_count.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 4.2.2 on 2024-06-03 02:30
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('SubscribesApp', '0004_subscribeforuser_used_route_rising_count_and_more'),
]
operations = [
migrations.RenameField(
model_name='subscribeforuser',
old_name='used_route_select_count',
new_name='used_route_highlight_count',
),
]

18
SubscribesApp/migrations/0006_rename_allow_route_select_count_subscribeoption_allow_route_highlight_count.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 4.2.2 on 2024-06-03 02:43
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('SubscribesApp', '0005_rename_used_route_select_count_subscribeforuser_used_route_highlight_count'),
]
operations = [
migrations.RenameField(
model_name='subscribeoption',
old_name='allow_route_select_count',
new_name='allow_route_highlight_count',
),
]

10
SubscribesApp/models.py
View File

@@ -18,7 +18,7 @@ from datetime import datetime, timedelta
class SubscribeOption(BaseModel):
allow_route_rising_count = models.IntegerField(verbose_name=_('Количество поднятий объявлений') ,default=0)
allow_route_select_count = models.IntegerField(verbose_name=_('Количество выделений объявлений'), default=0)
allow_route_highlight_count = models.IntegerField(verbose_name=_('Количество выделений объявлений'), default=0)
class Meta:
verbose_name = _('Опция подписки')
@@ -71,7 +71,7 @@ class SubscribeForUser(BaseModel):
default=False, verbose_name=_('Получать сообщения о окончании периода'))
used_route_rising_count = models.IntegerField(verbose_name=_('Использовано поднятий объявлений'), default=0)
used_route_select_count = models.IntegerField(verbose_name=_('Использовано выделений объявлений'), default=0)
used_route_highlight_count = models.IntegerField(verbose_name=_('Использовано выделений объявлений'), default=0)
class Meta:
verbose_name = _('Пользовательская подписка')
@@ -94,13 +94,13 @@ class SubscribeForUser(BaseModel):
enable=True, rel_subscribes_for_option=self.subscribe
).aggregate(
total_route_rising_count = Coalesce(Sum('allow_route_rising_count'), 0),
total_route_select_count = Coalesce(Sum('allow_route_select_count'), 0),
total_route_highlight_count = Coalesce(Sum('allow_route_highlight_count'), 0),
)
total_data.update({
'used_route_rising_count': self.used_route_rising_count,
'used_route_select_count': self.used_route_select_count,
'used_route_highlight_count': self.used_route_highlight_count,
'remains_route_rising_count': total_data['total_route_rising_count'] - self.used_route_rising_count,
'remains_route_select_count': total_data['total_route_select_count'] - self.used_route_select_count,
'remains_route_highlight_count': total_data['total_route_highlight_count'] - self.used_route_highlight_count,
})
return total_data