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

# Conflicts:
#	Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs

Swift.DAL/OnlineAgent/OnlineCustomerDao.cs

@@ -1553,5 +1553,14 @@ namespace Swift.DAL.OnlineAgent
 
             return ParseDbResult(sql);
         }
+
+        public DbResult MoveCustomer(string email, string user)
+        {
+            string sql = "Exec proc_online_core_customerSetup";
+            sql += " @flag ='moveCustomer'";
+            sql += ", @user=" + FilterString(user);
+            sql += ", @email=" + FilterString(email);
+            return ParseDbResult(ExecuteDataset(sql).Tables[0]);
+        }
     }
 }

Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx

@@ -163,6 +163,7 @@
 <%--                                                    <asp:Button ID="btnUpdate" runat="server" CssClass="btn btn-primary m-t-25" Text="Update" OnClick="update_Click" />--%>
                                                     <asp:Button ID="btnReset" runat="server" CssClass="btn btn-primary m-t-25" Text="Reset KYC" OnClick="reset_Click" />
                                                     <asp:Button ID="btnActivate" runat="server" CssClass="btn btn-primary m-t-25" Text="Activate" OnClick="activate_Click" />
+                                                    <asp:Button ID="btnMove" runat="server" CssClass="btn btn-primary m-t-25" Text="Manual Verify" OnClick="move_Click" />
                                                 </div>
                                     </div>
                                             </div>

Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs

@@ -106,13 +106,17 @@ namespace Swift.web.MobileRemit.Admin.Reports
             cusData.Visible = true;
             registrationTypeDiv.Visible = true;
 
-            if ((customerDetails.Rows[0]["createdFrom"].ToString() == "C") || (customerDetails.Rows[0]["createdFrom"].ToString() == "O"))
+            if (customerDetails.Columns.Contains("createdFrom"))
             {
-                if (customerDetails.Rows[0]["mobileApprovedDate"].ToString() == "")
+                if ((customerDetails.Rows[0]["createdFrom"].ToString() == "C") || (customerDetails.Rows[0]["createdFrom"].ToString() == "O"))
                 {
-                    btnActivate.Enabled = true;
+                    if (customerDetails.Rows[0]["mobileApprovedDate"].ToString() == "")
+                    {
+                        btnActivate.Enabled = true;
+                    }
                 }
             }
+            
             else
             {
                 btnActivate.Enabled = false;
@@ -216,7 +220,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
         protected void activate_Click(object sender, EventArgs e)
         {
             string customerId = txtSearchData.Value.Split('|')[0];
-            var custompass = PasswordGenerator.GenerateRandomNumericPassword(); 
+            var custompass = PasswordGenerator.GenerateRandomNumericPassword();
             var membershipId = Request.Form["membershipId"];
             var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), customerId, custompass, membershipId);
 
@@ -268,5 +272,21 @@ namespace Swift.web.MobileRemit.Admin.Reports
                 GetStatic.AlertMessage(this, dbRes.Msg);
             }
         }
+
+        protected void move_Click(object sender, EventArgs e)
+        {
+            string email = txtSearchData.Value.Split('|')[2];
+            //  string customerSource = txtSearchData.Value.Split('|')[1];
+
+            var dbResult = _cd.MoveCustomer(email, GetStatic.GetUser());
+            if (dbResult.ErrorCode == "1")
+            {
+                GetStatic.AlertMessage(this.Page, dbResult.Msg);
+            }
+            else
+            {
+                GetStatic.AlertMessage(this.Page, "Customer KYC has been successfully cleared.");
+            }
+        }
     }
 }

Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.designer.cs

@@ -140,6 +140,15 @@ namespace Swift.web.MobileRemit.Admin.Reports
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnActivate;
 
+        /// <summary>
+        /// btnMove control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnMove;
+
         /// <summary>
         /// moreData control.
         /// </summary>