Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Linnea Samila
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 9714ebc9
authored
May 12, 2012
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser
2 parents
81b52062
1ef4679f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceBean.java
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ProductBeanLocal.java
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceBean.java
View file @
9714ebc
...
...
@@ -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
(
Event
User
user
)
throws
BortalCatchableException
{
if
(
user
==
null
)
{
user
=
permbean
.
getCurrentUser
();
}
else
{
...
...
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ProductBeanLocal.java
View file @
9714ebc
...
...
@@ -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
,
Event
User
user
);
// List<Discount> getActiveDiscounts(Product product, BigDecimal quantity);
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment