Added FullPrice column to display Happy Hour Pricing.

Added Void or Reprint Report.
Changed Product.SalePrice -> Price
Changed Inventory.Rate -> Price
This commit is contained in:
unknown
2011-08-28 17:47:15 +05:30
parent 831ec37cda
commit 719dbd49d2
26 changed files with 850 additions and 1179 deletions

View File

@ -9,6 +9,7 @@ namespace Tanshu.Accounts.Contracts
public int ProductID { get; set; }
public string Name { get; set; }
public decimal Price { get; set; }
public decimal FullPrice { get; set; }
public decimal Quantity { get; set; }
private decimal _discount;
public Product Product { get; private set; }
@ -104,7 +105,8 @@ namespace Tanshu.Accounts.Contracts
ProductID = product.ProductID;
Name = product.Units == string.Empty ? product.Name : product.Name + " (" + product.Units + ")";
Quantity = 1;
Price = product.SalePrice;
Price = product.Price;
FullPrice = product.FullPrice;
Tax = product.Tax.Rate;
ServiceCharge = product.ServiceCharge;
Discount = 0;
@ -118,6 +120,7 @@ namespace Tanshu.Accounts.Contracts
Discount = 0;
Name = "== New Kot ==";
Price = 0;
FullPrice = 0;
Printed = true;
Quantity = 0;
Tax = -1;
@ -131,6 +134,7 @@ namespace Tanshu.Accounts.Contracts
Discount = 0;
Name = string.Format("Kot: {0} / {1:dd-MMM HH:mm} ({2})", kot.Code, kot.Date, kot.User.Name);
Price = 0;
FullPrice = 0;
Printed = true;
Quantity = 0;
Tax = -1;

View File

@ -1,13 +0,0 @@
using System;
using System.Runtime.Serialization;
using FluentNHibernate.Mapping;
using Tanshu.Accounts.Entities;
namespace Tanshu.Accounts.Contracts
{
public class ProductDisplay : Product
{
public virtual decimal Price { get; set; }
public virtual string Group { get; set; }
}
}

View File

@ -21,7 +21,8 @@ namespace Tanshu.Accounts.Entities
public virtual Product Product { get; set; }
public virtual decimal Quantity { get; set; }
public virtual decimal Rate { get; set; }
public virtual decimal Price { get; set; }
public virtual decimal FullPrice { get; set; }
public virtual decimal Tax { get; set; }
public virtual decimal Discount { get; set; }
public virtual decimal ServiceCharge { get; set; }
@ -29,10 +30,10 @@ namespace Tanshu.Accounts.Entities
[Cascade]
public virtual IList<InventoryModifier> InventoryModifier { get; set; }
[Formula(Formula = "Quantity * Rate * (1 - Discount) * (1 + ServiceCharge) * (1 + Tax)")]
[Formula(Formula = "Quantity * Price * (1 - Discount) * (1 + ServiceCharge) * (1 + Tax)")]
public virtual decimal Amount
{
get { return Quantity * Rate * (1 + Tax) * (1 + ServiceCharge) * (1 - Discount); }
get { return Quantity * Price * (1 + Tax) * (1 + ServiceCharge) * (1 - Discount); }
private set { }
}
}

View File

@ -14,7 +14,8 @@ namespace Tanshu.Accounts.Entities
[NotNull]
public virtual Tax Tax { get; set; }
public virtual decimal ServiceCharge { get; set; }
public virtual decimal SalePrice { get; set; }
public virtual decimal Price { get; set; }
public virtual decimal FullPrice { get; set; }
public virtual bool Discontinued { get; set; }
public virtual int SortOrder { get; set; }
}

View File

@ -36,9 +36,12 @@ namespace Tanshu.Accounts.Contracts
public static RoleConstants PRINT_BILL = new RoleConstants("Sales/PrintBill");
public static RoleConstants PRINT_KOT = new RoleConstants("Sales/PrintKOT");
public static RoleConstants SALES = new RoleConstants("Sales/SalesBill");
public static RoleConstants VOID_OR_REPRINTED_BILL_REPORT = new RoleConstants("Void or Reprinted Bill Report");
public static RoleConstants BILL_DETAILS = new RoleConstants("Sales/BillDetails");
public static RoleConstants SALE_ANALYSIS = new RoleConstants("Sales/SaleAnalysis");
public static RoleConstants SALE_DETAIL = new RoleConstants("Sales/SaleDetail");
public static RoleConstants SPLIT_BILL = new RoleConstants("Split Bill");
public static RoleConstants VOID_BILL = new RoleConstants("Sales/VoidPrintedBill");
public static RoleConstants ZERO_RATE = new RoleConstants("Sales/ZeroRate");

View File

@ -75,6 +75,10 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Tanshu.Common, Version=2.0.4211.37426, Culture=neutral, PublicKeyToken=fd89fe1d2351f8b5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Include\Tanshu.Common.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Attributes\CascadeAttribute.cs" />
@ -89,6 +93,9 @@
<Compile Include="Data Contracts Display\BillItemKey.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Data Contracts Display\ProductDisplaySmallBO.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Data Contracts\Auth\UserGroup.cs" />
<Compile Include="Data Contracts\Auth\RoleGroup.cs" />
<Compile Include="Data Contracts\Auth\Group.cs" />
@ -112,8 +119,6 @@
<Compile Include="Data Contracts\PaymentBO.cs" />
<Compile Include="Data Contracts Display\PendingBillsBO.cs" />
<Compile Include="Data Contracts\ProductBO.cs" />
<Compile Include="Data Contracts Display\ProductDisplayBO.cs" />
<Compile Include="Data Contracts Display\ProductDisplaySmallBO.cs" />
<Compile Include="Data Contracts\ProductGroupBO.cs" />
<Compile Include="Helper Functions\ReflectionHelper.cs" />
<Compile Include="Helper Functions\EnumHelper.cs" />