Merge branch 'feature/Redmine-16525-Cosmetic_Changes' of http://202.166.220.79:3000/IME-LONDON/WEB_CORE into staging

Swift.web/AgentPanel/UploadFIle/TranFile.aspx.cs

@@ -98,7 +98,7 @@ namespace Swift.web.AgentPanel.UploadFIle
                     string fileExt = Path.GetExtension(fileName.ToString()).ToLower();
                     if (fileExt == ".csv")
                     {
-                        string dirPath = Server.MapPath("~") + "doc\\FileUpload\\" + GetStatic.GetAgent();
+                        string dirPath = Server.MapPath("~") + "doc\\FileUpload\\" + GetStatic.GetAgentIdN();
 
                         if (!Directory.Exists(dirPath))
                             Directory.CreateDirectory(dirPath);

Swift.web/Library/GetStatic.cs

@@ -836,6 +836,11 @@ namespace Swift.web.Library
             return ReadSession("agent", "");
         }
 
+        public static string GetAgentIdN()
+        {
+            return ReadSession("agentId", "");
+        }
+
         public static string GetCountry()
         {
             return ReadSession("country", "");

Swift.web/SendMoney/Default.aspx.cs

@@ -552,6 +552,7 @@ namespace Swift.web.SendMoney
             GetStatic.WriteSession("branch", ud.Branch);
             GetStatic.WriteSession("branchName", ud.BranchName);
             GetStatic.WriteSession("agent", ud.Agent);
+            GetStatic.WriteSession("agentId", ud.Agent);
             GetStatic.WriteSession("agentName", ud.AgentName);
             GetStatic.WriteSession("branch", ddlBranch.SelectedValue);
             GetStatic.WriteSession("branchName", ddlBranch.SelectedItem.Text);