Commit 9714ebc9 by Tuomas Riihimäki

Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser

2 parents 81b52062 1ef4679f
......@@ -223,7 +223,7 @@ public class PlaceBean implements PlaceBeanLocal {
@Override
@RolesAllowed(MapPermission.S_BUY_PLACES)
public PlaceGroup buySelectedPlaces(User user) throws BortalCatchableException {
public PlaceGroup buySelectedPlaces(EventUser user) throws BortalCatchableException {
if (user == null) {
user = permbean.getCurrentUser();
} else {
......
......@@ -7,8 +7,8 @@ import javax.ejb.Local;
import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.Discount;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.User;
@Local
public interface ProductBeanLocal {
......@@ -25,7 +25,7 @@ public interface ProductBeanLocal {
BigDecimal calculateTotal(Product key, BigDecimal value);
AccountEvent createAccountEvent(Product product, BigDecimal quantity, User user);
AccountEvent createAccountEvent(Product product, BigDecimal quantity, EventUser user);
// List<Discount> getActiveDiscounts(Product product, BigDecimal quantity);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!