IME-LONDON
/
MOBILE_API
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

sync

feature/Redmine-17825-Email_Template
shakun 8 months ago
parent
77bc29d12d
commit
d71681ed6e
8 changed files with 60 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Business/Mobile/MobileServices.cs
  2. 2
      Business/SendMoney/SendMoneyBusiness.cs
  3. 7
      Common/Helper/GetStatic.cs
  4. 1
      Common/Model/ExRateCalculateRequest.cs
  5. 8
      JsonRx/Api/CustomerController.cs
  6. 1
      JsonRx/Api/SendMoneyController.cs
  7. 78
      Repository/Authentication/AuthenticationRepo.cs
  8. 8
      Repository/Mobile/MobileServicesRepo.cs

6
Business/Mobile/MobileServices.cs
View File

@ -398,7 +398,7 @@ namespace Business.Mobile
CAmount = Convert.ToDecimal(m.cAmount == "" ? "0" : m.cAmount),
CardOnline = "",
CollCurrency = m.sCurrency,
CouponCode = "",
CouponCode = m.DeviceType,
CustomerId = 0,
IsExRateCalcByPartner = false,
IsManualSc = false,
@ -2203,7 +2203,7 @@ namespace Business.Mobile
if (liWalletStmtResponse == null)
{
jsonRx.ErrorCode = "1";
jsonRx.Msg = "No wallet statement found.";
jsonRx.Msg = "No Record(s) Found!";
jsonRx.Data = new System.Collections.ArrayList();
Log.Debug("GetWalletStatement | Returning null while fetching the list of wallet statements.");
return jsonRx;
@ -2437,7 +2437,7 @@ namespace Business.Mobile
if (requiredList.Count > 0)
{
// string.Format("Required Fields:-" , string.Join(", ", requiredList.Select(x => x.Key).ToList()));
jsonResult.SetResponse("100", string.Format("Required Fields:-\r\n {0}", string.Join("\r\n", requiredList.Select(x => findMapKeyValue(x.Key)).ToList())));
jsonResult.SetResponse("100", string.Format("Required Fields:-\r\n{0}", string.Join("\r\n", requiredList.Select(x => findMapKeyValue(x.Key)).ToList())));
return jsonResult;
}

2
Business/SendMoney/SendMoneyBusiness.cs
View File

@ -157,7 +157,7 @@ namespace Business.SendMoney
CAmount = Convert.ToDecimal(m.cAmount == "" ? "0" : m.cAmount),
CardOnline = "",
CollCurrency = m.sCurrency,
CouponCode = "",
CouponCode = m.DeviceType,
CustomerId = 0,
IsManualSc = false,
IsOnline = false,

7
Common/Helper/GetStatic.cs
View File

@ -57,6 +57,13 @@ namespace Common.Helper
else
return strVal;
}
public static String ShowDecimal1(String strVal)
{
if (strVal != "")
return double.Parse(strVal).ToString("0.00");
else
return strVal;
}
public static String ShowCommaAmt(string strVal)
{

1
Common/Model/ExRateCalculateRequest.cs
View File

@ -23,6 +23,7 @@ namespace Common.Model
public string tpPCurrnecy { get; set; }
public string userId { get; set; }
public string discountedFee { get; set; }
public string DeviceType { get; set; }
}
public class CommonRequest

8
JsonRx/Api/CustomerController.cs
View File

