tanshu/narsil
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Refactor: Instead of a concept of Price/FullPrice, happy hour is now a checkbox in the product.

Browse Source 
This needed major refactor in all parts dealing with product or inventory.
This commit is contained in:
tanshu
2016-04-11 12:31:52 +05:30
parent 69cb7d8bce
commit 20eac3c216
35 changed files with 861 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Tanshu.Accounts.Contracts/Data Contracts Display/BillInventoryBO.cs
View File

@ -15,7 +15,7 @@ namespace Tanshu.Accounts.Contracts
{
if (inventory != null)
{
var output = string.Format("{0} @ Rs. {1:#.##}", inventory.Product.FullName, inventory.Price);
var output = string.Format("{0} @ Rs. {1:#.##}", inventory.EffectiveName, inventory.Price);
if (inventory.Discount != 0)
output += string.Format(" - {0:#.##%}", inventory.Discount);
foreach (var item in inventory.InventoryModifier)
@ -36,12 +36,12 @@ namespace Tanshu.Accounts.Contracts
{
inventory = inv;
}
public BillItemValue(Product product)
public BillItemValue(Product product, bool isHappyHour)
{
inventory = new Inventory()
{
Product = product,
FullPrice = product.FullPrice,
IsHappyHour = isHappyHour,
Price = product.Price,
IsScTaxable = product.IsScTaxable,
Quantity = 1,

15
Tanshu.Accounts.Contracts/Data Contracts Display/BillItemKey.cs
View File

@ -4,7 +4,8 @@ namespace Tanshu.Accounts.Contracts
{
public enum BillItemType
{
Product,
RegularProduct,
HappyHourProduct,
Kot
}
public class BillItemKey
@ -18,15 +19,15 @@ namespace Tanshu.Accounts.Contracts
public BillItemKey(Guid kotID)
: this(Guid.Empty, kotID, BillItemType.Kot)
{ }
public BillItemKey(Guid productID, Guid kotID)
: this(productID, kotID, BillItemType.Product)
public BillItemKey(Guid productID, Guid kotID, bool IsHappyHour)
: this(productID, kotID, IsHappyHour? BillItemType.HappyHourProduct : BillItemType.RegularProduct)
{ }
private Guid _productID;
public Guid ProductID
{
get { return BillItemType == BillItemType.Product ? _productID : Guid.Empty; }
private set { _productID = BillItemType == BillItemType.Product ? value : Guid.Empty; }
get { return BillItemType != BillItemType.Kot ? _productID : Guid.Empty; }
private set { _productID = BillItemType != BillItemType.Kot ? value : Guid.Empty; }
}
public Guid KotID { get; private set; }
@ -35,7 +36,7 @@ namespace Tanshu.Accounts.Contracts
public override int GetHashCode()
{
return BillItemType.GetHashCode() ^ KotID.GetHashCode() ^ ProductID.GetHashCode();
return BillItemType.GetHashCode() ^ KotID.GetHashCode() ^ ProductID.GetHashCode() ^ BillItemType.GetHashCode();
}
public static bool operator ==(BillItemKey a, BillItemKey b)
{
@ -50,7 +51,7 @@ namespace Tanshu.Accounts.Contracts
if (a.BillItemType != b.BillItemType)
return false;
return a.KotID == b.KotID && a.BillItemType == b.BillItemType && a.ProductID == b.ProductID;
return a.KotID == b.KotID && a.BillItemType == b.BillItemType && a.ProductID == b.ProductID && a.BillItemType == b.BillItemType;
}
public static bool operator !=(BillItemKey a, BillItemKey b)
{

20
Tanshu.Accounts.Contracts/Data Contracts Display/SalesAnalysisBO.cs
View File

@ -19,10 +19,22 @@ namespace Tanshu.Accounts.Contracts
public class SalesAnalysisDetail
{
public virtual string Product { get; set; }
public virtual decimal Sale { get; set; }
public virtual decimal NC { get; set; }
public virtual decimal Staff { get; set; }
private string _name;
public Guid ProductID { get; set; }
public string Name
{
get
{
return IsHappyHour ? "H H " + _name : _name;
}
set
{
_name = value;
}
}
public bool IsHappyHour { get; set; }
public decimal Sale { get; set; }
public decimal NC { get; set; }
}
public class BillDetail
{