javad/crmApi
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

before tehran

Browse Source
This commit is contained in:
mohammad javad fesahat committed 2024-08-24 16:00:11 +03:30
1 parent ef18434b86
commit 43f5dd4594
15 files changed
+193 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.idea/workspace.xml
Generated
+7 -25
View File
@@ -5,33 +5,12 @@
</component>
<component name="ChangeListManager">
<list default="true" id="87c5db51-3e89-4a98-9bbb-121c9c52ab3c" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/aws.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/crmApi.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/crmApi.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/cuser/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/cuser/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/customer/selectors.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/customer/selectors.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/jwt_auth/services.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/jwt_auth/services.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/lead/selectors.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/selectors.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/cuser/cuser_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/cuser/cuser_model.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/customer/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/customer/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/lead/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/lead/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/selectors/order.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/selectors/order.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/selectors/product.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/selectors/product.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/views/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/views/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/views/excel_import.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/views/excel_import.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/views/order.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/views/order.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/shop/views/product.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/shop/views/product.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/workspace/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/workspace/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/asgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/asgi.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/settings/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/settings/base.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/settings/production.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/settings/production.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/wsgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/wsgi.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/requirements/base.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements/base.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/ticket/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/ticket/models.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -173,6 +152,9 @@
<workItem from="1719038043515" duration="2436000" />
<workItem from="1720441183640" duration="1046000" />
<workItem from="1720442591368" duration="302000" />
<workItem from="1721885637579" duration="1931000" />
<workItem from="1722924760522" duration="1012000" />
<workItem from="1724485712064" duration="2705000" />
</task>
<servers />
</component>
apps/cuser/cuser_model.py
+1 -1
View File
@@ -24,7 +24,7 @@ class CUserManager(BaseUserManager):
class CUser(BaseModel, AbstractBaseUser, PermissionsMixin):
username = models.CharField(max_length=50, null=False, blank=False, unique=True)
mobile = models.PositiveBigIntegerField(null=False, blank=False, unique=True)
name_family = models.CharField(max_length=50, null=True, blank=True)
name_family = models.CharField(max_length=100, null=True, blank=True)
is_active = models.BooleanField(default=False)
is_staff = models.BooleanField(default=False)
is_superuser = models.BooleanField(default=False)
apps/cuser/migrations/0013_alter_cuser_name_family.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2024-07-25 05:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cuser', '0012_cuserrole_is_admin'),
]
operations = [
migrations.AlterField(
model_name='cuser',
name='name_family',
field=models.CharField(blank=True, max_length=100, null=True),
),
]
apps/customer/migrations/0007_alter_customer_name_family.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2024-07-25 05:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('customer', '0006_alter_customernote_options'),
]
operations = [
migrations.AlterField(
model_name='customer',
name='name_family',
field=models.CharField(max_length=100),
),
]
apps/customer/models.py
+1 -1
View File
@@ -49,7 +49,7 @@ class CustomerGroup(BaseModel):
class Customer(BaseModel):
name_family = models.CharField(max_length=25, null=False, blank=False)
name_family = models.CharField(max_length=100, null=False, blank=False)
mobile = models.PositiveBigIntegerField(null=True, blank=True)
phone = models.PositiveBigIntegerField(null=True, blank=True)
address = models.CharField(max_length=100, null=True, blank=True)
apps/jwt_auth/migrations/0087_alter_cuserroleloginopt_uuid.py
+19
View File
@@ -0,0 +1,19 @@
# Generated by Django 4.2.1 on 2024-07-25 05:38
from django.db import migrations, models
import uuid
class Migration(migrations.Migration):
dependencies = [
('jwt_auth', '0086_alter_cuserroleloginopt_uuid'),
]
operations = [
migrations.AlterField(
model_name='cuserroleloginopt',
name='uuid',
field=models.UUIDField(default=uuid.UUID('0fc1ec70-e817-495e-91c9-e98666cbc2c1'), unique=True),
),
]
apps/jwt_auth/migrations/0088_alter_cuserroleloginopt_uuid.py
+19
View File
@@ -0,0 +1,19 @@
# Generated by Django 4.2.1 on 2024-07-25 05:42
from django.db import migrations, models
import uuid
class Migration(migrations.Migration):
dependencies = [
('jwt_auth', '0087_alter_cuserroleloginopt_uuid'),
]
operations = [
migrations.AlterField(
model_name='cuserroleloginopt',
name='uuid',
field=models.UUIDField(default=uuid.UUID('35e24d20-a3c0-4e33-9307-aff890cfd593'), unique=True),
),
]
apps/lead/migrations/0041_alter_lead_status.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2024-07-25 05:38
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('lead', '0040_alter_lead_status'),
]
operations = [
migrations.AlterField(
model_name='lead',
name='status',
field=models.CharField(blank=True, choices=[('UN', 'unknown'), ('FA', 'FAIL'), ('SU', 'OK')], default='UN', max_length=2, null=True),
),
]
apps/lead/migrations/0042_alter_lead_desc_alter_lead_status_alter_lead_title_and_more.py
+33
View File
@@ -0,0 +1,33 @@
# Generated by Django 4.2.1 on 2024-07-25 05:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('lead', '0041_alter_lead_status'),
]
operations = [
migrations.AlterField(
model_name='lead',
name='desc',
field=models.TextField(),
),
migrations.AlterField(
model_name='lead',
name='status',
field=models.CharField(blank=True, choices=[('SU', 'OK'), ('FA', 'FAIL'), ('UN', 'unknown')], default='UN', max_length=2, null=True),
),
migrations.AlterField(
model_name='lead',
name='title',
field=models.CharField(max_length=300),
),
migrations.AlterField(
model_name='leadcomment',
name='desc',
field=models.TextField(),
),
]
apps/lead/models.py
+3 -3
View File
@@ -48,8 +48,8 @@ class Lead(BaseModel):
("UN", "unknown"),
}
title = models.CharField(max_length=100)
desc = models.CharField(max_length=300)
title = models.CharField(max_length=300)
desc = models.TextField()
customer = models.ForeignKey(CustomerModel, on_delete=models.CASCADE, null=False, blank=False)
product_type = models.ForeignKey(ProductTypeModel, on_delete=models.SET_NULL, null=True, blank=True)
type = models.ForeignKey(LeadType, on_delete=models.SET_NULL, null=True, blank=True)
@@ -68,7 +68,7 @@ class Lead(BaseModel):
class LeadComment(BaseModel):
lead = models.ForeignKey(Lead, on_delete=models.CASCADE, null=False, blank=False, related_name='lead_comment')
desc = models.CharField(max_length=300)
desc = models.TextField()
cuser_role = models.ForeignKey(CuserRoleModel, on_delete=models.SET_NULL, null=True, blank=True)
sys_ws = models.ForeignKey(WorkspaceModel, on_delete=models.CASCADE, null=False, blank=False)
apps/lead/views.py
+1 -1
View File
@@ -228,7 +228,7 @@ class LeadRetrieveApi(APIView):
class LeadCommentCreateApi(APIView):
class InputSerializer(serializers.Serializer):
desc = serializers.CharField(max_length=200, required=True)
desc = serializers.CharField(required=True)
class OutputSerializer(serializers.Serializer):
id = serializers.IntegerField(required=True)
apps/reminder/migrations/0035_alter_reminder_type.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2024-07-25 05:38
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('reminder', '0034_alter_reminder_type'),
]
operations = [
migrations.AlterField(
model_name='reminder',
name='type',
field=models.CharField(choices=[('UN', 'UNKNOWN'), ('CU', 'CUSTOMER'), ('LE', 'LEAD'), ('NO', 'NOTE')], default='UN', max_length=2),
),
]
apps/reminder/migrations/0036_alter_reminder_type.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2024-07-25 05:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('reminder', '0035_alter_reminder_type'),
]
operations = [
migrations.AlterField(
model_name='reminder',
name='type',
field=models.CharField(choices=[('NO', 'NOTE'), ('LE', 'LEAD'), ('CU', 'CUSTOMER'), ('UN', 'UNKNOWN')], default='UN', max_length=2),
),
]
apps/ticket/migrations/0009_alter_ticketcomment_desc.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2024-07-25 05:38
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('ticket', '0008_alter_ticketcommentfile_ticket_comment'),
]
operations = [
migrations.AlterField(
model_name='ticketcomment',
name='desc',
field=models.TextField(),
),
]
apps/ticket/models.py
+1 -1
View File
@@ -25,7 +25,7 @@ class Ticket(BaseModel):
class TicketComment(BaseModel):
ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE, null=False, blank=False)
desc = models.CharField(max_length=500)
desc = models.TextField()
cuser_role = models.ForeignKey(CuserRole, on_delete=models.CASCADE, null=False, blank=False)
sys_ws = models.ForeignKey(Workspace, on_delete=models.CASCADE, null=False, blank=False)