This commit is contained in:
2020-06-08 23:42:40 +00:00
parent 4e13b3c9bb
commit 937e9c5907
18 changed files with 119 additions and 83 deletions

View File

@@ -50,6 +50,32 @@ namespace rockfishCore.Controllers
}
// //Get api/customer/list
// [HttpGet("list")]
// public ActionResult GetList()
// {
// var res = from c in _context.Customer.OrderBy(c => c.Name)
// select new dtoCustomerListItem
// {
// lapsed = false,
// active = c.Active,
// id = c.Id,
// name = c.Name
// };
// //Need to be made into a list before updating or else the changes would be lost
// //The tolist is what triggers the actual query to run
// var LapsedRes = res.ToList();
// foreach (dtoCustomerListItem i in LapsedRes)
// {
// i.lapsed = CustomerHasLapsed(i.id);
// }
// return Ok(LapsedRes);
// }
/// <summary>
/// Check if a customer has any active subs
/// return true if no active subs

View File

@@ -138,8 +138,8 @@ namespace rockfishCore.Controllers
public class dtoReplyMessageItem
{
public string composition;
public bool trackDelivery;
public string composition { get; set; }
public bool trackDelivery { get; set; }
}

View File

@@ -102,8 +102,8 @@ namespace rockfishCore.Controllers
public class dtoOpsStatus
{
public bool Status;
public string ServiceCheckError;
public bool Status { get; set; }
public string ServiceCheckError { get; set; }
public dtoOpsStatus()
{

View File

@@ -27,7 +27,7 @@ namespace rockfishCore.Controllers
_configuration = configuration;
}
///////////////////////////////////////////////////////
//Get expiring subscriptions list
@@ -54,12 +54,12 @@ namespace rockfishCore.Controllers
//dto classes for route
public class expiresResultItem
{
public long id;
public string name;
public string Customer;
public long customerId;
public long? expireDate;
public long site_id;
public long id { get; set; }
public string name { get; set; }
public string Customer { get; set; }
public long customerId { get; set; }
public long? expireDate { get; set; }
public long site_id { get; set; }
}
@@ -110,7 +110,7 @@ namespace rockfishCore.Controllers
private List<string> getEmailsForClient(long id)
{
List<string> ret = new List<string>();
//New for RF 6
var cust = _context.Customer.Where(p => p.Id == id).FirstOrDefault();
if (cust != null)
@@ -121,7 +121,7 @@ namespace rockfishCore.Controllers
ret.Add(cust.SupportEmail);
}
//TOASTED for RF 6
//TOASTED for RF 6
//search contact, trial, purchase, incident (optionally)
// ret.AddRange(_context.Purchase.Where(p => p.CustomerId == id).Select(p => p.Email).Distinct().ToList());
// ret.AddRange(_context.Contact.Where(p => p.CustomerId == id).Select(p => p.Email).Distinct().ToList());
@@ -188,9 +188,9 @@ namespace rockfishCore.Controllers
//dto classes for route
public class requestEmailsForProductCodes
{
public string[] products;
public bool ckIncidental;
public bool ckNoContact;
public string[] products { get; set; }
public bool ckIncidental { get; set; }
public bool ckNoContact { get; set; }
}
/////////////////////////////////////////////////////////////////////////////////////

View File

@@ -102,11 +102,11 @@ namespace rockfishCore.Controllers
//dto classes for route
public class subnotifyResultItem
{
public long id;
public string Customer;
public string purchasenames;
public List<long> purchaseidlist;
public long customerId;
public long id { get; set; }
public string Customer { get; set; }
public string purchasenames { get; set; }
public List<long> purchaseidlist { get; set; }
public long customerId { get; set; }
}

View File

@@ -127,7 +127,7 @@ namespace rockfishCore.Controllers
//------------
[HttpPost("{id}/changepassword")]
public JsonResult ChangePassword([FromRoute] long id, [FromBody] dtoChangePassword cp)
{
@@ -161,8 +161,8 @@ namespace rockfishCore.Controllers
public class dtoChangePassword
{
public string oldpassword;
public string newpassword;
public string oldpassword { get; set; }
public string newpassword { get; set; }
}