diff --git a/Swift.DAL/MobileDao/MobileConfigDao.cs b/Swift.DAL/MobileDao/MobileConfigDao.cs index cdc6546..ba7722a 100644 --- a/Swift.DAL/MobileDao/MobileConfigDao.cs +++ b/Swift.DAL/MobileDao/MobileConfigDao.cs @@ -78,7 +78,7 @@ namespace Swift.DAL.MobileDao return ParseDbResult(sql); } - public DbResult SaveBroadCastCustomer(string user, string rowId, string customerId, string msgType, string body) + public DbResult SaveBroadCastCustomer(string user, string rowId, string customerId, string msgType, string body, string customerType , string nativeCountry) { var sql = "EXEC ProcMobileConfig @flag = '" + (string.IsNullOrEmpty(rowId) ? "IN-BROADCAST" : "UN-BROADCAST") + "'"; sql += ", @User = " + FilterString(user); @@ -86,6 +86,8 @@ namespace Swift.DAL.MobileDao sql += ", @Body = N'" + body.Replace("'", "") + "'"; sql += ", @CustomerId = " + FilterString(customerId); sql += ", @msgType = " + FilterString(msgType); + sql += ", @customerType = " + FilterString(customerType); + sql += ", @nativeCountry = " + FilterString(nativeCountry); return ParseDbResult(sql); } diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs b/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs index 95a7e00..1e6a09f 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs +++ b/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs @@ -414,7 +414,7 @@ namespace Swift.web.AgentNew.SendTxn if (_pCountryId.ToString() != "151") { - if (string.IsNullOrWhiteSpace(_pSubLocation) && (_payoutPartnerId != "394400") && (_payoutPartnerId != "394414") && (_payoutPartnerId != "394428") && (_payoutPartnerId != "394434")) + if (string.IsNullOrWhiteSpace(_pSubLocation) && (_payoutPartnerId != "394400") && (_payoutPartnerId != "394449")) { Msg = " Payout City is missing"; return false; diff --git a/Swift.web/Library/GetStatic.cs b/Swift.web/Library/GetStatic.cs index 29e10ff..c712ea8 100644 --- a/Swift.web/Library/GetStatic.cs +++ b/Swift.web/Library/GetStatic.cs @@ -1078,7 +1078,7 @@ namespace Swift.web.Library { DateTime d; DateTime.TryParse(data, out d); - return d.Year + "/" + d.Month.ToString("00") + "/" + d.Day.ToString("00"); + return d.Day.ToString("00") + "/" + d.Month.ToString("00") + "/" + d.Year; } if (dataType == "DT") diff --git a/Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs b/Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs index 384ef97..4bf840d 100644 --- a/Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs +++ b/Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs @@ -114,28 +114,12 @@ namespace Swift.web.MobileRemit.Admin.Operation // // _grid.CustomLinkText = link; // //customLinkText.Append(" "); - // customLinkText.Append(" "); - + // customLinkText.Append(" "); //} if (kycStatus == "NOT_COMPLETED" || kycStatus == "PROCESSING") { - if (swiftLibrary.HasRight(ApproveFunctionId)) - { - customLinkText.Append(" "); - } - if (swiftLibrary.HasRight(ReuploadFunctionId)) - { - customLinkText.Append(" "); - } + customLinkText.Append(" "); } - //if (swiftLibrary.HasRight(ReuploadFunctionId)) - //{ - // customLinkText.Append(" "); - //} - //if (swiftLibrary.HasRight(DeleteFunctionId)) - //{ - // customLinkText.Append(" "); - //} _grid.CustomLinkText = customLinkText.ToString(); string sql = "EXEC [proc_customerKYC] @flag = 'filterByKycStatus',@kycStatus='" + Request.QueryString["kycStatus"] + "' "; _grid.SetComma(); diff --git a/Swift.web/MobileRemit/Admin/PushNotification/BroadcastList.aspx b/Swift.web/MobileRemit/Admin/PushNotification/BroadcastList.aspx index a7cacd7..3e3bfdf 100644 --- a/Swift.web/MobileRemit/Admin/PushNotification/BroadcastList.aspx +++ b/Swift.web/MobileRemit/Admin/PushNotification/BroadcastList.aspx @@ -44,8 +44,8 @@
diff --git a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx index 003aa19..e56c25c 100644 --- a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx +++ b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx @@ -29,6 +29,8 @@