@ -123,11 +123,11 @@ namespace JsonRx.Api
// newUserRegister.phoneOs = Util.GetDeviceType(Request);
newUserRegister.FullName= newUserRegister.FullName.ToTitleCase(TitleCase.All);
var custRegisterResponse = _requestServices.NewUserRegister(newUserRegister);
Log.Debug("NewUserRegister | RESPONSE : " + JsonConvert.SerializeObject(custRegisterResponse));
return Ok(custRegisterResponse);
}
return ModelValidationError(ModelState);
return ModelValidationError(ModelState,"100");
}
/// <summary>
@ -378,14 +378,14 @@ namespace JsonRx.Api
/// </summary>
/// <param name="modelState"></param>
/// <returns></returns>
protected IHttpActionResult ModelValidationError(ModelStateDictionary modelState)
protected IHttpActionResult ModelValidationError(ModelStateDictionary modelState, string error="")
{
var modelErrors = modelState.Select(x => x.Value.Errors)
.Where(y => y.Count > 0)
.First()[0].ErrorMessage;
JsonRxResponse jsonRx = new JsonRxResponse()
{
ErrorCode = "1",
ErrorCode = error??"1",
Msg = string.IsNullOrEmpty(modelErrors) ? "It seems like incorrect Json input(s)." : modelErrors,
Data = ""
};

1
JsonRx/Api/SendMoneyController.cs
View File

@ -135,6 +135,7 @@ namespace JsonRx.Api
LogicalThreadContext.Properties[LoggerProperty.PROCESSID] = pId;
LogicalThreadContext.Properties[LoggerProperty.METHODNAME] = "calculate";
LogicalThreadContext.Properties[LoggerProperty.CREATEDBY] = model.userId;
model.DeviceType= Util.GetDeviceType(Request);
Log.Debug("Calculate | REQUEST : " + JsonConvert.SerializeObject(model));
if (ModelState.IsValid)
{

78
Repository/Authentication/AuthenticationRepo.cs
View File

@ -130,47 +130,47 @@ namespace Repository.Authentication
// ls.Msg = dataTable.Rows[0]["errorCode"] + Convert.ToString(dataTable.Rows[0]["msg"]);
//return ls;
string enumString = string.Empty;
//string enumString = string.Empty;
if (dataTable.Rows[0]["errorCode"].Equals("1"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_1.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("2"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_2.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("3"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_3.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("4"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_4.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("5"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_5.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("6"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_6.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("7"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_7.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("8"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_8.ToString();
}
else if (dataTable.Rows[0]["errorCode"].Equals("20"))
{
enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_20.ToString();
}
//if (dataTable.Rows[0]["errorCode"].Equals("1"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_1.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("2"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_2.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("3"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_3.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("4"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_4.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("5"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_5.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("6"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_6.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("7"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_7.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("8"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_8.ToString();
//}
//else if (dataTable.Rows[0]["errorCode"].Equals("20"))
//{
// enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_20.ToString();
//}
var map = Utilities.GetLanguageMapping(enumString, lang);
return new LoginResponse { ErrorCode = dataTable.Rows[0]["errorCode"].Equals("0") ? "0" : "1", Msg = map.Message};
// var map = Utilities.GetLanguageMapping(enumString, lang);
return new LoginResponse { ErrorCode = dataTable.Rows[0]["errorCode"].Equals("0") ? "0" : "1", Msg = Convert.ToString(dataTable.Rows[0]["msg"]) };
//ls.Msg = map.Message;
}

8
Repository/Mobile/MobileServicesRepo.cs
View File

@ -1005,16 +1005,16 @@ namespace Repository.Mobile
accountNo = sRow["accountNo"].ToString(),
payoutBankBranch = sRow["pBranchName"].ToString(),
pAgentBank = sRow["pAgent"].ToString() ?? "[ANY WHERE]",
collAmount = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + " " + sRow["collCurr"].ToString(),
collAmount = GetStatic.ShowDecimal1(sRow["cAmt"].ToString()) + " " + sRow["collCurr"].ToString(),
exRate = sRow["exRate"].ToString(),
serviceCharge = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + " " + sRow["collCurr"].ToString(),
serviceCharge = GetStatic.ShowDecimal1(sRow["serviceCharge"].ToString()) + " " + sRow["collCurr"].ToString(),
payOutAmount = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + " " + sRow["payoutCurr"].ToString(),
couponName = sRow["couponName"].ToString(),
discountType = sRow["discountType"].ToString(),
discountValue = sRow["discountValue"].ToString(),
discountPercent = sRow["discountPercent"].ToString(),
tranStatus = sRow["tranStatus"].ToString(),
rewardPoints = sRow["rewardPoints"].ToString(),
rewardPoints = GetStatic.ShowDecimal1(sRow["rewardPoints"].ToString()),
ColorIcon = GetColor(sRow["PayStatus"].ToString()),
SenderFullName = sRow["senderName"].ToString(),
PaymentDetails = new PaymentDetails()
@ -3136,7 +3136,7 @@ namespace Repository.Mobile
{
CustomerName = row1["CUSTOMER_NAME"].ToString(),
RewardAmount = string.Format("{0:0.##}", row1["REWARD_AMOUNT"].ToString()),
RewardType = row1["REWARD_TYPE"].ToString(),
RewardType = $"{row1["CUSTOMER_NAME"].ToString()} - { row1["REWARD_TYPE"].ToString()}",
DestinationCustomerId = row1["DESTINATION_CUSTOMERID"].ToString(),
CreatedDate = row1["CREATED_DATE"].ToString()
});

Write Preview
Loading…
Cancel
Save