User management fixed. Reports working now. Deployed
This commit is contained in:
@ -11,10 +11,10 @@ namespace Tanshu.Accounts.Entities.Auth
|
||||
public virtual string Name { get; set; }
|
||||
public virtual string Password { get; set; }
|
||||
public virtual bool LockedOut { get; set; }
|
||||
public virtual IList<Group> Groups { get; set; }
|
||||
public virtual IList<UserGroup> UserGroups { get; set; }
|
||||
public User()
|
||||
{
|
||||
Groups = new List<Group>();
|
||||
UserGroups = new List<UserGroup>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,78 +12,24 @@ namespace Tanshu.Accounts.Entities
|
||||
public virtual Voucher Voucher { get; set; }
|
||||
public virtual Product Product { get; set; }
|
||||
|
||||
private decimal quantity;
|
||||
public virtual decimal Quantity
|
||||
{
|
||||
get { return quantity; }
|
||||
set
|
||||
{
|
||||
quantity = value;
|
||||
if (amount != null)
|
||||
CalculateAmount();
|
||||
}
|
||||
}
|
||||
public virtual decimal Quantity { get; set; }
|
||||
|
||||
private decimal rate;
|
||||
public virtual decimal Rate
|
||||
{
|
||||
get { return rate; }
|
||||
set
|
||||
{
|
||||
rate = value;
|
||||
if (amount != null)
|
||||
CalculateAmount();
|
||||
}
|
||||
}
|
||||
public virtual decimal Rate { get; set; }
|
||||
|
||||
decimal tax;
|
||||
public virtual decimal Tax
|
||||
{
|
||||
get { return tax; }
|
||||
set
|
||||
{
|
||||
tax = value;
|
||||
if (amount != null)
|
||||
CalculateAmount();
|
||||
}
|
||||
}
|
||||
public virtual decimal Tax { get; set; }
|
||||
|
||||
decimal discount;
|
||||
public virtual decimal Discount
|
||||
{
|
||||
get { return discount; }
|
||||
set
|
||||
{
|
||||
discount = value;
|
||||
if (amount != null)
|
||||
CalculateAmount();
|
||||
}
|
||||
}
|
||||
public virtual decimal Discount { get; set; }
|
||||
|
||||
private decimal serviceCharge;
|
||||
public virtual decimal ServiceCharge
|
||||
{
|
||||
get { return serviceCharge; }
|
||||
set
|
||||
{
|
||||
discount = value;
|
||||
if (amount != null)
|
||||
CalculateAmount();
|
||||
}
|
||||
|
||||
}
|
||||
public virtual decimal ServiceCharge { get; set;}
|
||||
|
||||
[Cascade]
|
||||
public virtual IList<InventoryModifier> InventoryModifier { get; set; }
|
||||
|
||||
decimal? amount;
|
||||
public virtual decimal Amount
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!amount.HasValue)
|
||||
CalculateAmount();
|
||||
return amount.Value;
|
||||
return Quantity * Rate * (1 + Tax) * (1 + ServiceCharge) * (1 - Discount);
|
||||
}
|
||||
set
|
||||
{ }
|
||||
@ -96,10 +42,6 @@ namespace Tanshu.Accounts.Entities
|
||||
// return quantity * rate * (1 + tax) * (1 + serviceCharge) * discount;
|
||||
// }
|
||||
//}
|
||||
protected void CalculateAmount()
|
||||
{
|
||||
amount = quantity * rate * (1 + tax) * (1 + serviceCharge) * (1 - discount);
|
||||
}
|
||||
public Inventory()
|
||||
{
|
||||
InventoryModifier = new List<InventoryModifier>();
|
||||
|
||||
@ -11,6 +11,7 @@ namespace Tanshu.Accounts.Entities
|
||||
public virtual string Name { get; set; }
|
||||
public virtual decimal DiscountLimit { get; set; }
|
||||
public virtual bool IsModifierCompulsory { get; set; }
|
||||
public virtual string GroupType { get; set; }
|
||||
public virtual IList<Product> Products { get; set; }
|
||||
public ProductGroup()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user