From bbe7eb7a4d0fa54d003ada542173ab89ee235c5b Mon Sep 17 00:00:00 2001 From: nikhila05 Date: Mon, 24 Jun 2019 19:27:08 +0530 Subject: [PATCH] added filters based on created users, modified code for unsubscribe, displayed related contact lists for all contacts (#240) --- common/tests.py | 3 +- invoices/templates/invoice_create_1.html | 324 ++++++++++++++++++ invoices/views.py | 4 +- leads/tests.py | 2 +- .../migrations/0009_auto_20190618_1144.py | 36 ++ marketing/models.py | 15 + marketing/tasks.py | 3 +- marketing/templates/contact_detail.html | 20 +- marketing/urls.py | 4 +- marketing/views.py | 77 +++-- templates/marketing/base.html | 16 +- templates/marketing/campaign/details.html | 17 +- templates/marketing/campaign/index.html | 29 +- templates/marketing/campaign/new.html | 26 +- templates/marketing/dashboard.html | 11 +- .../marketing/email_template/details.html | 43 ++- templates/marketing/email_template/index.html | 14 +- templates/marketing/email_template/new.html | 213 ++++++------ templates/marketing/lists/all.html | 308 +++++------------ templates/marketing/lists/detail.html | 54 ++- templates/marketing/lists/edit_contact.html | 7 + templates/marketing/lists/index.html | 8 +- templates/marketing/lists/new.html | 11 +- templates/root.html | 29 +- 24 files changed, 841 insertions(+), 433 deletions(-) create mode 100644 invoices/templates/invoice_create_1.html create mode 100644 marketing/migrations/0009_auto_20190618_1144.py diff --git a/common/tests.py b/common/tests.py index 30ff4cd4..6cc41df2 100644 --- a/common/tests.py +++ b/common/tests.py @@ -108,8 +108,7 @@ class UserCreateTestCase(ObjectsCreation, TestCase): 'first_name': '', 'last_name': '', 'username': '', - 'role': 'r', - 'profile_pic': None}) + 'role': 'ADMIN',}) self.assertEqual(response.status_code, 200) diff --git a/invoices/templates/invoice_create_1.html b/invoices/templates/invoice_create_1.html new file mode 100644 index 00000000..aeb2d58b --- /dev/null +++ b/invoices/templates/invoice_create_1.html @@ -0,0 +1,324 @@ +{% extends 'sales/base.html' %} +{% load staticfiles %} +{% block breadcrumb %} +{% block extralinks %} + + + +{% endblock %} + +{% endblock %} +{% block content %} +
+
+
+
+
+
+
+

{% if invoice_obj %}Edit{% else %}Create{% endif %} Invoice

+
+
+
+
+ +
+ + {{ form.invoice_title }} + {{ form.invoice_title.errors }} +
+
+
+ +
+ + {{ form.invoice_number }} + {{ form.invoice_number.errors }} + +
+
+
+
+
+ +
+ + {{ form.status }} + {{ form.status.errors }} + +
+
+
+ + + + +
+
+
+ +
+ + {{ from_address_form.address_line }} + {{ from_address_form.address_line.errors }} +
+ {{ from_address_form.street }} + {{ from_address_form.street.errors }} +
+
+ {{ from_address_form.city }} + {{ from_address_form.city.errors }} + {{ to_address_form.city.errors }} +
+
+ {{ from_address_form.state }} + {{ from_address_form.state.errors }} +
+
+ {{ from_address_form.postcode }} + {{ from_address_form.postcode.errors }} +
+
+ {{ from_address_form.country }} + {{ from_address_form.country.errors }} +
+
+
+
+
+ +
+ + {{ to_address_form.address_line }} + {{ to_address_form.address_line.errors }} +
+ {{ to_address_form.street }} + {{ to_address_form.street.errors }} +
+
+ {{ to_address_form.city }} + {{ to_address_form.city.errors }} + {{ to_address_form.city.errors }} +
+
+ {{ to_address_form.state }} + {{ to_address_form.state.errors }} +
+
+ {{ to_address_form.postcode }} + {{ to_address_form.postcode.errors }} +
+
+ {{ to_address_form.country }} + {{ to_address_form.country.errors }} +
+
+
+
+
+
+
+
+ +
+ + {{ form.name }} + {{ form.name.errors }} +
+
+
+ +
+ + {{ form.email }} + {{ form.email.errors }} +
+
+
+ +
+ {{ form.phone }} + {{ form.phone.errors }} + +
+
+
+
+
+ +
+ {{ form.currency }} + {{ form.currency.errors }} +
+
+
+ +
+ + {{form.assigned_to}} + {{ form.assigned_to.errors }} +
+
+
+ +
+
+ {{ form.due_date }} + + + +
+ {{ form.due_date.errors }} +
+
+
+
+
+
+ + + {{ form.quantity }} + {{ form.quantity.errors }} +
+
+ + {{ form.rate }} + {{ form.rate.errors }} +
+
+ + {{ form.total_amount }} + {{ form.total_amount.errors }} + +
+
+
+
+
+ + {{form.details}} + {{ form.details.errors }} +
+
+
+
+
+
+ + Cancel +
+
+
+
+
+
+
+
+
+
+ {% endblock %} + + {% block js_block %} + + + + + {% endblock js_block %} \ No newline at end of file diff --git a/invoices/views.py b/invoices/views.py index 4c2e1a2c..4c73a6d1 100644 --- a/invoices/views.py +++ b/invoices/views.py @@ -101,7 +101,7 @@ def invoices_create(request): prefix='from') context["to_address_form"] = InvoiceAddressForm(prefix='to') - return render(request, 'invoices_create.html', context) + return render(request, 'invoice_create_1.html', context) if request.method == 'POST': form = InvoiceForm(request.POST, request_user=request.user) @@ -166,7 +166,7 @@ def invoice_edit(request, invoice_id): instance=invoice_obj.from_address) context['to_address_form'] = InvoiceAddressForm(prefix='to', instance=invoice_obj.to_address) - return render(request, 'invoices_create.html', context) + return render(request, 'invoice_create_1.html', context) if request.method == 'POST': form = InvoiceForm(request.POST, instance=invoice_obj, diff --git a/leads/tests.py b/leads/tests.py index b48cd689..00b67a76 100644 --- a/leads/tests.py +++ b/leads/tests.py @@ -289,7 +289,7 @@ class UpdateLeadTestCase(TestLeadModel, TestCase): 'state': "California", 'postcode': "579", 'country': "AD", 'phone': "+917894563452", - 'website': "www.gmail.com", 'status': None, + 'website': "www.gmail.com", 'status': '', 'source': "", 'opportunity_amount': "700", 'description': "Iam an Lead", 'created_by': self.user} response = self.client.post(url, data) diff --git a/marketing/migrations/0009_auto_20190618_1144.py b/marketing/migrations/0009_auto_20190618_1144.py new file mode 100644 index 00000000..60c9d6cd --- /dev/null +++ b/marketing/migrations/0009_auto_20190618_1144.py @@ -0,0 +1,36 @@ +# Generated by Django 2.1.7 on 2019-06-18 06:14 + +from django.db import migrations, models +import django.db.models.deletion +import django.db.models.expressions + + +class Migration(migrations.Migration): + + dependencies = [ + ('marketing', '0008_auto_20190612_1905'), + ] + + operations = [ + migrations.CreateModel( + name='ContactUnsubscribedCampaign', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('is_unsubscribed', models.BooleanField(default=False)), + ], + ), + migrations.AlterModelOptions( + name='campaign', + options={'ordering': ('-created_on',)}, + ), + migrations.AddField( + model_name='contactunsubscribedcampaign', + name='campaigns', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='campaign_is_unsubscribed', to='marketing.Campaign'), + ), + migrations.AddField( + model_name='contactunsubscribedcampaign', + name='contacts', + field=models.ForeignKey(on_delete=django.db.models.expressions.Case, related_name='contact_is_unsubscribed', to='marketing.Contact'), + ), + ] diff --git a/marketing/models.py b/marketing/models.py index b63ec2b4..10ed2305 100644 --- a/marketing/models.py +++ b/marketing/models.py @@ -260,6 +260,10 @@ class Campaign(models.Model): return self.contact_lists.filter(contacts__is_unsubscribed=True ).exclude(contacts__email=None).values_list('contacts__email').count() + @property + 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 + @receiver(models.signals.pre_delete, sender=Campaign) def comment_attachments_delete(sender, instance, **kwargs): @@ -319,3 +323,14 @@ class CampaignCompleted(models.Model): campaign = models.OneToOneField( Campaign, on_delete=models.CASCADE, related_name='campaign_is_completed') is_completed = models.BooleanField(default=False) + + +class ContactUnsubscribedCampaign(models.Model): + """ This Model Is Used To Check If The Contact has Unsubscribed To a Particular Campaign + related name : contact_is_unsubscribed + """ + campaigns = models.ForeignKey( + Campaign, on_delete=models.CASCADE, related_name='campaign_is_unsubscribed') + contacts = models.ForeignKey( + Contact, on_delete=models.Case, related_name='contact_is_unsubscribed') + is_unsubscribed = models.BooleanField(default=False) diff --git a/marketing/tasks.py b/marketing/tasks.py index 6b89ccd4..acff0e36 100644 --- a/marketing/tasks.py +++ b/marketing/tasks.py @@ -145,7 +145,8 @@ def run_campaign(campaign, domain='demo.django-crm.io', protocol='https'): # title="company_logo"/>' unsubscribe_from_campaign_url = reverse( - 'marketing:unsubscribe_from_campaign', kwargs={'contact_id': each_contact.id, }) + 'marketing:unsubscribe_from_campaign', kwargs={'contact_id': each_contact.id, + 'campaign_id': campaign.id}) unsubscribe_from_campaign_html = "

