Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Riina Antikainen
/
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 2a52160f
authored
Feb 02, 2018
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
last bugs before sleep
1 parent
450b192f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java
View file @
2a52160
...
@@ -423,7 +423,9 @@ public class Product extends GenericEntity {
...
@@ -423,7 +423,9 @@ public class Product extends GenericEntity {
}
}
public
boolean
isDeliverableProduct
()
{
public
boolean
isDeliverableProduct
()
{
return
!(
isUsershopAutoproduct
()
||
getProductFlags
().
contains
(
ProductFlag
.
PREPAID_CREDIT
));
// Autoproduct, prepaid credit or negative product
return
!(
isUsershopAutoproduct
()
||
getProductFlags
().
contains
(
ProductFlag
.
PREPAID_CREDIT
)
||
getPrice
().
compareTo
(
BigDecimal
.
ZERO
)
<
0
);
}
}
public
Role
getShopRequiredRole
()
{
public
Role
getShopRequiredRole
()
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
View file @
2a52160
...
@@ -189,7 +189,7 @@ public class CardlessIncomingView extends GenericCDIView {
...
@@ -189,7 +189,7 @@ public class CardlessIncomingView extends GenericCDIView {
List
<
GroupMembership
>
memberships
=
ticketBean
.
findMembershipPrintlistForUser
(
userview
.
getSelectedUser
());
List
<
GroupMembership
>
memberships
=
ticketBean
.
findMembershipPrintlistForUser
(
userview
.
getSelectedUser
());
for
(
GroupMembership
gm
:
memberships
)
{
for
(
GroupMembership
gm
:
memberships
)
{
if
(
gm
.
getEnteredEvent
()
!
=
null
)
{
if
(
gm
.
getEnteredEvent
()
=
=
null
)
{
return
false
;
return
false
;
}
}
}
}
...
...
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