diff --git a/Common/Model/DateFilterParams.cs b/Common/Model/DateFilterParams.cs index 1644e80..eb8cccf 100644 --- a/Common/Model/DateFilterParams.cs +++ b/Common/Model/DateFilterParams.cs @@ -8,6 +8,7 @@ public string Page { get; set; } public string PageCount { get; set; } + public string ViewAll { get; set; } //public string tranId { get; set; } } } \ No newline at end of file diff --git a/Repository/MobileV2/MobileV2Repo.cs b/Repository/MobileV2/MobileV2Repo.cs index 2b0e03a..f7154de 100644 --- a/Repository/MobileV2/MobileV2Repo.cs +++ b/Repository/MobileV2/MobileV2Repo.cs @@ -27,12 +27,14 @@ namespace Repository.MobileV2 MyTransferDto myTransferDto = new MyTransferDto() { Receivers = new List(), RecentTransactions = new List() }; var lang = Convert.ToString(CallContext.GetData(Constants.Language)); JsonRxResponse jsonRx = new JsonRxResponse(); + string viewOption = search.ViewAll; try { var sql = "EXEC PROC_MOBILE_RECEIVER_INFORMATION"; sql += " @flag = " + _dao.FilterString("receiver-info"); sql += ", @customerId = " + _dao.FilterString(customerId); sql += ", @countryId = " + _dao.FilterString(countryid); + sql += ", @viewAll = " + _dao.FilterString(viewOption); var dataSet = _dao.ExecuteDataset(sql); List rim = new List(); @@ -90,6 +92,7 @@ namespace Repository.MobileV2 var sql1 = "Exec mobile_proc_TranHistory @flag='tran-history-v2'"; sql1 += ", @customerId =" + _dao.FilterString(customerId); + sql1 += ", @viewAll =" + _dao.FilterString(viewOption); Log.DebugFormat("GetReceiverInformation | SQL : {0}", sql); @@ -100,7 +103,7 @@ namespace Repository.MobileV2 if (!string.IsNullOrEmpty(search.FromDate)) { DateTime FromDate; - if (DateTime.TryParseExact(search.FromDate,"dd/MM/yyyy", enUS, DateTimeStyles.AdjustToUniversal, out FromDate)) + if (DateTime.TryParseExact(search.FromDate, "dd/MM/yyyy", enUS, DateTimeStyles.AdjustToUniversal, out FromDate)) { sql1 += ", @fromDate=" + _dao.FilterString(FromDate.ToString("yyyy-MM-dd")); } @@ -119,7 +122,7 @@ namespace Repository.MobileV2 else sql1 += ", @toDate=" + _dao.FilterString(search.ToDate); } - + if (!string.IsNullOrEmpty(search.Page)) sql1 += ", @pageNumber=" + _dao.FilterString(search.Page); @@ -157,7 +160,7 @@ namespace Repository.MobileV2 DisplayActions = dr["DisplayActions"].ToString(), ColorIcon = GetColor(dr["payStatus"].ToString()), ColorCode = GetColorCode(dr["payStatus"].ToString()), - TextCode= GetTextCode(dr["payStatus"].ToString()), + TextCode = GetTextCode(dr["payStatus"].ToString()), ReceiverId = Convert.ToString(dr["Receiverid"]) // PayoutAgent = Convert.ToString(dr["PayoutAgent"]), }; @@ -229,7 +232,7 @@ namespace Repository.MobileV2 else return "#514e82"; - // return "#FF0000"; + // return "#FF0000"; } @@ -468,7 +471,7 @@ namespace Repository.MobileV2 return _dao.ExecuteDataRow(sql); } - public JsonRxResponse UpdateCustomerProfile(CustomerDetailV2 req) + public JsonRxResponse UpdateCustomerProfile(CustomerDetailV2 req) { var sql = "EXEC mobile_proc_online_customerMaster_V1 @flag= 'update-address'"; sql += ", @customerId = " + _dao.FilterString(req.UserId);