Unsubscribe".format( domain_url + unsubscribe_from_campaign_url) names_dict = {'company_name': each_contact.company_name if each_contact.company_name else '', diff --git a/marketing/templates/contact_detail.html b/marketing/templates/contact_detail.html index 7db02519..02e4dbda 100644 --- a/marketing/templates/contact_detail.html +++ b/marketing/templates/contact_detail.html @@ -3,6 +3,12 @@ {% load paginate %} {% block content %} {{ block.super }} +
@@ -12,7 +18,7 @@
- Contact Detail + Contact Detail
@@ -21,7 +27,7 @@ -
+
{{contact_obj.email}}
@@ -30,7 +36,7 @@ -
+
{{contact_obj.name}}
@@ -39,7 +45,7 @@ -
+
{{contact_obj.last_name}}
@@ -48,7 +54,7 @@ -
+
{{contact_obj.city}}
@@ -57,8 +63,8 @@ -
- {{contact_obj.state}} +
+ {{contact_obj.state}} diff --git a/marketing/urls.py b/marketing/urls.py index 9679fa7a..a28066c5 100644 --- a/marketing/urls.py +++ b/marketing/urls.py @@ -26,7 +26,7 @@ urlpatterns = [ path('contact-list//failed/download/', failed_contact_list_download_delete, name='failed_contact_list_download_delete'), path('contact-list//edit/', edit_contact_list, name='edit_contact_list'), - path('cl/list//delete/', delete_contact_list, name='delete_contact_list'), + # path('cl/list//delete/', delete_contact_list, name='delete_contact_list'), path('email-templates/', email_template_list, name='email_template_list'), path('email-templates/create/', email_template_new, name='email_template_new'), @@ -42,7 +42,7 @@ urlpatterns = [ path('cm/link//e//', campaign_link_click, name='campaign_link_click'), path('cm/track-email//contact//', campaign_open, name='campaign_open'), path('demo-file-download-for-contacts-list/', demo_file_download, name='demo_file_download'), - path('unsubscribe-from-campaign//', unsubscribe_from_campaign, name="unsubscribe_from_campaign"), + path('unsubscribe-from-campaign///', unsubscribe_from_campaign, name="unsubscribe_from_campaign"), path('contacts//view/', contact_detail, name="contact_detail"), path('download-contacts-for-campaign//', download_contacts_for_campaign, name="download_contacts_for_campaign"), path('create-campaign-from-template//', create_campaign_from_template, name="create_campaign_from_template"), diff --git a/marketing/views.py b/marketing/views.py index 17ed3bbe..5adb025b 100644 --- a/marketing/views.py +++ b/marketing/views.py @@ -23,7 +23,7 @@ from marketing.forms import (ContactForm, ContactListForm, EmailTemplateForm, SendCampaignForm) from marketing.models import (Campaign, CampaignLinkClick, CampaignLog, CampaignOpen, Contact, ContactList, - EmailTemplate, Link, Tag, FailedContact) + EmailTemplate, Link, Tag, FailedContact, ContactUnsubscribedCampaign) from marketing.tasks import run_campaign, upload_csv_file TIMEZONE_CHOICES = [(tz, tz) for tz in pytz.common_timezones] @@ -63,13 +63,14 @@ def dashboard(request): @login_required(login_url='/login') def contact_lists(request): tags = Tag.objects.all() - users = User.objects.all() if (request.user.role == "ADMIN"): queryset = ContactList.objects.all() else: queryset = ContactList.objects.filter( Q(created_by=request.user) | Q(visible_to=request.user)) - # users = User.objects.none() + + users = User.objects.filter( + id__in=queryset.values_list('created_by_id', flat=True)) if request.GET.get('tag'): queryset = queryset.filter(tags=request.GET.get('tag')) if request.method == 'POST': @@ -94,13 +95,16 @@ def contact_lists(request): @login_required(login_url='/login') def contacts_list(request): - users = User.objects.all() if (request.user.role == "ADMIN"): contacts = Contact.objects.all() else: - contacts = Contact.objects.filter(created_by=request.user) - # users = User.objects.none() - contacts = Contact.objects.all() + contact_ids = request.user.marketing_contactlist.all().values_list('contacts', + flat=True) + contacts = Contact.objects.filter(id__in=contact_ids) + # contacts = Contact.objects.filter(created_by=request.user) + users = User.objects.filter( + id__in=contacts.values_list('created_by_id', flat=True)) + if request.method == 'GET': context = {'contacts': contacts, 'users': users} return render(request, 'marketing/lists/all.html', context) @@ -253,8 +257,10 @@ def contacts_list_new(request): @login_required(login_url='/login') def edit_contact(request, pk): + url_redirect_to = None contact_obj = get_object_or_404(Contact, pk=pk) - if not (request.user.role == 'ADMIN' or request.user.is_superuser or contact_obj.created_by == request.user): + if not (request.user.role == 'ADMIN' or request.user.is_superuser or contact_obj.created_by == request.user or + (contact_obj.id in request.user.marketing_contactlist.all().values_list('contacts', flat=True))): raise PermissionDenied if request.method == 'GET': form = ContactForm(instance=contact_obj) @@ -266,6 +272,9 @@ def edit_contact(request, pk): contact = form.save(commit=False) contact.save() form.save_m2m() + if request.POST.get('from_url'): + return JsonResponse({'error': False, + 'success_url': reverse('marketing:contact_list_detail', args=(request.POST.get('from_url'),))}) return JsonResponse({'error': False, 'success_url': reverse('marketing:contacts_list')}) else: return JsonResponse({'error': True, 'errors': form.errors, }) @@ -274,9 +283,12 @@ def edit_contact(request, pk): @login_required(login_url='/login') def delete_contact(request, pk): contact_obj = get_object_or_404(Contact, pk=pk) - if not (request.user.role == 'ADMIN' or request.user.is_superuser or contact_obj.created_by == request.user): + if not (request.user.role == 'ADMIN' or request.user.is_superuser or contact_obj.created_by == request.user or + (contact_obj.id in request.user.marketing_contactlist.all().values_list('contacts', flat=True))): raise PermissionDenied contact_obj.delete() + if request.GET.get('from_contact'): + return redirect(reverse('marketing:contact_list_detail', args=(request.GET.get('from_contact'),))) return redirect('marketing:contacts_list') @@ -288,11 +300,14 @@ def contact_list_detail(request, pk): contacts_list = contact_list.contacts.all() if request.POST: if request.POST.get('name'): - contacts_list = contacts_list.filter(name__icontains=request.POST.get('name')) + contacts_list = contacts_list.filter( + name__icontains=request.POST.get('name')) if request.POST.get('email'): - contacts_list = contacts_list.filter(email=request.POST.get('email')) + contacts_list = contacts_list.filter( + email=request.POST.get('email')) if request.POST.get('company_name'): - contacts_list = contacts_list.filter(company_name=request.POST.get('company_name')) + contacts_list = contacts_list.filter( + company_name=request.POST.get('company_name')) data = {'contact_list': contact_list, "contacts_list": contacts_list} return render(request, 'marketing/lists/detail.html', data) @@ -328,13 +343,14 @@ def failed_contact_list_download_delete(request, pk): @login_required(login_url='/login') def email_template_list(request): - users = User.objects.all() + # users = User.objects.all() if (request.user.is_admin or request.user.is_superuser): queryset = EmailTemplate.objects.all() else: queryset = EmailTemplate.objects.filter( created_by=request.user) - # users = User.objects.none() + users = User.objects.filter( + id__in=queryset.values_list('created_by_id', flat=True)) if request.method == 'POST': if request.POST.get('template_name'): queryset = queryset.filter( @@ -399,12 +415,13 @@ def email_template_delete(request, pk): @login_required(login_url='/login') def campaign_list(request): - users = User.objects.all() + # users = User.objects.all() if (request.user.role == "ADMIN"): queryset = Campaign.objects.all() else: queryset = Campaign.objects.all().filter(created_by=request.user) - # users = User.objects.none() + users = User.objects.filter( + id__in=queryset.values_list('created_by_id', flat=True)) if request.GET.get('tag'): queryset = queryset.filter(tags=request.GET.get('tag')) if request.method == 'POST': @@ -542,8 +559,12 @@ def campaign_details(request, pk): all_contacts = contacts bounced_contacts = contacts.filter(is_bounced=True).distinct() - unsubscribe_contacts = contacts.filter( - is_unsubscribed=True).distinct() + # unsubscribe_contacts = contacts.filter( + # is_unsubscribed=True).distinct() + unsubscribe_contacts_ids = ContactUnsubscribedCampaign.objects.filter( + campaigns=campaign, is_unsubscribed=True).values_list('contacts_id', flat=True) + unsubscribe_contacts = Contact.objects.filter( + id__in=unsubscribe_contacts_ids) # read_contacts = campaign.marketing_links.filter(Q(clicks__gt=0)).distinct() contact_ids = CampaignOpen.objects.filter( campaign=campaign).values_list('contact_id', flat=True) @@ -730,8 +751,11 @@ def demo_file_download(request): return response -def unsubscribe_from_campaign(request, contact_id): +def unsubscribe_from_campaign(request, contact_id, campaign_id): contact_obj = get_object_or_404(Contact, pk=contact_id) + campaign_obj = get_object_or_404(Campaign, pk=campaign_id) + ContactUnsubscribedCampaign.objects.create( + campaigns=campaign_obj, contacts=contact_obj, is_unsubscribed=True) contact_obj.is_unsubscribed = True contact_obj.save() return HttpResponseRedirect('/') @@ -740,8 +764,10 @@ def unsubscribe_from_campaign(request, contact_id): @login_required def contact_detail(request, contact_id): contact_obj = get_object_or_404(Contact, pk=contact_id) - - if not (request.user.role == 'ADMIN' or request.user.is_superuser or contact_obj.created_by == request.user): + if not (request.user.role == 'ADMIN' or request.user.is_superuser or contact_obj.created_by == request.user or + (contact_obj.id in request.user.marketing_contactlist.all().values_list('contacts', flat=True))): + # the above query is for: a contact may be common to multiple contact lists, so query from + # a contact list can be created by multiple users raise PermissionDenied if request.method == 'GET': return render(request, 'contact_detail.html', {'contact_obj': contact_obj}) @@ -790,9 +816,12 @@ def download_contacts_for_campaign(request, compaign_id): 'company_name', 'email', 'name', 'last_name', 'city', 'state') if request.GET.get('is_unsubscribed') == 'true': - contact_ids = campaign_obj.contact_lists.filter(contacts__is_unsubscribed=True).values_list( - 'contacts__id', flat=True) - contacts = Contact.objects.filter(id__in=contact_ids).values( + + unsubscribe_contacts_ids = ContactUnsubscribedCampaign.objects.filter( + campaigns=campaign_obj, is_unsubscribed=True).values_list('contacts_id', flat=True) + # contact_ids = campaign_obj.contact_lists.filter(contacts__is_unsubscribed=True).values_list( + # 'contacts__id', flat=True) + contacts = Contact.objects.filter(id__in=unsubscribe_contacts_ids).values( 'company_name', 'email', 'name', 'last_name', 'city', 'state') if request.GET.get('is_opened') == 'true': diff --git a/templates/marketing/base.html b/templates/marketing/base.html index 7da348e6..af8c6deb 100644 --- a/templates/marketing/base.html +++ b/templates/marketing/base.html @@ -3,26 +3,26 @@ {% block main_menu %}