Merge branch 'deliverable-products' into 'master'

product count is important info

See merge request !385

code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java

@@ -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/WebContent/info/cardlessIncoming.xhtml

@@ -129,6 +129,13 @@
 
 
 						<p:column>
 						<p:column>
 							<f:facet name="header">
 							<f:facet name="header">
+								<h:outputText value="#{i18n['placegroupview.count']}" />
+							</f:facet>
+							<h:outputText value="#{prod.quantity}" />
+						</p:column>
+
+						<p:column>
+							<f:facet name="header">
 								<h:outputText value="#{i18n['placegroupview.accountEventDescription']}" />
 								<h:outputText value="#{i18n['placegroupview.accountEventDescription']}" />
 							</f:facet>
 							</f:facet>
 							<h:outputText value="#{prod.description}" />
 							<h:outputText value="#{prod.description}" />

code/moya-web/WebContent/info/incoming.xhtml

@@ -341,6 +341,13 @@
 
 
 						<p:column>
 						<p:column>
 							<f:facet name="header">
 							<f:facet name="header">
+								<h:outputText value="#{i18n['placegroupview.count']}" />
+							</f:facet>
+							<h:outputText value="#{prod.quantity}" />
+						</p:column>
+
+						<p:column>
+							<f:facet name="header">
 								<h:outputText value="#{i18n['placegroupview.accountEventDescription']}" />
 								<h:outputText value="#{i18n['placegroupview.accountEventDescription']}" />
 							</f:facet>
 							</f:facet>
 							<h:outputText value="#{prod.description}" />
 							<h:outputText value="#{prod.description}" />

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java

@@ -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;
 			}
 			}
 		}
 		}

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -1620,3 +1620,4 @@ incomingflow.ungiveAccountEvent=Mark not given
 incomingflow.deliverableProducts=Products to deliver
 incomingflow.deliverableProducts=Products to deliver
 placegroupview.accountEventDescription=Description
 placegroupview.accountEventDescription=Description
 incomingflow.ungivenProducts=User has ungiven deliverable products
 incomingflow.ungivenProducts=User has ungiven deliverable products
+placegroupview.count=Count

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1901,3 +1901,4 @@ incomingflow.ungiveAccountEvent=Mark not given
 incomingflow.deliverableProducts=Products to deliver
 incomingflow.deliverableProducts=Products to deliver
 placegroupview.accountEventDescription=Description
 placegroupview.accountEventDescription=Description
 incomingflow.ungivenProducts=User has ungiven deliverable products
 incomingflow.ungivenProducts=User has ungiven deliverable products
+placegroupview.count=Count

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1888,3 +1888,4 @@ incomingflow.ungiveAccountEvent=Ei olekkaan annettu
 incomingflow.deliverableProducts=Toimitettavat tuotteet
 incomingflow.deliverableProducts=Toimitettavat tuotteet
 placegroupview.accountEventDescription=Kuvaus
 placegroupview.accountEventDescription=Kuvaus
 incomingflow.ungivenProducts=K\u00E4ytt\u00E4j\u00E4ll\u00E4 on toimittamattomia tuotteita
 incomingflow.ungivenProducts=K\u00E4ytt\u00E4j\u00E4ll\u00E4 on toimittamattomia tuotteita
+placegroupview.count=Kpl