Commit 2a52160f by Tuukka Kivilahti

last bugs before sleep

1 parent 450b192f
...@@ -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() {
......
...@@ -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;
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!