cancelled action

app/applicationlayer/cms/utils_cr.py

@@ -656,7 +656,7 @@ def reset_autoemail_tables(form_code):
     return True
 
 
-def cancelled_user_trigger(form_code, next_level):
+def cancelled_user_trigger(form_code):
 
     cr_link = f'{CR_FRONT_LINK}/{form_code}'
     template_instance = get_template_instance(form_code)
@@ -686,8 +686,8 @@ def cancelled_user_trigger(form_code, next_level):
                                                 ~Q(date_sent=None) &
                                                  Q(form_code=form_code)
                                                 )
-    # print(next_approver.values())
-    
+    print(received_approvers.values())
+
     # LOOP on next approver for sending email
     for n_approver in received_approvers:
         # print(n_approver.delegation)

app/applicationlayer/management/batchupload/views.py

@@ -256,10 +256,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         raise ParseError(
                             department_error
                         )
-<<<<<<< HEAD
-
-                # user type authorization and user type per user
-=======
                 else:
                     user_department = Department.objects.get(
                         name__icontains=keys['department']
@@ -268,7 +264,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                 default_app = Application.objects.filter(
                     excel_code=keys['default_app']
                 ).first()
->>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
 
                 dept_code = Department.objects.get(
                     code=keys['Department_Code']

app/businesslayer/changerequest/change_request.py

@@ -24,7 +24,8 @@ from app.applicationlayer.cms.utils_cr import (
     crhistory_create_save,
     reminder_trigger_save,
     overdue_trigger_save,
-    reset_autoemail_tables
+    reset_autoemail_tables,
+    cancelled_user_trigger
 )
 from app.applicationlayer.utils import model_to_dict
 from app.entities import enums, models
@@ -611,7 +612,7 @@ def cr_routing_actions(approver_instance, current_user):
                     notification_msg, action,
                     remarks, level
                 )
-                
+
                 last_action_vendor = prev_vendor.last()
                 
                 models.ChangeRequestFormApprovers.objects.filter(
@@ -763,6 +764,8 @@ def cr_routing_actions(approver_instance, current_user):
         # update is_action for current level
         update_form_approver(form_code, level, 'current', date_now)
         
+        cancelled_user_trigger(form_code)
+        
         reset_autoemail_tables(form_code)
 
     return True

app/helper/email_service/sender.py

@@ -280,7 +280,7 @@ def routing_table_actions(args):
                 FC = FC.replace('{delegation}', 'requestor')
             else:
                 FC = FC.replace('{delegation}', 'approver')
-
+    
     try:
         send_mail(
             subject=subject,