diff --git a/accounts/templates/accounts.html b/accounts/templates/accounts.html
index 0ca7b419..85e7db96 100644
--- a/accounts/templates/accounts.html
+++ b/accounts/templates/accounts.html
@@ -119,6 +119,7 @@
href="{% url 'accounts:view_account' each_account.id %}">{{ each_account.name }}{% endif %}
+ {% if each_account.created_by %}
{% if each_account.created_by.profile_pic %}
{% thumbnail each_account.created_by.profile_pic "40x40" crop="center" as im %}
+ style="width: 40px;height: 40px;" title="{{ each_account.created_by }}" />
+ {% endif %}
+ {% else %}
+ None
{% endif %}
|
{% if each_account.billing_city %}{{ each_account.billing_city }} {% else %} Not specified
@@ -182,6 +186,7 @@
|
| ID |
Name |
+ Created By |
City |
State |
Tags |
@@ -201,6 +206,21 @@
{% if each_account.name %}{{ each_account.name }}{% endif %}
|
+
+ {% if each_account.created_by %}
+ {% if each_account.created_by.profile_pic %}
+ {% thumbnail each_account.created_by.profile_pic "40x40" crop="center" as im %}
+
+ {% endthumbnail %}
+ {% else %}
+
+ {% endif %}
+ {% else %}
+ None
+ {% endif %}
+ |
{% if each_account.billing_city %}{{ each_account.billing_city }} {% else %} Not specified
{% endif %} |
{% if each_account.billing_state %}{{ each_account.billing_state }} {% else %} Not
diff --git a/accounts/views.py b/accounts/views.py
index 1c15e225..994638d8 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -20,9 +20,10 @@ from django.contrib.auth.decorators import login_required
from accounts.tasks import send_email
from common.tasks import send_email_user_mentions
from django.contrib.sites.shortcuts import get_current_site
+from common.access_decorators_mixins import (
+ sales_access_required, marketing_access_required, SalesAccessRequiredMixin, MarketingAccessRequiredMixin)
-
-class AccountsListView(LoginRequiredMixin, TemplateView):
+class AccountsListView(SalesAccessRequiredMixin, LoginRequiredMixin, TemplateView):
model = Account
context_object_name = "accounts_list"
template_name = "accounts.html"
@@ -95,7 +96,7 @@ class AccountsListView(LoginRequiredMixin, TemplateView):
return self.render_to_response(context)
-class CreateAccountView(LoginRequiredMixin, CreateView):
+class CreateAccountView(SalesAccessRequiredMixin, LoginRequiredMixin, CreateView):
model = Account
form_class = AccountForm
template_name = "create_account.html"
@@ -194,7 +195,7 @@ class CreateAccountView(LoginRequiredMixin, CreateView):
return context
-class AccountDetailView(LoginRequiredMixin, DetailView):
+class AccountDetailView(SalesAccessRequiredMixin, LoginRequiredMixin, DetailView):
model = Account
context_object_name = "account_record"
template_name = "view_account.html"
@@ -240,7 +241,7 @@ class AccountDetailView(LoginRequiredMixin, DetailView):
return context
-class AccountUpdateView(LoginRequiredMixin, UpdateView):
+class AccountUpdateView(SalesAccessRequiredMixin, LoginRequiredMixin, UpdateView):
model = Account
form_class = AccountForm
template_name = "create_account.html"
@@ -342,7 +343,7 @@ class AccountUpdateView(LoginRequiredMixin, UpdateView):
return context
-class AccountDeleteView(LoginRequiredMixin, DeleteView):
+class AccountDeleteView(SalesAccessRequiredMixin, LoginRequiredMixin, DeleteView):
model = Account
template_name = 'view_account.html'
diff --git a/cases/tests.py b/cases/tests.py
index 39b8e61e..273053f3 100644
--- a/cases/tests.py
+++ b/cases/tests.py
@@ -284,7 +284,8 @@ class TestCasesListViewForUser(CaseCreation, TestCase):
first_name="mpmp",
username='mpmp',
email='mpmp@micropyramid.com',
- role="USER")
+ role="USER",
+ has_sales_access=True)
self.usermp.set_password('mp')
self.usermp.save()
diff --git a/cases/views.py b/cases/views.py
index ecc959ae..a37955b9 100644
--- a/cases/views.py
+++ b/cases/views.py
@@ -1,4 +1,5 @@
import json
+from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.sites.shortcuts import get_current_site
from django.core.mail import EmailMessage
@@ -19,9 +20,11 @@ from django.urls import reverse
from django.core.exceptions import PermissionDenied
from common.tasks import send_email_user_mentions
from cases.tasks import send_email_to_assigned_user
+from common.access_decorators_mixins import (
+ sales_access_required, marketing_access_required, SalesAccessRequiredMixin, MarketingAccessRequiredMixin)
-class CasesListView(LoginRequiredMixin, TemplateView):
+class CasesListView(SalesAccessRequiredMixin, LoginRequiredMixin, TemplateView):
model = Case
context_object_name = "cases"
template_name = "cases.html"
@@ -77,6 +80,8 @@ class CasesListView(LoginRequiredMixin, TemplateView):
return self.render_to_response(context)
+@login_required
+@sales_access_required
def create_case(request):
users = []
if request.user.role == 'ADMIN' or request.user.is_superuser:
@@ -162,7 +167,7 @@ def create_case(request):
return render(request, template_name, context)
-class CaseDetailView(LoginRequiredMixin, DetailView):
+class CaseDetailView(SalesAccessRequiredMixin, LoginRequiredMixin, DetailView):
model = Case
context_object_name = "case_record"
template_name = "view_case.html"
@@ -201,6 +206,8 @@ class CaseDetailView(LoginRequiredMixin, DetailView):
return context
+@login_required
+@sales_access_required
def update_case(request, pk):
case_object = Case.objects.filter(pk=pk).first()
accounts = Account.objects.filter(status="open")
@@ -312,7 +319,7 @@ def update_case(request, pk):
return render(request, "create_cases.html", context)
-class RemoveCaseView(LoginRequiredMixin, View):
+class RemoveCaseView(SalesAccessRequiredMixin, LoginRequiredMixin, View):
def get(self, request, *args, **kwargs):
case_id = kwargs.get("case_id")
@@ -345,7 +352,7 @@ class RemoveCaseView(LoginRequiredMixin, View):
raise PermissionDenied
-class CloseCaseView(LoginRequiredMixin, View):
+class CloseCaseView(SalesAccessRequiredMixin, LoginRequiredMixin, View):
def post(self, request, *args, **kwargs):
case_id = request.POST.get("case_id")
diff --git a/common/access_decorators_mixins.py b/common/access_decorators_mixins.py
new file mode 100644
index 00000000..ddb04c0f
--- /dev/null
+++ b/common/access_decorators_mixins.py
@@ -0,0 +1,50 @@
+from functools import wraps
+
+from django.contrib.auth.mixins import AccessMixin, LoginRequiredMixin
+from django.core.exceptions import PermissionDenied
+from django.shortcuts import redirect
+
+
+def sales_access_required(function):
+ """ this function is a decorator used to authorize if a user has sales access """
+ def wrap(request, *args, **kwargs):
+ if request.user.role == 'ADMIN' or request.user.is_superuser or request.user.has_sales_access:
+ return function(request, *args, **kwargs)
+ else:
+ raise PermissionDenied
+ return wrap
+
+
+def marketing_access_required(function):
+ """ this function is a decorator used to authorize if a user has marketing access """
+ def wrap(request, *args, **kwargs):
+ if request.user.role == 'ADMIN' or request.user.is_superuser or request.user.has_marketing_access:
+ return function(request, *args, **kwargs)
+ else:
+ raise PermissionDenied
+ return wrap
+
+
+class SalesAccessRequiredMixin(AccessMixin):
+ """ """ # TODO add docs
+
+ def dispatch(self, request, *args, **kwargs):
+ if not request.user.is_authenticated:
+ return self.handle_no_permission()
+ self.raise_exception = True
+ if request.user.role == 'ADMIN' or request.user.is_superuser or request.user.has_sales_access:
+ return super(SalesAccessRequiredMixin, self).dispatch(request, *args, **kwargs)
+ else:
+ return self.handle_no_permission()
+
+
+class MarketingAccessRequiredMixin(AccessMixin):
+
+ def dispatch(self, request, *args, **kwargs):
+ if not request.user.is_authenticated:
+ return self.handle_no_permission()
+ self.raise_exception = True
+ if request.user.role == 'ADMIN' or request.user.is_superuser or request.user.has_marketing_access:
+ return super(MarketingAccessRequiredMixin, self).dispatch(request, *args, **kwargs)
+ else:
+ return self.handle_no_permission()
diff --git a/common/forms.py b/common/forms.py
index 473c10da..6c7ea655 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -4,6 +4,7 @@ from django.contrib.auth import authenticate
from django.contrib.auth.forms import PasswordResetForm
from common.models import Address, User, Document, Comment, APISettings
from django.contrib.auth import password_validation
+from teams.models import Teams
class BillingAddressForm(forms.ModelForm):
@@ -68,11 +69,14 @@ class ShippingAddressForm(forms.ModelForm):
class UserForm(forms.ModelForm):
password = forms.CharField(max_length=100, required=False)
+ # sales = forms.BooleanField(required=False)
+ # marketing = forms.BooleanField(required=False)
class Meta:
model = User
fields = ['email', 'first_name', 'last_name',
- 'username', 'role', 'profile_pic']
+ 'username', 'role', 'profile_pic',
+ 'has_sales_access', 'has_marketing_access']
def __init__(self, *args, **kwargs):
super(UserForm, self).__init__(*args, **kwargs)
@@ -101,6 +105,14 @@ class UserForm(forms.ModelForm):
'Password must be at least 4 characters long!')
return password
+ def clean_has_sales_access(self):
+ sales = self.cleaned_data.get('has_sales_access', False)
+ marketing = self.data.get('has_marketing_access', False)
+ if not sales and not marketing:
+ raise forms.ValidationError('Select atleast one option')
+ return sales
+
+
def clean_email(self):
email = self.cleaned_data.get("email")
if self.instance.id:
@@ -170,7 +182,8 @@ class ChangePasswordForm(forms.Form):
if self.data.get('confirm') != self.cleaned_data.get('Newpassword'):
raise forms.ValidationError(
'Confirm password do not match with new password')
- password_validation.validate_password(self.cleaned_data.get('Newpassword'), user=self.user)
+ password_validation.validate_password(
+ self.cleaned_data.get('Newpassword'), user=self.user)
return self.data.get('confirm')
diff --git a/common/migrations/0016_auto_20190624_1816.py b/common/migrations/0016_auto_20190624_1816.py
new file mode 100644
index 00000000..b1dde931
--- /dev/null
+++ b/common/migrations/0016_auto_20190624_1816.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.2.2 on 2019-06-24 12:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('common', '0015_auto_20190604_1830'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='has_marketing_access',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='has_sales_access',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='lead',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='leads_comments', to='leads.Lead'),
+ ),
+ ]
diff --git a/common/models.py b/common/models.py
index 6d335697..86eb04de 100644
--- a/common/models.py
+++ b/common/models.py
@@ -33,6 +33,8 @@ class User(AbstractBaseUser, PermissionsMixin):
role = models.CharField(max_length=50, choices=ROLES)
profile_pic = models.FileField(
max_length=1000, upload_to=img_url, null=True, blank=True)
+ has_sales_access = models.BooleanField(default=False)
+ has_marketing_access = models.BooleanField(default=False)
USERNAME_FIELD = 'email'
REQUIRED_FIELDS = ['username', ]
@@ -144,7 +146,7 @@ class Comment(models.Model):
related_name='invoice_comments', on_delete=models.CASCADE)
event = models.ForeignKey('events.Event', blank=True, null=True,
- related_name='events_comments', on_delete=models.CASCADE)
+ related_name='events_comments', on_delete=models.CASCADE)
def get_files(self):
return Comment_Files.objects.filter(comment_id=self)
@@ -196,7 +198,7 @@ class Attachments(models.Model):
invoice = models.ForeignKey('invoices.Invoice', blank=True, null=True,
related_name='invoice_attachment', on_delete=models.CASCADE)
event = models.ForeignKey('events.Event', blank=True, null=True,
- related_name='events_attachment', on_delete=models.CASCADE)
+ related_name='events_attachment', on_delete=models.CASCADE)
def file_type(self):
name_ext_list = self.attachment.url.split(".")
@@ -249,6 +251,9 @@ class Document(models.Model):
choices=DOCUMENT_STATUS_CHOICE, max_length=64, default='active')
shared_to = models.ManyToManyField(User, related_name='document_shared_to')
+ class Meta:
+ ordering = ('-created_on',)
+
def file_type(self):
name_ext_list = self.document_file.url.split(".")
if (len(name_ext_list) > 1):
@@ -292,6 +297,9 @@ class APISettings(models.Model):
on_delete=models.SET_NULL, null=True)
created_on = models.DateTimeField(auto_now_add=True)
+ class Meta:
+ ordering = ('-created_on',)
+
def __str__(self):
return self.title
@@ -316,32 +324,3 @@ class Google(models.Model):
def __str__(self):
return self.email
-
-# # Need to be reviewed
-# class Task(models.Model):
-
-# # assigned_to can be assigned to contact, oppurtunity, case
-# assigned_to = models.ManyToManyField(User, related_name='task_assigned_to')
-# status = models.CharField(max_length=50, choices=)
-# subject = models.CharField(max_length=200, default='')
-# name = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name='user_task')
-
-# due_date = models.DateField(auto_now=False, auto_now_add=False)
-# # this could be choice field
-# related_to = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name='to_account')
-# # related_to = models.CharField(max_length=50, choices=)
-# priority = models.CharField(max_length=50, , choices=)
-
-
-# comments = models.TextField()
-# recurrence = models.BooleanField()
-
-
-# # optional fields
-# status = models.CharField(max_length=50, choices=)
-# # type_task = models.CharField(max_length=50)
-# # phone = models.phonenumber_field(null=True)
-# # email = models.EmailField(max_length=254)
-
-# send_notification_mail = models.BooleanField(default=False)
-# reminder_field = models.DateTimeField(auto_now=False, auto_now_add=False)
diff --git a/common/templates/create.html b/common/templates/create.html
index 1aade596..77124f56 100644
--- a/common/templates/create.html
+++ b/common/templates/create.html
@@ -1,5 +1,8 @@
{% extends 'sales/base.html' %}
{% load staticfiles %}
+{% block extralinks %}
+
+{% endblock %}
{% block breadcrumb %}
|
@@ -140,6 +141,20 @@
{{ user.email }} |
{% if user.is_superuser %} Admin {% else %} {{user.role}} {% endif %}
|
+
+ {% if user.is_superuser or user.role == 'ADMIN' %}
+ Sales, Marketing
+ {% endif %}
+ {% if user.has_sales_access and user.has_marketing_access %}
+ Sales, Marketing
+ {% elif user.has_sales_access and not user.has_marketing_access %}
+ Sales
+ {% elif not user.has_sales_access and user.has_marketing_access %}
+ Marketing
+ {% else %}
+ {{''}}
+ {% endif %}
+ |
{% ifnotequal request.user user %}
- Contacts
- - view
+ - {{contact_record.first_name}} {{contact_record.last_name}}
{% endblock %}
diff --git a/contacts/views.py b/contacts/views.py
index 66ffca45..a6dbcc4a 100644
--- a/contacts/views.py
+++ b/contacts/views.py
@@ -19,9 +19,11 @@ from django.core.exceptions import PermissionDenied
from django.db.models import Q
from common.tasks import send_email_user_mentions
from contacts.tasks import send_email_to_assigned_user
+from common.access_decorators_mixins import (
+ sales_access_required, marketing_access_required, SalesAccessRequiredMixin, MarketingAccessRequiredMixin)
-class ContactsListView(LoginRequiredMixin, TemplateView):
+class ContactsListView(SalesAccessRequiredMixin, LoginRequiredMixin, TemplateView):
model = Contact
context_object_name = "contact_obj_list"
template_name = "contacts.html"
@@ -78,7 +80,7 @@ class ContactsListView(LoginRequiredMixin, TemplateView):
return self.render_to_response(context)
-class CreateContactView(LoginRequiredMixin, CreateView):
+class CreateContactView(SalesAccessRequiredMixin, LoginRequiredMixin, CreateView):
model = Contact
form_class = ContactForm
template_name = "create_contact.html"
@@ -185,7 +187,7 @@ class CreateContactView(LoginRequiredMixin, CreateView):
return context
-class ContactDetailView(LoginRequiredMixin, DetailView):
+class ContactDetailView(SalesAccessRequiredMixin, LoginRequiredMixin, DetailView):
model = Contact
context_object_name = "contact_record"
template_name = "view_contact.html"
@@ -229,7 +231,7 @@ class ContactDetailView(LoginRequiredMixin, DetailView):
return context
-class UpdateContactView(LoginRequiredMixin, UpdateView):
+class UpdateContactView(SalesAccessRequiredMixin, LoginRequiredMixin, UpdateView):
model = Contact
form_class = ContactForm
template_name = "create_contact.html"
@@ -357,7 +359,7 @@ class UpdateContactView(LoginRequiredMixin, UpdateView):
return context
-class RemoveContactView(LoginRequiredMixin, View):
+class RemoveContactView(SalesAccessRequiredMixin, LoginRequiredMixin, View):
def get(self, request, *args, **kwargs):
return self.post(request, *args, **kwargs)
diff --git a/crm/settings.py b/crm/settings.py
index 6751f798..c2df15dc 100644
--- a/crm/settings.py
+++ b/crm/settings.py
@@ -41,6 +41,7 @@ INSTALLED_APPS = [
'tasks',
'invoices',
'events',
+ 'teams',
]
MIDDLEWARE = [
diff --git a/crm/urls.py b/crm/urls.py
index ebcca8ca..3e2ff682 100644
--- a/crm/urls.py
+++ b/crm/urls.py
@@ -19,6 +19,7 @@ urlpatterns = [
path('tasks/', include('tasks.urls', namespace="tasks")),
path('invoices/', include('invoices.urls', namespace="invoices")),
path('events/', include('events.urls', namespace="events")),
+ path('teams/', include('teams.urls', namespace="teams")),
path('emails/', include('emails.urls', namespace="emails")),
# path('planner/', include('planner.urls', namespace="planner")),
path('logout/', views.LogoutView, {'next_page': '/login/'}, name="logout"),
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 00c667ed..b5afe8be 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -263,4 +263,4 @@ texinfo_documents = [
#texinfo_show_urls = 'footnote'
# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+#texinfo_no_detailmenu = False
\ No newline at end of file
diff --git a/events/templates/events_list.html b/events/templates/events_list.html
index 0391f680..8e7d889f 100644
--- a/events/templates/events_list.html
+++ b/events/templates/events_list.html
@@ -177,14 +177,18 @@
| {{ event.end_date }} |
{{ event.created_on|date:'d-m-Y' }} |
+ {% if event.created_by %}
{% if event.created_by.profile_pic %}
{% thumbnail event.created_by.profile_pic "40x40" crop="center" as im %}
+ title="{{ event.created_by }}" style="border-radius: 50%" />
{% endthumbnail %}
{% else %}
+ style="width: 40px;height: 40px;border-radius: 50%;" title="{{ event.created_by }}" />
+ {% endif %}
+ {% else %}
+ None
{% endif %}
|
diff --git a/events/views.py b/events/views.py
index 011c6586..56d5cee6 100644
--- a/events/views.py
+++ b/events/views.py
@@ -15,9 +15,12 @@ from common.tasks import send_email_user_mentions
from events.forms import EventAttachmentForm, EventCommentForm, EventForm
from events.models import Event
from events.tasks import send_email
+from common.access_decorators_mixins import (
+ sales_access_required, marketing_access_required, SalesAccessRequiredMixin, MarketingAccessRequiredMixin)
@login_required
+@sales_access_required
def events_list(request):
if request.user.role == 'ADMIN' or request.user.is_superuser:
@@ -51,7 +54,8 @@ def events_list(request):
Q(created_by=request.user) | Q(assigned_to=request.user)).distinct()
if request.POST.get('event_name', None):
- events = events.filter(name__icontains=request.POST.get('event_name'))
+ events = events.filter(
+ name__icontains=request.POST.get('event_name'))
if request.POST.get('created_by', None):
events = events.filter(
@@ -63,13 +67,15 @@ def events_list(request):
context['assigned_to'] = request.POST.getlist('assigned_to')
if request.POST.get('date_of_meeting', None):
- events = events.filter(date_of_meeting=request.POST.get('date_of_meeting'))
+ events = events.filter(
+ date_of_meeting=request.POST.get('date_of_meeting'))
context['events'] = events.distinct().order_by('id')
return render(request, 'events_list.html', context)
@login_required
+@sales_access_required
def event_create(request):
if request.method == 'GET':
context = {}
@@ -89,7 +95,8 @@ def event_create(request):
event.created_by = request.user
event.save()
form.save_m2m()
- send_email.delay(event.id, domain=request.get_host(), protocol=request.scheme)
+ send_email.delay(
+ event.id, domain=request.get_host(), protocol=request.scheme)
if form.cleaned_data.get('event_type') == 'Recurring':
delta = end_date - start_date
@@ -113,7 +120,8 @@ def event_create(request):
)
event.contacts.add(*request.POST.getlist('contacts'))
event.assigned_to.add(*request.POST.getlist('assigned_to'))
- send_email.delay(event.id, domain=request.get_host(), protocol=request.scheme)
+ send_email.delay(
+ event.id, domain=request.get_host(), protocol=request.scheme)
return JsonResponse({'error': False, 'success_url': reverse('events:events_list')})
else:
@@ -121,6 +129,7 @@ def event_create(request):
@login_required
+@sales_access_required
def event_detail_view(request, event_id):
event = get_object_or_404(Event, pk=event_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or event.created_by == request.user or request.user in event.assigned_to.all()):
@@ -144,6 +153,7 @@ def event_detail_view(request, event_id):
@login_required
+@sales_access_required
def event_update(request, event_id):
event_obj = get_object_or_404(Event, pk=event_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or event_obj.created_by == request.user or request.user in event_obj.assigned_to.all()):
@@ -176,14 +186,15 @@ def event_update(request, event_id):
# event.created_by = request.user
event.save()
form.save_m2m()
- send_email.delay(event.id, domain=request.get_host(), protocol=request.scheme)
-
+ send_email.delay(
+ event.id, domain=request.get_host(), protocol=request.scheme)
if form.cleaned_data.get('event_type') == 'Recurring':
event = form.save(commit=False)
event.save()
form.save_m2m()
- send_email.delay(event.id, domain=request.get_host(), protocol=request.scheme)
+ send_email.delay(
+ event.id, domain=request.get_host(), protocol=request.scheme)
# event.contacts.add(*request.POST.getlist('contacts'))
# event.assigned_to.add(*request.POST.getlist('assigned_to'))
@@ -194,6 +205,7 @@ def event_update(request, event_id):
@login_required
+@sales_access_required
def event_delete(request, event_id):
event = get_object_or_404(Event, pk=event_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or event.created_by == request.user):
diff --git a/invoices/templates/invoices_detail_1.html b/invoices/templates/invoices_detail_1.html
new file mode 100644
index 00000000..27f55104
--- /dev/null
+++ b/invoices/templates/invoices_detail_1.html
@@ -0,0 +1,532 @@
+{% extends 'sales/base.html' %}
+{% load staticfiles %}
+{% load thumbnail %}
+{% block breadcrumb %}
+{% block extralinks %}
+
+
+{% endblock extralinks %}
+
+
+{% endblock breadcrumb %}
+{% block content %}
+
+
+
+ {% endblock content %}
+ {% block js_block %}
+
+
+
+ {% endblock js_block %}
\ No newline at end of file
diff --git a/invoices/templates/invoices_list.html b/invoices/templates/invoices_list.html
index b6e039b3..d81d6c06 100644
--- a/invoices/templates/invoices_list.html
+++ b/invoices/templates/invoices_list.html
@@ -40,7 +40,8 @@
{% for user in users %}
-
{% endfor %}
@@ -164,14 +165,18 @@
{% endwith %}
|
+ {% if invoice.created_by %}
{% if invoice.created_by.profile_pic %}
{% thumbnail invoice.created_by.profile_pic "40x40" crop="center" as im %}
+ title="{{ invoice.created_by }}" style="border-radius: 50%" />
{% endthumbnail %}
{% else %}
+ style="width: 40px;height: 40px;border-radius: 50%;" title="{{ invoice.created_by }}" />
+ {% endif %}
+ {% else %}
+ None
{% endif %}
|
{{ invoice.created_on|date:'d-m-Y' }} |
@@ -191,13 +196,15 @@
+ class="btn btn-danger " style="background-color: red;">
{% endif %}
{% if invoice.is_resent %}
+ class="btn btn-danger " style="background-color: red;">
{% endif %}
{% if invoice.is_paid_or_cancelled == True %}
diff --git a/invoices/views.py b/invoices/views.py
index 4c73a6d1..a9d41b77 100644
--- a/invoices/views.py
+++ b/invoices/views.py
@@ -19,9 +19,12 @@ from invoices.forms import (InvoiceAddressForm, InvoiceAttachmentForm,
InvoiceCommentForm, InvoiceForm)
from invoices.models import Invoice
from invoices.tasks import send_email, send_invoice_email, send_invoice_email_cancel
+from common.access_decorators_mixins import (
+ sales_access_required, marketing_access_required, SalesAccessRequiredMixin, MarketingAccessRequiredMixin)
@login_required
+@sales_access_required
def invoices_list(request):
if request.user.role == 'ADMIN' or request.user.is_superuser:
@@ -88,6 +91,7 @@ def invoices_list(request):
@login_required
+@sales_access_required
def invoices_create(request):
if request.method == 'GET':
context = {}
@@ -127,6 +131,7 @@ def invoices_create(request):
@login_required
+@sales_access_required
def invoice_details(request, invoice_id):
invoice = get_object_or_404(Invoice.objects.select_related(
'from_address', 'to_address'), pk=invoice_id)
@@ -147,10 +152,11 @@ def invoice_details(request, invoice_id):
else:
context['users_mention'] = list(
invoice.assigned_to.all().values('username'))
- return render(request, 'invoices_detail.html', context)
+ return render(request, 'invoices_detail_1.html', context)
@login_required
+@sales_access_required
def invoice_edit(request, invoice_id):
invoice_obj = get_object_or_404(Invoice, pk=invoice_id)
@@ -194,6 +200,7 @@ def invoice_edit(request, invoice_id):
@login_required
+@sales_access_required
def invoice_delete(request, invoice_id):
invoice = get_object_or_404(Invoice, pk=invoice_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or invoice.created_by == request.user):
@@ -205,6 +212,7 @@ def invoice_delete(request, invoice_id):
@login_required
+@sales_access_required
def invoice_send_mail(request, invoice_id):
invoice = get_object_or_404(Invoice, pk=invoice_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or invoice.created_by == request.user):
@@ -219,6 +227,7 @@ def invoice_send_mail(request, invoice_id):
@login_required
+@sales_access_required
def invoice_change_status_paid(request, invoice_id):
invoice = get_object_or_404(Invoice, pk=invoice_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or invoice.created_by == request.user):
@@ -231,6 +240,7 @@ def invoice_change_status_paid(request, invoice_id):
return redirect('invoices:invoices_list')
@login_required
+@sales_access_required
def invoice_change_status_cancelled(request, invoice_id):
invoice = get_object_or_404(Invoice, pk=invoice_id)
if not (request.user.role == 'ADMIN' or request.user.is_superuser or invoice.created_by == request.user):
@@ -243,6 +253,7 @@ def invoice_change_status_cancelled(request, invoice_id):
return redirect('invoices:invoices_list')
@login_required
+@sales_access_required
def invoice_download(request, invoice_id):
invoice = get_object_or_404(Invoice.objects.select_related(
'from_address', 'to_address'), pk=invoice_id)
diff --git a/leads/templates/leads.html b/leads/templates/leads.html
index 53a4fdc3..ab8b3ee8 100644
--- a/leads/templates/leads.html
+++ b/leads/templates/leads.html
@@ -147,6 +147,7 @@
{{ lead.title }} |
+ {% if lead.created_by %}
{% if lead.created_by.profile_pic %}
{% thumbnail lead.created_by.profile_pic "40x40" crop="center" as im %}
+ style="width: 40px;height: 40px;" title="{{ lead.created_by }}" />
+ {% endif %}
+ {% else %}
+ None
{% endif %}
|
{{ lead.source }} |
diff --git a/leads/tests.py b/leads/tests.py
index 00b67a76..ee4d6f44 100644
--- a/leads/tests.py
+++ b/leads/tests.py
@@ -476,7 +476,7 @@ class TestLeadListView(TestCase):
self.client = Client()
self.user = User.objects.create(
- username='gorge', email='g@mp.com')
+ username='gorge', email='g@mp.com', has_sales_access=True)
self.user.set_password('jorge2293')
self.user.save()
diff --git a/leads/views.py b/leads/views.py
index 1988f41f..8d668328 100644
--- a/leads/views.py
+++ b/leads/views.py
@@ -1,4 +1,5 @@
import json
+from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.sites.shortcuts import get_current_site
from django.core.mail import EmailMessage
@@ -24,8 +25,11 @@ from leads.tasks import send_lead_assigned_emails
from django.core.exceptions import PermissionDenied
from common.tasks import send_email_user_mentions
from leads.tasks import send_email_to_assigned_user
+from common.access_decorators_mixins import (
+ sales_access_required, marketing_access_required, SalesAccessRequiredMixin, MarketingAccessRequiredMixin)
-class LeadListView(LoginRequiredMixin, TemplateView):
+
+class LeadListView(SalesAccessRequiredMixin, LoginRequiredMixin, TemplateView):
model = Lead
context_object_name = "lead_obj"
template_name = "leads.html"
@@ -102,6 +106,8 @@ class LeadListView(LoginRequiredMixin, TemplateView):
return self.render_to_response(context)
+@login_required
+@sales_access_required
def create_lead(request):
template_name = "create_lead.html"
users = []
@@ -217,7 +223,7 @@ def create_lead(request):
return render(request, template_name, context)
-class LeadDetailView(LoginRequiredMixin, DetailView):
+class LeadDetailView(SalesAccessRequiredMixin, LoginRequiredMixin, DetailView):
model = Lead
context_object_name = "lead_record"
template_name = "view_leads.html"
@@ -273,6 +279,8 @@ class LeadDetailView(LoginRequiredMixin, DetailView):
return context
+@login_required
+@sales_access_required
def update_lead(request, pk):
lead_record = Lead.objects.filter(pk=pk).first()
template_name = "create_lead.html"
@@ -437,7 +445,7 @@ def update_lead(request, pk):
return render(request, template_name, context)
-class DeleteLeadView(LoginRequiredMixin, View):
+class DeleteLeadView(SalesAccessRequiredMixin, LoginRequiredMixin, View):
def get(self, request, *args, **kwargs):
return self.post(request, *args, **kwargs)
diff --git a/marketing/forms.py b/marketing/forms.py
index 5b252ede..d5675d4a 100644
--- a/marketing/forms.py
+++ b/marketing/forms.py
@@ -197,12 +197,13 @@ class ContactForm(forms.ModelForm):
self.fields['city'].required = True
self.fields['state'].required = True
self.fields['email'].required = True
+ self.fields['company_name'].required = True
self.fields['contact_list'].required = False
class Meta:
model = Contact
fields = ["name", "email", "contact_number",
- "last_name", "city", "state"]
+ "last_name", "city", "state", "company_name"]
def clean_email(self):
email = self.cleaned_data.get('email')
diff --git a/marketing/models.py b/marketing/models.py
index 10ed2305..a0f65e32 100644
--- a/marketing/models.py
+++ b/marketing/models.py
@@ -56,7 +56,7 @@ class ContactList(models.Model):
User, related_name="contact_lists_visible_to")
class Meta:
- ordering = ('id',)
+ ordering = ('-created_on',)
@property
def created_by_user(self):
@@ -264,6 +264,15 @@ class Campaign(models.Model):
def get_all_emails_subscribed_count(self):
return self.get_all_emails_count - self.get_all_email_bounces_count - self.get_all_emails_unsubscribed_count
+ @property
+ def get_all_emails_contacts_opened(self):
+ contact_ids = CampaignOpen.objects.filter(
+ campaign=self).values_list('contact_id', flat=True)
+ # opened_contacts = Contact.objects.filter(id__in=contact_ids)
+ # return opened_contacts
+ return contact_ids.count()
+
+
@receiver(models.signals.pre_delete, sender=Campaign)
def comment_attachments_delete(sender, instance, **kwargs):
diff --git a/marketing/templates/contact_detail.html b/marketing/templates/contact_detail.html
index 02e4dbda..282e1cdb 100644
--- a/marketing/templates/contact_detail.html
+++ b/marketing/templates/contact_detail.html
@@ -6,7 +6,7 @@
@@ -31,6 +31,15 @@
{{contact_obj.email}}
+
+
+
+
+ {{contact_obj.company_name}}
+
+