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

Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs

@@ -220,7 +220,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
         {
             var postCode = zipCode.ToUpper();
             string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + postCode;
-            string methodType = "loqate"; //Utility.ReadWebConfig("methodType", "");
+            string methodType = Utility.ReadWebConfig("methodType", "");
             string countryName = "United Kingdom";
 
             AddressRequest requestObj = new AddressRequest()

Swift.web/Component/Grid/SwiftGrid.cs

@@ -5,6 +5,7 @@ using Swift.web.Library;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -634,6 +635,13 @@ namespace Swift.web.Component.Grid
         public bool AllowRowDisable { get; set; }
         public String DisabledRowValueSourceField { get; set; }
 
+        private Boolean _downlodExcel = false;
+        [DefaultValue(false)]
+        public Boolean DownloadAll
+        {
+            get { return _downlodExcel; }
+            set { _downlodExcel = value; }
+        }
         #endregion Properties
 
         #region Public Methods
@@ -1258,6 +1266,15 @@ namespace Swift.web.Component.Grid
                 else
                     html.AppendLine("&nbsp; <span class=\"tool btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = 'Export to Excel' style = 'cursor:pointer color:green' onclick = \"DownloadGrid('" + GetStatic.GetUrlRoot() + "','xls',0,'');\")'><i class=\"fa fa-file-excel-o\"></i></span>&nbsp;&nbsp;&nbsp;");
             }
+            if (DownloadAll)
+            {
+                if (GridDS.RemittanceDB == GridDataSource)
+                {
+                    html.AppendLine("&nbsp; <span class=\"tool btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = 'Export ALL to Excel' style = 'cursor:pointer color:green' onclick = \"DownloadExcelRemit('" + GetStatic.GetUrlRoot() + "','xls',0,'');\")'><i class=\"fa fa-file-excel-o\"></i></span>&nbsp;&nbsp;&nbsp;");
+                }
+                else
+                    html.AppendLine("&nbsp; <span class=\"tool btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = 'Export ALL to Excel' style = 'cursor:pointer color:green' onclick = \"DownloadExcel('" + GetStatic.GetUrlRoot() + "','xls',0,'');\")'><i class=\"fa fa-file-excel-o\"></i></span>&nbsp;&nbsp;&nbsp;");
+            }
 
             if (EnablePdfDownload)
             {

Swift.web/Remit/Administration/CustomerSetup/List.aspx.cs

@@ -72,9 +72,9 @@ namespace Swift.web.Remit.Administration.customerSetup
                                       new GridColumn("countryName", "Native Country", "", "T"),
                                       new GridColumn("idtype", "ID Type", "", "T"),
                                       new GridColumn("idNumber", "ID No", "", "T"),
-                                      new GridColumn("RegistrationType", "Reg. Type", "", "T"),
-                                      new GridColumn("createdDate","Regd. Date","","D"),
                                       new GridColumn("KYC_Status","KYC Status","","T"),
+                                      new GridColumn("createdDate","Regd. Date","","D"),
+                                      new GridColumn("Introducer","Introducer","","T"),
                                       //new GridColumn("bankName","Bank Name","","T")  ,
                                       //new GridColumn("bankAccountNo","Account Number","","T")
                                   };
@@ -101,7 +101,7 @@ namespace Swift.web.Remit.Administration.customerSetup
             var docLink = swiftLibrary.HasRight(GetFunctionIdByUserType(ViewDocFunctionIdAgent, ViewDocFunctionId)) ? "&nbsp;<span class=\"action-icon\"><btn class=\"btn btn-xs btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Document Upload\"><a href=\"CustomerDocument.aspx?customerId=@customerId\"><i class=\"fa fa-file\"></i></a></btn></span>" : "";
             var benificiaryLink = swiftLibrary.HasRight(GetFunctionIdByUserType(ViewBenificiaryFunctionIdAgent, ViewBenificiaryFunctionId)) ? "&nbsp;<span class=\"action-icon\"><btn class=\"btn btn-xs btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Beneficiary List\"><a href=\"Benificiar\\List.aspx?customerId=@customerId\"><i class=\"fa fa-subway\"></i>" : "";
 
-            _grid.CustomLinkText = kycLink + docLink + benificiaryLink;
+           // _grid.CustomLinkText = kycLink + docLink + benificiaryLink;
             _grid.CustomLinkVariables = "customerId";
             string sql = "EXEC [proc_online_core_customerSetup] @flag = 's' ";
             _grid.SetComma();

Swift.web/Remit/Administration/ReferralSetup/Manage.aspx.cs

@@ -13,9 +13,8 @@ namespace Swift.web.Remit.Administration.ReferralSetup
 {
     public partial class Manage : System.Web.UI.Page
     {
-        private const string ViewFunctionId = "10111000";
-        private const string AddEditFunctionId = "10111010";
-        private const string DeleteFunctionId = "10111020";
+        private const string ViewFunctionId = "90400000";
+      
         private readonly StaticDataDao _obj = new StaticDataDao();
         private readonly StaticDataDdl _sl = new StaticDataDdl();
 

Swift.web/Remit/Administration/ReferralSetup/ReferPointMasterSetup.aspx.cs

@@ -16,8 +16,8 @@ namespace Swift.web.Remit.Administration.ReferralSetup
 {
     public partial class ReferPointMasterSetup : System.Web.UI.Page
     {
-        private const string ViewFunctionId = "52480000";
-        private const string AddEditFunctionId = "52480010";
+        private const string ViewFunctionId = "90400000";
+      
         private const string GridName = "grd_bldom";
         private readonly SwiftGrid grid = new SwiftGrid();
         private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();

Swift.web/Remit/Administration/ReferralSetup/ReferPointSetup.aspx.cs

@@ -13,8 +13,8 @@ namespace Swift.web.Remit.Administration.ReferralSetup
 {
     public partial class ReferPointSetup : System.Web.UI.Page
     {
-        private const string ViewFunctionId = "52480000";
-        private const string AddEditFunctionId = "52480010";
+        private const string ViewFunctionId = "90400000";
+
         private const string GridName = "grd_bldom";
         private readonly SwiftGrid grid = new SwiftGrid();
         private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
@@ -43,7 +43,7 @@ namespace Swift.web.Remit.Administration.ReferralSetup
                                        new GridColumn("IsActive", "Is Active", "", "T")
                                   };
 
-            bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
+            bool allowAddEdit = true;
             grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
             grid.GridName = GridName;
             grid.GridType = 1;

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs

@@ -222,6 +222,8 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                     return "paystatus-Cancel";
                 case "ofac hold":
                     return "paystatus-ofac";
+                case "compliance":
+                    return "paystatus-compliance";
                 case "compliance hold":
                     return "paystatus-compliance";
                 case "ofac/compliance hold":

Swift.web/Remit/UserControl/UcTransaction.ascx.cs

@@ -2122,7 +2122,7 @@ namespace Swift.web.Remit.UserControl
                                     {
                                             NotificationContent =  new NotificationDTO() {
                                             Body = comments,
-                                            Title = "JME",
+                                            Title = "IME LONDON",
                                              MessageType = "INFO",
                                               ClickActivity = "OPEN_ACTIVITY_NOTIFICATION"
                                             },