Committed code. Refs: #15245, 15885

Utkarsh Singh
1 parent c30c6bdd
Showing 5 changed files with 12 additions and 34 deletions
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -10,7 +10,7 @@ namespace AIAHTML5.API.Constants
        public  const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details.";
        public const string USER_NOT_FOUND = "User not found.";
        public const string MAIL_NOT_SENT = "Mail not sent.";
-       public const string MAIL_SENT = "Mail has been sent.";
+       public const string MAIL_SENT = "Mail sent.";
     }
@@ -30,7 +30,7 @@
 </root>
 </log4net>
-  <!--<appSettings>
+  <appSettings>
     <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
     <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
     <add key="SenderPassword" value="" />
@@ -39,20 +39,8 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="//52.2.38.120"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="false"/>
+    <add key="isUserAuthenticated" value="True"/>
     <add key="AdminSupport" value=""/>
-  </appSettings>-->
-  <appSettings>
-    <add key="SenderEmailAddress" value="utkarsh.singh@ebix.com" />
-    <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
-    <add key="SenderPassword" value="utkarsh@3bix" />
-    <add key="SMTPAddress" value="smtp.emailsrvr.com" />
-    <add key="SMTPPort" value="587" />
-    <add key="EnableSSL" value="false" />
-    <add key="Site_Url" value ="//192.168.86.34:82/AIA"/>
-    <add key ="HostAddress" value="10.100.12.13" />
-  <add key="isUserAuthenticated" value="false"/>
-    <add key="AdminSupport" value="utkarsh.singh@ebix.com"/>
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
@@ -3313,30 +3313,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             userInfo.emailId = $rootScope.userData.emailId;
         }        
-        if (userInfo.userMessage != undefined && userInfo.userMessage != '' && userInfo.userMessage != null) {
-
-            AdminService.SendAdminAccessRequestMail(userInfo)
+        AdminService.SendAdminAccessRequestMail(userInfo)
             .then(function (result) {
-                    if (result == AdminConstants.MAIL_SENT) {
-                        $("#adminModal").fadeOut();
-                        $("#adminModal").modal('hide');
-                        $("adminAccessTextArea").text('');
+                if (result == AdminConstants.MAIL_SENT) {
+                    $("#adminModal").fadeOut();
+                    $("#adminModal").modal('hide');
+                    $("adminAccessTextArea").text('');
-                        $rootScope.errorMassage = AdminConstants.ADMIN_ACCESS_REQUEST_SUCCESS;
-                        $("#messageModal").modal('show');
-                    }
+                    $rootScope.errorMassage = AdminConstants.MAIL_SENT;
+                    $("#messageModal").modal('show');
+                }
             },
             function (error) {
                 console.log(' Error in sending mail to admin support = ' + error.statusText);
                 $rootScope.errorMassage = AdminConstants.ERROR_IN_SENDING_MAIL;
                 $("#messageModal").modal('show');
             });
-        }
-        else {
-            $rootScope.errorMassage = AdminConstants.EMPTY_MESSAGE;
-            $("#spnError").text(AdminConstants.EMPTY_MESSAGE);
-
-        }
     };
     $rootScope.CloseAAModal = function () {
@@ -311,10 +311,8 @@ AIA.constant(&quot;LoginMessageConstants&quot;, {
 })
 AIA.constant("AdminConstants", {
-    "ADMIN_ACCESS_REQUEST_SUCCESS": "Mail has been sent to referenced authority.",
-    "EMPTY_MESSAGE": "Please, type some message before submitting.",
     "ERROR_IN_SENDING_MAIL": "Some internal error occured.",
-    "MAIL_SENT": "Mail has been sent."
+    "MAIL_SENT": "Mail sent."
 })
 AIA.constant("UserTypeConstants", {
     "SUPER_ADMIN": "Super Admin",