Merge pull request 'Change admin email to dcl-orders for vm purchase' (#12) from change-email-address into master
Reviewed-on: #12
This commit is contained in:
		
				commit
				
					
						d739a4a50e
					
				
			
		
					 2 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
					@ -1333,7 +1333,7 @@ def do_provisioning_generic(
 | 
				
			||||||
        'subject': (settings.DCL_TEXT +
 | 
					        'subject': (settings.DCL_TEXT +
 | 
				
			||||||
                    " Payment received from %s" % context['email']),
 | 
					                    " Payment received from %s" % context['email']),
 | 
				
			||||||
        'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
 | 
					        'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
 | 
				
			||||||
        'to': ['info@ungleich.ch'],
 | 
					        'to': ['dcl-orders@ungleich.ch'],
 | 
				
			||||||
        'body': "\n".join(
 | 
					        'body': "\n".join(
 | 
				
			||||||
            ["%s=%s" % (k, v) for (k, v) in context.items()]),
 | 
					            ["%s=%s" % (k, v) for (k, v) in context.items()]),
 | 
				
			||||||
        'reply_to': [context['email']],
 | 
					        'reply_to': [context['email']],
 | 
				
			||||||
| 
						 | 
					@ -1507,7 +1507,7 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
 | 
				
			||||||
            'subject': (settings.DCL_TEXT +
 | 
					            'subject': (settings.DCL_TEXT +
 | 
				
			||||||
                        " Payment received from %s" % context['email']),
 | 
					                        " Payment received from %s" % context['email']),
 | 
				
			||||||
            'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
 | 
					            'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
 | 
				
			||||||
            'to': ['info@ungleich.ch'],
 | 
					            'to': ['dcl-orders@ungleich.ch'],
 | 
				
			||||||
            'body': "\n".join(
 | 
					            'body': "\n".join(
 | 
				
			||||||
                ["%s=%s" % (k, v) for (k, v) in context.items()]),
 | 
					                ["%s=%s" % (k, v) for (k, v) in context.items()]),
 | 
				
			||||||
            'reply_to': [context['email']],
 | 
					            'reply_to': [context['email']],
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1911,7 +1911,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
 | 
				
			||||||
            'subject': ("Deleted " if response['status']
 | 
					            'subject': ("Deleted " if response['status']
 | 
				
			||||||
                        else "ERROR deleting ") + admin_msg_sub,
 | 
					                        else "ERROR deleting ") + admin_msg_sub,
 | 
				
			||||||
            'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
 | 
					            'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
 | 
				
			||||||
            'to': ['info@ungleich.ch'],
 | 
					            'to': ['dcl-orders@ungleich.ch'],
 | 
				
			||||||
            'body': "\n".join(
 | 
					            'body': "\n".join(
 | 
				
			||||||
                ["%s=%s" % (k, v) for (k, v) in admin_email_body.items()]),
 | 
					                ["%s=%s" % (k, v) for (k, v) in admin_email_body.items()]),
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue