Skip to content

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

Merge pull request #86 in RMS/api-main-service from red-develop to RMSv2 

* commit 'dab586ce':
  merge conflict migration
  fixing conflict
  pulled cms
  new rms
parents d48679c9 dab586ce
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4282 additions and 3599 deletions
app/accesslayer/urls.py
View file @ e3868ae8
...@@ -8,7 +8,11 @@ urlpatterns = ( ...@@ -8,7 +8,11 @@ urlpatterns = (
re_path(r'^refresh-token/(?P<token>\w+)/$', views.RefreshToken.as_view(), name="Refresh Token"), re_path(r'^refresh-token/(?P<token>\w+)/$', views.RefreshToken.as_view(), name="Refresh Token"),
path(r'current-user/', views.CurrentUser.as_view(), name="Current User"), path(r'current-user/', views.CurrentUser.as_view(), name="Current User"),
re_path(r'^forgot-password/(?P<username>\w+)/$', views.ForgotPassword.as_view(), name="Forgot Password"), # re_path(r'^forgot-password/(?P<username>\w+)/$', views.ForgotPassword.as_view(), name="Forgot Password"),
re_path(r'^validate-forgot-password-reset-token/(?P<token>\w+)/$', views.ValidateForgotPasswordResetToken.as_view(), name="Validate Forgot Password Reset Token"), # re_path(r'^validate-forgot-password-reset-token/(?P<token>\w+)/$', views.ValidateForgotPasswordResetToken.as_view(), name="Validate Forgot Password Reset Token"),
re_path(r'^forgot-password-reset/(?P<token>\w+)/$', views.ForgotPasswordReset.as_view(), name="Forgot Password Reset"), # re_path(r'^forgot-password-reset/(?P<token>\w+)/$', views.ForgotPasswordReset.as_view(), name="Forgot Password Reset"),
path('forgot-password/', views.ForgotPassword.as_view()),
path('reset-password-link/', views.ValidateForgotPasswordResetToken.as_view()),
path('forgot-password-reset/', views.ForgotPasswordReset.as_view()),
) )
app/accesslayer/views.py
View file @ e3868ae8
import json import json
import threading
from rest_framework import status from rest_framework import status
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework.authtoken.views import ObtainAuthToken from rest_framework.authtoken.views import ObtainAuthToken
...@@ -16,11 +17,14 @@ from datetime import datetime ...@@ -16,11 +17,14 @@ from datetime import datetime
from random import randrange from random import randrange
from django.conf import settings from django.conf import settings
from app.helper.email_service import sender from app.helper.email_service import sender
from app.applicationlayer.utils import main_threading
from rest_framework.exceptions import ParseError
class Login(ObtainAuthToken): class Login(ObtainAuthToken):
@decorators.error_safe @decorators.error_safe
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
try:
serializer = self.serializer_class(data=request.data, serializer = self.serializer_class(data=request.data,
context={'request': request}) context={'request': request})
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
...@@ -36,6 +40,10 @@ class Login(ObtainAuthToken): ...@@ -36,6 +40,10 @@ class Login(ObtainAuthToken):
# 'user_id': user.pk, # 'user_id': user.pk,
# 'email': user.email # 'email': user.email
}) })
except Exception as e:
return Response(
{"message": "Unable to log in with provided credentials."}
)
class Logout(APIView): class Logout(APIView):
...@@ -99,11 +107,16 @@ class CurrentUser(APIView): ...@@ -99,11 +107,16 @@ class CurrentUser(APIView):
class ForgotPassword(APIView): class ForgotPassword(APIView):
permission_classes = (AllowAny,) permission_classes = (AllowAny,)
@decorators.error_safe # @decorators.error_safe
@transaction.atomic @transaction.atomic
def post(self, request, username=None, *args, **kwargs): def post(self, request, *args, **kwargs):
email = request.data['email']
try:
user = request.user.email
except Exception as e:
user = str(settings.CATCH_EMAIL)
existingUser = User.objects.filter(username=username).first() existingUser = User.objects.filter(email=email).first()
if existingUser: if existingUser:
# Check if there's existing request # Check if there's existing request
...@@ -114,8 +127,7 @@ class ForgotPassword(APIView): ...@@ -114,8 +127,7 @@ class ForgotPassword(APIView):
is_active=True)\ is_active=True)\
.first() .first()
if exToken: if exToken:
raise Exception( raise ParseError('There is an existing password reset for this user.')
'There is an existing password reset for this user.')
REF = 'AUTH' REF = 'AUTH'
TOKEN = '' TOKEN = ''
...@@ -145,10 +157,16 @@ class ForgotPassword(APIView): ...@@ -145,10 +157,16 @@ class ForgotPassword(APIView):
url = f"{settings.FRONT_END_URL}/account/forgot-password-reset"\ url = f"{settings.FRONT_END_URL}/account/forgot-password-reset"\
f"?token={TOKEN}" f"?token={TOKEN}"
sender.forgot_password( args = [str(PASSCODE), str(url), str(existingUser.email), user]
str(PASSCODE), # t1 = threading.Thread(target=sender.forgot_password, args=(args,))
str(url), # t1.start()
str(existingUser.email))
main_threading(args, sender.forgot_password)
args = [str(PASSCODE), str(url), user, str(existingUser.email)]
# t2 = threading.Thread(target=sender.forgot_password, args=(args,))
# t2.start()
main_threading(args, sender.forgot_password)
return Response(data={"detail": "Forgot Password Sent"}, return Response(data={"detail": "Forgot Password Sent"},
status=status.HTTP_200_OK) status=status.HTTP_200_OK)
...@@ -162,7 +180,8 @@ class ValidateForgotPasswordResetToken(APIView): ...@@ -162,7 +180,8 @@ class ValidateForgotPasswordResetToken(APIView):
@decorators.error_safe @decorators.error_safe
@transaction.atomic @transaction.atomic
def post(self, request, token=None, *args, **kwargs): def post(self, request, *args, **kwargs):
token = request.data['token']
existingToken = AuthToken.objects.filter(token=token).first() existingToken = AuthToken.objects.filter(token=token).first()
if existingToken: if existingToken:
...@@ -183,7 +202,7 @@ class ForgotPasswordReset(APIView): ...@@ -183,7 +202,7 @@ class ForgotPasswordReset(APIView):
@decorators.error_safe @decorators.error_safe
@transaction.atomic @transaction.atomic
def post(self, request, token=None, *args, **kwargs): def post(self, request, *args, **kwargs):
body_unicode = request.body.decode('utf-8') body_unicode = request.body.decode('utf-8')
body_data = json.loads(body_unicode) body_data = json.loads(body_unicode)
...@@ -192,6 +211,7 @@ class ForgotPasswordReset(APIView): ...@@ -192,6 +211,7 @@ class ForgotPasswordReset(APIView):
password = body_data['password'] password = body_data['password']
password_confirm = body_data['password_confirm'] password_confirm = body_data['password_confirm']
passcode = body_data['passcode'] passcode = body_data['passcode']
token = body_data['token']
if not username: if not username:
raise Exception('Username is required') raise Exception('Username is required')
...@@ -223,10 +243,18 @@ class ForgotPasswordReset(APIView): ...@@ -223,10 +243,18 @@ class ForgotPasswordReset(APIView):
existingToken.is_active = False existingToken.is_active = False
existingToken.save() existingToken.save()
sender.password_changed( # sender.password_changed(
str(existingToken.user.username), # str(existingToken.user.username),
str(datetime.now()), # str(datetime.now()),
str(existingToken.user.email)) # str(existingToken.user.email))
# args = [str(PASSCODE), str(url), str(existingUser.email), user]
# t1 = threading.Thread(target=sender.forgot_password, args=(args,))
# t1.start()
# args = [str(PASSCODE), str(url), user, str(existingUser.email)]
# t2 = threading.Thread(target=sender.forgot_password, args=(args,))
# t2.start()
return Response(data={"detail": "Forgot Password Reset Success"}, return Response(data={"detail": "Forgot Password Reset Success"},
status=status.HTTP_200_OK) status=status.HTTP_200_OK)
......
app/applicationlayer/management/account/serializer.py
View file @ e3868ae8
...@@ -3,6 +3,7 @@ from app.entities.models import User ...@@ -3,6 +3,7 @@ from app.entities.models import User
import ast import ast
from django.contrib.auth.hashers import make_password, check_password from django.contrib.auth.hashers import make_password, check_password
import re import re
from django.contrib.auth import authenticate
class UserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer):
...@@ -19,6 +20,7 @@ class UserSerializer(serializers.ModelSerializer): ...@@ -19,6 +20,7 @@ class UserSerializer(serializers.ModelSerializer):
# 'password', # 'password',
) )
read_only_fields = ( read_only_fields = (
'created', 'createdby', 'modified', 'modifiedby', 'code', 'created', 'createdby', 'modified', 'modifiedby', 'code',
) )
...@@ -27,34 +29,45 @@ class UserSerializer(serializers.ModelSerializer): ...@@ -27,34 +29,45 @@ class UserSerializer(serializers.ModelSerializer):
class ChangePasswordSerializer(serializers.Serializer): class ChangePasswordSerializer(serializers.Serializer):
old_password = serializers.CharField(required=True) old_password = serializers.CharField(required=True)
new_password = serializers.CharField(required=True, min_length=6) new_password = serializers.CharField(required=True, min_length=6)
new_password_confirm = serializers.CharField(required=True, min_length=6)
def validate(self, data): def validate(self, data):
instance = self.context.get("instance")
instance = self.context.get('view').kwargs['pk']
old_password = data['old_password'] old_password = data['old_password']
new_password = data['new_password'] new_password = data['new_password']
instance_password = User.objects.filter( instance_password = User.objects.filter(
id=instance id=instance
) )
validated_password = check_password( validated_password = check_password(
old_password, old_password,
instance_password.values().first()['password'] instance_password.values().first()['password']
) )
if validated_password: if validated_password:
password = re.match( password = re.match(
'([A-Za-z]+[0-9]|[0-9]+[A-Za-z])[A-Za-z0-9]*', '([A-Za-z]+[0-9]|[0-9]+[A-Za-z])[A-Za-z0-9]*',
data['new_password'] data['new_password']
) )
if password: if password:
new_password = make_password(data['new_password']) new_password = make_password(data['new_password'])
instance_password.update(password=new_password) instance_password.update(password=new_password)
instance = User.objects.get(id=instance) instance = User.objects.get(id=instance)
return instance return instance
elif len(new_password) <= 5: elif len(new_password) <= 5:
raise serializers.ValidationError( raise serializers.ValidationError(
'Password must be minimum of 6 characters' 'Password must be minimum of 6 characters'
) )
else: else:
raise serializers.ValidationError( raise serializers.ValidationError(
'password must be alpha numeric format' 'password must be alpha numeric format'
) )
......
app/applicationlayer/utils.py
View file @ e3868ae8
import threading
from rest_framework.pagination import PageNumberPagination from rest_framework.pagination import PageNumberPagination
from rest_framework.response import Response from rest_framework.response import Response
from functools import wraps from functools import wraps
...@@ -109,3 +110,12 @@ class QuerySetHelper: ...@@ -109,3 +110,12 @@ class QuerySetHelper:
raw_query = {"$or": with_params} raw_query = {"$or": with_params}
context.queryset = context.queryset(__raw__=raw_query) context.queryset = context.queryset(__raw__=raw_query)
return context.queryset return context.queryset
def main_threading(args, func_name):
t1 = threading.Thread(
target=func_name, args=(args,),
daemon=False
)
t1.start()
return True
app/entities/migrations/0007_auto_20190911_1026.py 0 → 100644
View file @ e3868ae8
# Generated by Django 2.2 on 2019-09-11 10:26
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0006_emaillogs_is_sent'),
]
operations = [
migrations.AlterModelTable(
name='emaillogs',
table='email_logs',
),
]
app/entities/migrations/0008_passwordreset.py 0 → 100644
View file @ e3868ae8
# Generated by Django 2.2 on 2019-09-11 11:53
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('entities', '0007_auto_20190911_1026'),
]
operations = [
migrations.CreateModel(
name='PasswordReset',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('email', models.EmailField(max_length=255)),
('token', models.CharField(max_length=255)),
('created_at', models.DateTimeField()),
('timeout_at', models.DateTimeField()),
('is_active', models.BooleanField(default=True)),
('code', models.CharField(max_length=50)),
],
options={
'db_table': 'password_resets',
},
),
]
app/entities/migrations/0011_merge_20190913_1545.py 0 → 100644
View file @ e3868ae8
# Generated by Django 2.2 on 2019-09-13 15:45
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0008_passwordreset'),
('entities', '0010_auto_20190913_1143'),
]
operations = [
]
app/entities/models.py
View file @ e3868ae8
...@@ -934,3 +934,28 @@ class EmailLogs(AuditClass): ...@@ -934,3 +934,28 @@ class EmailLogs(AuditClass):
recipients = models.CharField(max_length=255) recipients = models.CharField(max_length=255)
content = models.TextField() content = models.TextField()
is_sent = models.BooleanField(default=True) is_sent = models.BooleanField(default=True)
class Meta:
db_table = 'email_logs'
class PasswordReset(models.Model):
email = models.EmailField(max_length=255)
token = models.CharField(max_length=255)
created_at = models.DateTimeField()
timeout_at = models.DateTimeField()
is_active = models.BooleanField(default=True)
code = models.CharField(max_length=50)
# def save(self, *args, **kwargs):
# super(PasswordReset, self).save(*args, **kwargs)
# timeout_at = created_at + datetime.timedelta(days=1)
# if self.timeout_at == '':
# self.timeout_at = timeout_at
# self.save()
def __str__(self):
return self.email
class Meta:
db_table = 'password_resets'
app/helper/decorators.py
View file @ e3868ae8
...@@ -59,6 +59,15 @@ class rms: ...@@ -59,6 +59,15 @@ class rms:
# return function(self, request, *args, **kwargs) # return function(self, request, *args, **kwargs)
# return wrapper # return wrapper
@staticmethod
def admin_permission(function):
@wraps(function)
def wrapper(self, request, *args, **kwargs):
if rms.user_type(self) == rms.enums_user:
raise ParseError(access_error)
return function(self, request, *args, **kwargs)
return wrapper
@staticmethod @staticmethod
def user_create(function): def user_create(function):
@wraps(function) @wraps(function)
......
app/helper/email_service/sender.py
View file @ e3868ae8
...@@ -7,87 +7,109 @@ from django.conf import settings ...@@ -7,87 +7,109 @@ from django.conf import settings
# def account_created(args, username, password, receiver) : # def account_created(args, username, password, receiver) :
def account_created(args): def account_created(args):
name = args[0]
username = args[1]
password = args[2]
recipient = args[3]
admin = args[4]
F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-NEWUSER.html'), 'r') F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-NEWUSER.html'), 'r')
FC = F.read() FC = F.read()
FC = FC.replace('{name}', args[0]) FC = FC.replace('{name}', name)
FC = FC.replace('{username}', args[1]) FC = FC.replace('{username}', username)
FC = FC.replace('{password}', args[2]) FC = FC.replace('{password}', password)
FC = FC.replace('[URL]', settings.FRONT_END_URL) FC = FC.replace('[URL]', settings.FRONT_END_URL)
# send_mail(
# subject='OB IMS: Welcome!',
# message='',
# from_email=settings.EMAIL_DEFAULT_SENDER,
# recipient_list=[args[3],],
# html_message=FC,
# fail_silently=True
# )
try: try:
send_mail( send_mail(
subject='OB IMS: Welcome!', subject='OB RMS: Welcome!',
message='', message='',
from_email=settings.EMAIL_DEFAULT_SENDER, from_email=settings.EMAIL_DEFAULT_SENDER,
recipient_list=[args[3],], recipient_list=(recipient,),
html_message=FC, html_message=FC,
fail_silently=False fail_silently=False
) )
models.EmailLogs.objects.create( models.EmailLogs.objects.create(
template='RMS-NEWUSER.html', template='RMS-NEWUSER.html',
recipients=args[3], recipients=recipient,
content=FC, content=FC,
is_sent=True, is_sent=True,
createdby=args[3], createdby=admin,
modifiedby=args[3] modifiedby=admin
) )
except Exception as e: except Exception as e:
models.EmailLogs.objects.create( models.EmailLogs.objects.create(
template='RMS-NEWUSER.html', template='RMS-NEWUSER.html',
recipients=args[3], recipients=recipient,
content=FC, content=FC,
is_sent=False, is_sent=False,
createdby=args[3], createdby=admin,
modifiedby=args[3] modifiedby=admin
) )
return True
# def account_created(name, username, password, receiver): def forgot_password(args):
reset_code = args[0]
# F = open(os.path.join( url = args[1]
# settings.EMAIL_TEMPLATES_ROOT, 'RMS-NEWUSER.html'), 'r' recipient = args[2]
# ) admin = args[3]
# FC = F.read()
# FC = FC.replace('{name}', name) F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-PASSWORD.html'), 'r')
# FC = FC.replace('{username}', username)
# FC = FC.replace('{password}', password)
# FC = FC.replace('[URL]', settings.FRONT_END_URL)
# send_mail( FC = F.read()
# subject='RMS: Welcome!',
# message='',
# from_email=settings.EMAIL_DEFAULT_SENDER,
# recipient_list=[receiver,],
# html_message=FC
# )
FC = FC.replace('{code}', reset_code)
FC = FC.replace('{url}', url)
send_mail(
subject='OB RMS: Reset Password',
message='',
from_email=settings.EMAIL_DEFAULT_SENDER,
recipient_list=[recipient,],
html_message=FC
)
try:
send_mail(
subject='OB RMS: Welcome!',
message='',
from_email=settings.EMAIL_DEFAULT_SENDER,
recipient_list=recipient,
html_message=FC,
fail_silently=False
)
models.EmailLogs.objects.create(
template='RMS-PASSWORD.html',
recipients=recipient,
content=FC,
is_sent=True,
createdby=admin,
modifiedby=admin
)
except Exception as e:
models.EmailLogs.objects.create(
template='RMS-PASSWORD.html',
recipients=recipient,
content=FC,
is_sent=False,
createdby=admin,
modifiedby=admin
)
# def forgot_password(reset_code, url, receiver) :
# F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'forgot-password.html'), 'r') # def password_changed(username, date, receiver) :
# F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'password-changed.html'), 'r')
# FC = F.read() # FC = F.read()
# FC = FC.replace('[reset_code]', reset_code) # FC = FC.replace('[Username]', username)
# FC = FC.replace('[URL]', url) # FC = FC.replace('[Datetime]', date)
# FC = FC.replace('[URL]', settings.FRONT_END_URL)
# send_mail( # send_mail(
# subject='OB IMS: Reset Password', # subject='OB RMS: Password Changed!',
# message='', # message='',
# from_email=settings.EMAIL_DEFAULT_SENDER, # from_email=settings.EMAIL_DEFAULT_SENDER,
# recipient_list=[receiver,], # recipient_list=[receiver,],
...@@ -95,23 +117,29 @@ def account_created(args): ...@@ -95,23 +117,29 @@ def account_created(args):
# ) # )
# def password_changed(username, date, receiver) : def admin_changepassword(args):
name = args[0]
username = args[1]
password = args[2]
recipient = args[3]
admin = args[4]
# F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'password-changed.html'), 'r') F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-ADMINRESET.html'), 'r')
# FC = F.read() FC = F.read()
# FC = FC.replace('[Username]', username) FC = FC.replace('{name}', name)
# FC = FC.replace('[Datetime]', date) FC = FC.replace('{username}', username)
# FC = FC.replace('[URL]', settings.FRONT_END_URL) FC = FC.replace('{password}', password)
FC = FC.replace('[URL]', settings.FRONT_END_URL)
# send_mail( send_mail(
# subject='OB IMS: Password Changed!', subject='OB RMS: Password Changed!',
# message='', message='',
# from_email=settings.EMAIL_DEFAULT_SENDER, from_email=settings.EMAIL_DEFAULT_SENDER,
# recipient_list=[receiver,], recipient_list=[recipient,],
# html_message=FC html_message=FC
# ) )
# def account_created(username, password, receiver) : # def account_created(username, password, receiver) :
......
app/helper/email_service/templates/RMS-ACTIONREQUIRED-VENDOR.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Acknowledgement Notification</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px" />
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Acknowledgement Notification</h3><br>
<p>Dear {name},</p><br>
<p>A change request has been submitted for your acknowledgement. Please see the details of the change request below.</p><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>Status</b><br>{status}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-ACTIONREQUIRED.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Approval Notification</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px" />
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Approval Notification</h3><br>
<p>Dear {name},</p><br>
<p>A change request has been submitted for your approval. Please see the details of the change request below.</p><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>Status</b><br>{status}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-ADMINRESET.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: New User Created</title>
</head>
<body style="font-family: arial;">
<div style="max-width:100px!important;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg"/>
</div>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Reset Password</h3><br>
<p>Dear {name},</p><br>
<p>Your password have been reset by the admin. Please see details below.</p><br>
<b>Username</b><br>{username}<br><br>
<b>Password</b><br>{password}<br><br>
<p>You may change your password through the <u><a href="http://staging.rms.oneberrysystem.com/cms/profile/" style="text-decoration:underline;color:#007bff;" target="_blank">my profile</a></u> section of RMS any time.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRACCEPTED.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Accepted</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Accepted</h3><br>
<p>Dear {name},</p><br>
<p>A change request you have completed has been accepted by the requestor. Please see the details of your change request below.</p><br>
<b>Accepted By</b><br>{accepted_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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRACKNOWLEDGE.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Acknowledged</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Acknowledged</h3><br>
<p>Dear {name},</p><br>
<p>Your change request has been acknowledged. Please see the details of your change request below.</p><br>
<b>Acknowledged By</b><br>{acknowledge_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 the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRAPPROVED.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Approved</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Approved</h3><br>
<p>Dear {name},</p><br>
<p>Your change request has been approved. Please see the details of your change request below.</p><br>
<b>Approved By</b><br>{approved_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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRCANCELLED.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Cancelled</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<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 your change request below.</p><br>
<b>Auto-Cancel Date</b><br>{auto_cancel_date}<br><br>
<b>Date Submitted to Last Approver</b><br>{date_submitted_last_approver}<br><br>
<b>Approver Pending Action</b><br>{approver_pending_action}<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>Status</b><br>{status}<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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRCOMPLETED.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Completed</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Completed</h3><br>
<p>Dear {name},</p><br>
<p>Your change request has been completed. Please see the details of your change request below.</p><br>
<b>Completed By</b><br>{completed_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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CROVERDUE.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Target Date Overdue</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Target Date Overdue</h3><br>
<p>Dear {name},</p><br>
<p>Please be informed that the change request&apos;s target date is overdue. Please see the details of your change request below.</p><br>
<b>Target Date</b><br>{target_date}<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>Status</b><br>{status}<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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRREJECTED-VENDOR.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Rejected</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Rejected</h3><br>
<p>Dear {name},</p><br>
<p>A change request you have completed has been rejected by the requestor.Please see the details of your change request below.</p><br>
<b>Rejected By</b><br>{rejected_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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRREJECTED.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Rejected</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Rejected</h3><br>
<p>Dear {name},</p><br>
<p>Your change request has been rejected. Please see the details of your change request below.</p><br>
<b>Rejected By</b><br>{rejected_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://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-NEWUSER.html
View file @ e3868ae8
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<p>You have been created as a new user of RMS. Please see your default login details below.</p><br> <p>You have been created as a new user of RMS. Please see your default login details below.</p><br>
<b>Username</b><br>{username}<br><br> <b>Username</b><br>{username}<br><br>
<b>Password</b><br>{password}<br><br> <b>Password</b><br>password123<br><br>
<p>You may change your password through the <u><a href="http://staging.rms.oneberrysystem.com/cms/profile/" style="text-decoration:underline;color:#007bff;" target="_blank">my profile</a></u> section of RMS any time.</p><br> <p>You may change your password through the <u><a href="http://staging.rms.oneberrysystem.com/cms/profile/" style="text-decoration:underline;color:#007bff;" target="_blank">my profile</a></u> section of RMS any time.</p><br>
......
app/helper/email_service/templates/RMS-PASSWORD.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Reset Password</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Reset Password</h3><br>
<p>Dear {name},</p><br>
<p>To reset your password click this <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">link</a></u> and enter code <strong>{code}</strong>.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-REMINDER-APPROVER.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Approval Reminder</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Approval Reminder</h3><br>
<p>Dear {name},</p><br>
<p>Please be reminded that a change request is pending your approval. Please note that it will automatically be cancelled by the system if no action is taken within 30 days from the date it was submitted for your approval.</p><br>
<b>Auto-Cancel Date</b><br>{auto_cancel_date}<br><br>
<b>Date Submitted to Last Approver</b><br>{date_submitted_last_approver}<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>Status</b><br>{status}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/RMS-REMINDER-REQUESTOR.html 0 → 100644
View file @ e3868ae8
<!DOCTYPE html>
<html>
<head>
<title>RMS: Approval Reminder</title>
</head>
<body style="font-family: arial;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg" width="100px"/>
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Approval Reminder</h3><br>
<p>Dear {name},</p><br>
<p>Please be informed that a reminder has been sent to approve your change request. Please note that it will automatically be cancelled by the system if no action is taken within 30 days from the date it was submitted to the last approving officer.</p><br>
<b>Auto-Cancel Date</b><br>{auto_cancel_date}<br><br>
<b>Date Submitted to Last Approver</b><br>{date_submitted_last_approver}<br><br>
<b>Approver Pending Action</b><br>{approver_pending_action}<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>Status</b><br>{status}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/account-created.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<br><br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<br/>
<p>Your account for the Inventory Management System have been successfully <br>created.</p>
<br/>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td> <br> URL:</td><td > <br> <span style="margin-left:65px;"> <a href="[URL]">[URL]</a> </span></td></tr>
<tr><td> <br> Username: </td><td> <br> <span style="margin-left:65px;">[Username]</span></td></tr>
<tr><td> <br> Password: </td><td> <br> <span style="margin-left:65px;">[Password]</span></td><td><span><small style="color:red;"><br>(Upon login, please change your password)</small> </span></tr>
</table>
<br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/authorised-po-email-to-supplier.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;" >
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>Confirmed Order <span style="background-color: yellow;">[PO Number]</span>: Project Number, Supplier, Item</td>
</tr>
<tr bgcolor="#FFFFFF">
<td width="100px">Attachment:</td>
<td><span style="background-color: yellow;">[Authorised Purchase Order]</span></td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Supplier]</p>
<br/>
<p>We would like to confirm our order of the items, please see our PO as attached.</p>
<p>Kindly please deliver the items with the related invoice.</p>
<br/>
<p>Thank you,</p>
<p>[Purchasing] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/collection-email-to-requestor.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td><span style="background-color: yellow;">[Stock Requisition No.]</span> Collection </td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);" >
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Requestor]</p>
<br/>
<p>In regards to <span style="background-color: yellow;">[Stock Requisition No.]</span>, your order is ready for pick up at the following details: </p>
<table>
<tr><td>Location: </td><td><span style="background-color: yellow;">[Location]</span></td></tr>
<tr><td>Date: </td><td><span style="background-color: yellow;">[Date]</span></td></tr>
<tr><td>Time: </td><td><span style="background-color: yellow;">[Time]</span></td></tr>
</table>
<p><span style="background-color: yellow;">[Copy the items list from Stock Request Email and paste here]<span></p>
<br/>
<p>Thank you,</p>
<p>[Storekeeper] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/draft-po-email-to-supplier.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>Order Query: <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">Project Number</span>, Supplier, Item</td>
</tr>
<tr bgcolor="#FFFFFF">
<td width="100px">Attachment:</td>
<td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Draft Purchase Order]</span></td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Supplier]</p>
<br/>
<p>We would like to purchase the following items, please see details attached. </p>
<p>Please confirm or complete the details on our attached request</p>
<p>On confirmation of the above, we will then issue an authorised purchase order. </p>
<br/>
<p>Thank you,</p>
<p>[Purchasing] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/forgot-password.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<br><br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align='center'>
<br/>
<p>You have requested to reset your password.</p>
<br/>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align='center'>
<br>
<h1>Reset Code</h1>
<h1>[reset_code]</h1>
<br><br>
<span> <a href="[URL]">[URL]</a> </span>
<br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/items-delivered-email-to-purchasing.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[PO Number]</span> Items Received</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Purchasing/Janet & Finance/Suzanna]</p>
<br/>
<p>In regards to <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[PO number]</span>, items were well received at <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[location]</span> on <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[date]</span> and inventory has been recorded in the system</p>
<br/>
<p>Thank you,</p>
<p>[Storekeeper] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/items-delivered-email-to-requestor.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[PO Number]</span> Items Delivered</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Requestor]</p>
<br/>
<p>With regards to <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[PO number]</span>, items have been delivered to <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[location]</span> and recorded in the system.</p>
<p>Please login and apply the Stock Requisition.</p>
<br/>
<p>Thank you,</p>
<p>[Storekeeper] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/new-line-item-added-email-to-requestor.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>Order Request for <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span> NEW Items</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Requestor]</p>
<br/>
<p>The items you have requested is now on the system.</p>
<table>
<tr><td>Project: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span></td></tr>
<tr><td>Required by Date: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Date]</span></td></tr>
</table>
<br/>
<p>Here are the <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">Product Details</span>, Brand, Model, <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">Specifications</span>, Estimated Cost, and Reference Photos:
<p><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Product 1]<span></p>
<p>[Product 2]</p>
<br/>
<p>Please login to do a formal request. </p>
<br/>
<p>Thank you,</p>
<p>[Purchasing] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/new-project-number.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">To:</td>
<td>ims@oneberry.com</td>
</tr>
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>New Project, <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span></td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear System Admin,</p>
<p>I would like to create a project below:</p>
<table>
<tr><td>Client: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Client]</span></td></tr>
<tr><td>Contact Number: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Contact Number]</span></td></tr>
<tr><td>Email: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Email]</span></td></tr>
<tr><td>Contact Person: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Contact Person]</span></td></tr>
</table>
<br/>
<table>
<tr><td>Project: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span></td></tr>
<tr><td>Project Description: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Description]</span></td></tr>
<tr><td>Start Date: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Start Date]</span></td></tr>
<tr><td>End Date: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[End Date]</span></td></tr>
</table>
<p>Locations (Optional)</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#FFFFFF">
<th>Name</th>
<th>Address</th>
<th>Coordinate</th>
</tr>
<tr bgcolor="#FFFFFF">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
<br/>
<p>Thank you,</p>
<p>[Requestor]</p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/new-user-account.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">To:</td>
<td>ims@oneberry.com</td>
</tr>
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>New User Account</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear System Admin,</p>
<p>I would like to create an account below:</p>
<table>
<tr><td>Username: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Username]</span></td></tr>
<tr><td>Contact Number: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Contact Number]</span></td></tr>
<tr><td>Email: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Email]</span></td></tr>
<tr><td>Position/Designation: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Position/Designation]</span></td></tr>
</table>
<br/>
<p>Thank you,</p>
<p>[Requestor]</p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/password-changed.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<br><br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<br/>
<p>Hello [Username], Your password has been changed on [Datetime].</p>
<p>If you did not perform this action, Please contact the Administrator.</p>
<p>You may login in this url <a href="[URL]">[URL]</a> .</p>
<br/>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/po-and-grninvoice-mismatch-email-to-purchasing.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[PO number]</span> mismatch from DO/Invoice</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Purchasing/Janet]</p>
<br/>
<p>We received these items at <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[location]</span> on <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[date]</span> where DO/Invoice is mismatch.</p>
<p><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Quantity in PO is more than DO/Invoice]<span></p>
<p><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Price in Invoice is lower than PO]<span></p>
<br/>
<p>Please update your records accordingly or contact supplier for any issues.</p>
<br/>
<p>Thank you,</p>
<p>[Storekeeper]</p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/po-authorisation-email-to-authoriser.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[PO Number]</span>: Project Number, Supplier, Item </td>
</tr>
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Authorised Purchase Order]</span></td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Authoriser]</p>
<br/>
<p>Please approve this PO as attached. </p>
<br/>
<p>Thank you,</p>
<p>[Purchasing] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/po-rejected-email-to-requestor.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>Order Request for <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span> – Not Approved </td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Requestor]</p>
<br/>
<p>Your order request for the below items are not approved by <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[John/Ken]</span> because of <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Reason]</span>. Please check with them directly on the next steps.</p>
<table>
<tr><td>Project: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span></td></tr>
<tr><td>Required by Date: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Date]</span></td></tr>
</table>
<br/>
<p>Here are the Product Details & Specifications:</p>
<p><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Product 1]<span></p>
<p>[Product 2]</p>
<br/>
<p>Thank you,</p>
<p>[Purchasing] </p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/reset-password.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<br><br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<br/>
<p>Your password has been reset as of [Reset Datetime].</p>
<br/>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td> <br> Username: </td><td> <br> <span style="margin-left:65px;">[Username]</span></td></tr>
<tr><td> <br> Password: </td><td> <br> <span style="margin-left:65px;">[Password]</span></td><td><span><small style="color:red;"><br>(Upon login, please change your password)</small> </span></tr>
</table>
<br>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/stock-requisition-approved-advance.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<h3 style="text-align: center;">Stock Requisition Approved <br> [SR No]</h3>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Stock Requisition No: </td><td><span>[SR No]</span></td></tr>
<tr><td>Requestor: </td><td><span>[Requestor]</span></td></tr>
<tr><td>Requested On: </td><td><span>[Requested On]</span></td></tr>
<tr><td>Project: </td><td><span>[Project]</span></td></tr>
<tr><td>Remarks: </td><td><span>[Remarks]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Approved By: </td><td><span >[Approved By]</span></td></tr>
<tr><td>Approved On: </td><td><span >[Approved On]</span></td></tr>
<tr><td>Partial Reject Reason: </td><td><span >[Partial Reject Reason]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Approved Stock Request Items:</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="sr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Partial Rejected Stock Request Items:</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="sr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Approved Purchase Request Items (Required by [Required Date]):</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="pr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Partial Rejected Purchase Request Items:</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="pr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Note: Please contact the <b>requestor</b> on the collection details.</p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/stock-requisition-approved.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<h3 style="text-align: center;">Stock Requisition Approved <br> [SR No]</h3>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Stock Requisition No: </td><td><span>[SR No]</span></td></tr>
<tr><td>Requestor: </td><td><span>[Requestor]</span></td></tr>
<tr><td>Requested On: </td><td><span>[Requested On]</span></td></tr>
<tr><td>Project: </td><td><span>[Project]</span></td></tr>
<tr><td>Remarks: </td><td><span>[Remarks]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Approved By: </td><td><span style="margin-left:50px;">[Approved By]</span></td></tr>
<tr><td>Approved On: </td><td><span style="margin-left:50px;">[Approved On]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Approved Stock Request Items:</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="sr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Approved Purchase Request Items (Required by [Required Date]):</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="pr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Note: Please contact the <b>requestor</b> on the collection details.</p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/stock-requisition-for-new-line-items.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td width="100px">Subject:</td>
<td>Order Request for <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span> NEW Items</td>
</tr>
<tr bgcolor="#FFFFFF">
<td width="100px">CC:</td>
<td>ken@oneberry.com, john@oneberry.com, jennifer@oneberry.com</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel" style="background-color: rgba(255,255,255,0.7);
padding: 10px;
margin-bottom: 10px;">
<h3 style="text-align: center;">Email Template</h3>
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://inventory.tirapp.com/cds/image.ashx?id=CDS_IMAGE_39117a66-0738-40cb-9bf4-51a7d53abe50&v=20170125071840" style="margin: 10px auto;" />
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Dear [Purchasing/Janet]</p>
<br/>
<p>I would like to request to purchase the following items, please see below:</p>
<table>
<tr><td>Project: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Project Number]</span></td></tr>
<tr><td>Required by Date: </td><td><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Date]</span></td></tr>
</table>
<br/>
<p>Here are the <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">Product Details</span>, Brand, Model, <span class="ob_EmailTemplateHighlight" style="background-color: yellow;">Specifications</span>, Estimated Cost, and Reference Photos:
<p><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Product 1]<span></p>
<p>[Product 2]</p>
<br/>
<p>Intended use of these items:</p>
<p><span class="ob_EmailTemplateHighlight" style="background-color: yellow;">[Information on application]<span></p>
<br>
<p>Here are the suggested suppliers:</p>
<p>[List Suppliers]</p>
<br>
<p>[Any other information eg. Product of origin]</p>
<p>OR</p>
<p>Please help us source suppliers</p>
<br/>
<p>Thank you,</p>
<p>[Requestor]</p>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>Template Created by TIR Solutions</small>
</td>
</tr>
</table>
</div>
<div class="ob_EmailTemplatePanel">
<h3>Additional Template to paste to <span class="ob_EmailTemplateHighlight">[Product ?]</span></h3>
<table width="570px" bgcolor="#FFFFFF" style="border: 1px solid #999999;">
<tr>
<td width="100px">Product Details:</td>
<td><span class="ob_EmailTemplateHighlight">[Product Details]</span></td>
</tr>
<tr>
<td width="100px">Brand:</td>
<td>[Brand]</td>
</tr>
<tr>
<td width="100px">Model:</td>
<td>[Model]</td>
</tr>
<tr>
<td width="100px">Specifications:</td>
<td><span class="ob_EmailTemplateHighlight">[Specifications]</span></td>
</tr>
<tr>
<td width="100px">Estimated Cost:</td>
<td>[Estimated Cost]</td>
</tr>
<tr>
<td width="100px">Reference Photos:</td>
<td>[Reference Photos]</td>
</tr>
</table>
</div>
</body></html>
\ No newline at end of file
app/helper/email_service/templates/stock-requisition-rejected.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<h3 style="text-align: center;">Stock Requisition Rejected <br> [SR No]</h3>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Stock Requisition No: </td><td><span>[SR No]</span></td></tr>
<tr><td>Requestor: </td><td><span>[Requestor]</span></td></tr>
<tr><td>Requested On: </td><td><span>[Requested On]</span></td></tr>
<tr><td>Project: </td><td><span>[Project]</span></td></tr>
<tr><td>Remarks: </td><td><span>[Remarks]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Rejected By: </td><td><span style="margin-left:30px;">[Rejected By]</span></td></tr>
<tr><td>Rejected On: </td><td><span style="margin-left:30px;">[Rejected On]</span></td></tr>
<tr><td>Rejected Reason: </td><td><span style="margin-left:30px;">[Rejected On]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Rejected Stock Request Items:</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="sr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Rejected Purchase Request Items (Required by [Required Date]):</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="pr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
app/helper/email_service/templates/stock-requisition.html deleted 100644 → 0
View file @ d48679c9
<html>
<body style="background-color: #ccc;">
<div style="background-color: rgba(255,255,255,0.7); padding: 10px; margin-bottom: 10px;">
<table bgcolor="#EEEEEE" width="600px" cellpadding="10px" style="border: 1px solid #999999; margin: 0 auto;">
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" style="margin: 10px auto; max-width: 200px; height: auto;" />
<h3 style="text-align: center;">Stock Requisition</h3>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<table>
<tr><td>Stock Requisition No: </td><td><span>[SR No]</span></td></tr>
<tr><td>Requestor: </td><td><span>[Requestor]</span></td></tr>
<tr><td>Requested On: </td><td><span>[Requested On]</span></td></tr>
<tr><td>Project: </td><td><span>[Project]</span></td></tr>
<tr><td>Remarks: </td><td><span>[Remarks]</span></td></tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Stock Request Items:</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="sr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2">
<p>Purchase Request Items (Required by [Required Date]):</p>
<table width='100%' bgcolor="#EEEEEE" cellpadding='0' cellspacing='1'>
<tr bgcolor="#EEEEEE" align="left">
<th>Product No.</th>
<th>Product Name</th>
<th>Brand</th>
<th>Qty</th>
<th>Unit</th>
</tr>
<tr bgcolor="#FFFFFF" id="pr">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<span>
<button style="cursor: pointer; font-weight: bold; background-color:#E52129; border-color:#E52129; padding: 15px 25px 15px 25px; border-radius: 8px; font-size: 15px;" ><a href="RejectToken" style="color: white; text-decoration: none;">REJECT</a></button>
&nbsp;
&nbsp;
<button style="cursor: pointer; font-weight: bold; background-color:#008000; border-color:#008000; padding: 15px 95px 15px 95px; border-radius: 8px; font-size: 15px;"><a href="ApproveToken" style="color: white; text-decoration: none;">APPROVE</a></button>
</span>
</td>
</tr>
<tr bgcolor="#FFFFFF">
<td colspan="2" align="center">
<small>**This is a system generated email, do not reply to this email.**</small>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
config/settings/dev.py
View file @ e3868ae8
...@@ -38,3 +38,6 @@ REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLE ...@@ -38,3 +38,6 @@ REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLE
REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE'] REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE']
VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE'] VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE']
VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE'] VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
#ADMIN PROFILE
CATCH_EMAIL = config['ADMIN']['CATCH_EMAIL']
config/settings/local.py
View file @ e3868ae8
...@@ -36,3 +36,6 @@ REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLE ...@@ -36,3 +36,6 @@ REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLE
REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE'] REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE']
VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE'] VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE']
VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE'] VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
#ADMIN PROFILE
CATCH_EMAIL = config['ADMIN']['CATCH_EMAIL']
env.template.ini
View file @ e3868ae8
...@@ -61,3 +61,6 @@ REQUESTOR_ACKNOWLEDGE_MESSAGE = has ACKNOWLEDGED the change request;RMS-CRACKNOW ...@@ -61,3 +61,6 @@ REQUESTOR_ACKNOWLEDGE_MESSAGE = has ACKNOWLEDGED the change request;RMS-CRACKNOW
REQUESTOR_COMPLETION_MESSAGE = has COMPLETED the change request;RMS-CRCOMPLETED REQUESTOR_COMPLETION_MESSAGE = has COMPLETED the change request;RMS-CRCOMPLETED
VENDOR_ACCEPTANCE_MESSAGE = has ACCEPTED the change request;RMS-CRACCEPTED VENDOR_ACCEPTANCE_MESSAGE = has ACCEPTED the change request;RMS-CRACCEPTED
VENDOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED-VENDOR VENDOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED-VENDOR
[ADMIN]
CATCH_EMAIL = 'red@tirsolutions.com'
requirements/RMSv2.postman_collection.json 0 → 100644
View file @ e3868ae8
This diff is collapsed.
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