Merge pull request #730 in RMS/api-main-service from RMSv2 to SIT

* commit 'd6e8e78d':
  set email domain to rsm-hub.com
  delete all related to Branch Api
  delete 006 migrations
  url master
  removed unused models
  added new endpoint branches
  revert all email settings
  revert all changes on email configurations
  removed email credential on env.template.ini
  made email config dynamic thru env.ini

app/applicationlayer/master/Account/views.py

@@ -31,7 +31,7 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
     # @rms.department_list
     def list(self, request, *args, **kwargs):
         try:
-
+            
             queryset = self.filter_queryset(self.get_queryset())
             if len(self.request.query_params) > 0:
                 dept = self.request.query_params['department_code']

app/applicationlayer/master/urls.py

@@ -16,4 +16,4 @@ router.register(r'attachments', MasterAttachmentViewSet)
 urlpatterns = [
     path('', include(router.urls)),
     url(r'^user-types/$', UserTypeViewSet.as_view(), name="user-types"),
-]
+]
\ No newline at end of file

app/entities/models.py

@@ -1227,4 +1227,4 @@ class AssetGroup(models.Model):
         if self.code == '':
             self.code = code
             self.created = datetime.now()
-            self.save()
+            self.save()
\ No newline at end of file

config/settings/base.py

@@ -169,7 +169,11 @@ REST_FRAMEWORK = {
 # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 # EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
+# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
+
+
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
+
 EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_PORT = 587
 EMAIL_HOST_USER = 'AKIAYA4XVX5XFZHRQATF'