Skip to content

R
red-ci-cd
Commit fe2e0b3b authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

fixing bug

parents b6735429 bd79850f
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 0 deletions
app/entities/models.py
View file @ fe2e0b3b
...@@ -10,6 +10,10 @@ from django.utils.text import slugify ...@@ -10,6 +10,10 @@ from django.utils.text import slugify
from datetime import timedelta from datetime import timedelta
import os import os
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
from django.conf import settings
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
======= =======
from django.conf import settings from django.conf import settings
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a >>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
......
app/helper/email_service/templates/RMS-CRCANCELLED-USERTRIGGER.html
View file @ fe2e0b3b
<<<<<<< HEAD
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -30,4 +31,38 @@ ...@@ -30,4 +31,38 @@
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" /> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
=======
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Cancelled</title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Cancelled</h3><br>
<p>Dear {name},</p><br>
<p>Your change request has been cancelled. Please see the details of the change request below.</p><br>
<b>Cancelled By</b><br>{action_by}<br><br>
<b>Routing Level</b><br>{routing_level}<br><br>
<b>Status</b><br>{status}<br><br><br>
<b>CR Number</b><br>{cr_number}<br><br>
<b>CR Name</b><br>{cr_name}<br><br>
<b>Company Requested To</b><br>{company_requestedto}<br><br>
<b>Department Requested To</b><br>{department_requestedto}<br><br>
<b>Priority Level</b><br>{priority_level}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access your change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body>
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRREVISED.html
View file @ fe2e0b3b
<<<<<<< HEAD
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -32,4 +33,40 @@ ...@@ -32,4 +33,40 @@
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" /> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
=======
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Rejected</title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Revision</h3><br>
<p>Dear {name},</p><br>
<p>A change request has been submitted for your acknowledgement to revise. Please see the details of the change request below.</p><br>
<b>Rejected By</b><br>{action_by}<br><br>
<b>Routing Level</b><br>{routing_level}<br><br>
<b>Status</b><br>{status}<br><br><br>
<b>CR Number</b><br>{cr_number}<br><br>
<b>CR Name</b><br>{cr_name}<br><br>
<b>Company Requested To</b><br>{company_requestedto}<br><br>
<b>Department Requested To</b><br>{department_requestedto}<br><br>
<b>Priority Level</b><br>{priority_level}<br><br>
<b>Remarks</b><br>{remarks}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access your change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body>
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment