integrace api, stripe, vytvoření commecre app
This commit is contained in:
@@ -16,15 +16,6 @@ import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Custom User Manager to handle soft deletion
|
||||
class CustomUserActiveManager(UserManager):
|
||||
def get_queryset(self):
|
||||
return super().get_queryset().filter(is_deleted=False)
|
||||
|
||||
# Custom User Manager to handle all users, including soft deleted
|
||||
class CustomUserAllManager(UserManager):
|
||||
def get_queryset(self):
|
||||
return super().get_queryset()
|
||||
|
||||
|
||||
class CustomUser(SoftDeleteModel, AbstractUser):
|
||||
@@ -67,33 +58,6 @@ class CustomUser(SoftDeleteModel, AbstractUser):
|
||||
email = models.EmailField(unique=True, db_index=True)
|
||||
create_time = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
|
||||
"""company_id = models.CharField(
|
||||
max_length=8,
|
||||
blank=True,
|
||||
null=True,
|
||||
validators=[
|
||||
RegexValidator(
|
||||
regex=r'^\d{8}$',
|
||||
message="Company ID must contain exactly 8 digits.",
|
||||
code='invalid_company_id'
|
||||
)
|
||||
]
|
||||
)"""
|
||||
|
||||
"""personal_id = models.CharField(
|
||||
max_length=11,
|
||||
blank=True,
|
||||
null=True,
|
||||
validators=[
|
||||
RegexValidator(
|
||||
regex=r'^\d{6}/\d{3,4}$',
|
||||
message="Personal ID must be in the format 123456/7890.",
|
||||
code='invalid_personal_id'
|
||||
)
|
||||
]
|
||||
)"""
|
||||
|
||||
city = models.CharField(null=True, blank=True, max_length=100)
|
||||
street = models.CharField(null=True, blank=True, max_length=200)
|
||||
|
||||
@@ -113,9 +77,6 @@ class CustomUser(SoftDeleteModel, AbstractUser):
|
||||
|
||||
is_active = models.BooleanField(default=False)
|
||||
|
||||
objects = CustomUserActiveManager()
|
||||
all_objects = CustomUserAllManager()
|
||||
|
||||
REQUIRED_FIELDS = ['email', "username", "password"]
|
||||
|
||||
|
||||
@@ -125,14 +86,10 @@ class CustomUser(SoftDeleteModel, AbstractUser):
|
||||
def delete(self, *args, **kwargs):
|
||||
self.is_active = False
|
||||
|
||||
#self.orders.all().update(is_deleted=True, deleted_at=timezone.now())
|
||||
|
||||
return super().delete(*args, **kwargs)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
is_new = self.pk is None # check BEFORE saving
|
||||
|
||||
if is_new:
|
||||
if self.pk is None: # if newely created user
|
||||
|
||||
if self.is_superuser or self.role == "admin":
|
||||
self.is_active = True
|
||||
|
||||
Reference in New Issue
Block a user