From eee6e231dcf04bd0954b307ef1786040bffaad48 Mon Sep 17 00:00:00 2001 From: Trishant Talluri Date: Thu, 5 Oct 2023 13:10:06 +0530 Subject: [PATCH] fixed TodayRebate function --- home/admin.py | 14 +++++++------- messWebsite/settings.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/home/admin.py b/home/admin.py index e2a6c35..aaa7bc6 100644 --- a/home/admin.py +++ b/home/admin.py @@ -587,7 +587,7 @@ def allocate(self, request, queryset): @admin.register(TodayRebate) class about_Admin(ImportExportModelAdmin, admin.ModelAdmin): model = TodayRebate - search_fields = ("Caterer","allocation_id__roll_no__email") + search_fields = ("Caterer","allocation_id","date") list_display =("allocation_id", "date","start_date","end_date") # list_filter = () fieldsets = ( @@ -620,18 +620,18 @@ def send_mail(self, request, queryset): for obj in queryset: allocation=obj.allocation_id if(obj.Caterer == "Kanaka"): - messageKanaka +=(text.format(allocation_id=allocation.student_id,name=allocation.roll_no.name, start_date=obj.start_date, end_date=obj.end_date)) + messageKanaka +=(text.format(allocation_id=allocation.student_id,name=allocation.email.name, start_date=obj.start_date, end_date=obj.end_date)) elif(obj.Caterer == "Gauri"): - messageGauri +=(text.format(allocation_id=allocation.student_id,name=allocation.roll_no.name, start_date=obj.start_date, end_date=obj.end_date)) + messageGauri +=(text.format(allocation_id=allocation.student_id,name=allocation.email.name, start_date=obj.start_date, end_date=obj.end_date)) elif(obj.Caterer == "Ajay"): - messageAjay +=(text.format(allocation_id=allocation.student_id,name=allocation.roll_no.name, start_date=obj.start_date, end_date=obj.end_date)) + messageAjay +=(text.format(allocation_id=allocation.student_id,name=allocation.email.name, start_date=obj.start_date, end_date=obj.end_date)) obj.delete() print(messageKanaka) print(messageGauri) print(messageAjay) - if(messageAjay): caterer_mail(messageAjay, "Ajay","me210003039@iiti.ac.in", date) - if(messageKanaka): caterer_mail(messageKanaka, "Kanaka","me210003039@iiti.ac.in",date) - if(messageGauri): caterer_mail(messageGauri, "Gauri","me210003039@iiti.ac.in",date) + if(messageAjay): caterer_mail(messageAjay, "Ajay","mems220005054@iiti.ac.in", date) + if(messageKanaka): caterer_mail(messageKanaka, "Kanaka","mems220005054@iiti.ac.in",date) + if(messageGauri): caterer_mail(messageGauri, "Gauri","mems220005054@iiti.ac.in",date) rebate_fields={"fields": ( diff --git a/messWebsite/settings.py b/messWebsite/settings.py index 319b4fa..984a45a 100644 --- a/messWebsite/settings.py +++ b/messWebsite/settings.py @@ -206,4 +206,4 @@ EMAIL_PORT = 587 EMAIL_USE_SSL = False EMAIL_HOST_USER = env('EMAIL_HOST') -EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD') \ No newline at end of file +EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')