rnd

code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipFacade.java

@@ -55,6 +55,8 @@ public class VipFacade extends IntegerPkGenericFacade<Vip> {
 		LanEvent event = eventBean.getCurrentEvent();
 		LanEvent event = eventBean.getCurrentEvent();
 
 
 		cq.where(cb.equal(root.get(Vip_.event), event));
 		cq.where(cb.equal(root.get(Vip_.event), event));
+		cq.orderBy(cb.asc(root.get(Vip_.id)));
+
 		return getEm().createQuery(cq).getResultList();
 		return getEm().createQuery(cq).getResultList();
 	}
 	}
 
 

code/moya-web/WebContent/bill/productSummary.xhtml

@@ -25,10 +25,14 @@
 								<f:selectItem itemLabel="#{i18n['bill.isNotPaid']}" itemValue="false"/>
 								<f:selectItem itemLabel="#{i18n['bill.isNotPaid']}" itemValue="false"/>
 							</p:selectOneButton>
 							</p:selectOneButton>
 						</f:facet>
 						</f:facet>
-						<p:link outcome="/bill/edit" value="#{line.bill.id} (#{line.bill.paid?i18n['bill.isPaid']:i18n['bill.isNotPaid']})">
+						<p:link outcome="/bill/edit"
+								value="#{line.bill.id} (#{line.bill.paid ? i18n['bill.isPaid'] : i18n['bill.isNotPaid']})">
 							<f:param name="billid" value="#{line.bill.id}"/>
 							<f:param name="billid" value="#{line.bill.id}"/>
 						</p:link>
 						</p:link>
 					</p:column>
 					</p:column>
+					<p:column headerText="#{i18n['bill.notes']}">
+						<h:outputText value="#{line.bill.notes}"/>
+					</p:column>
 
 
 					<p:column sortable="true" sortBy="#{line.bill.paidDate}" headerText="#{i18n['bill.paidDate']}">
 					<p:column sortable="true" sortBy="#{line.bill.paidDate}" headerText="#{i18n['bill.paidDate']}">
 						<h:outputText value="#{line.bill.paidDate}">
 						<h:outputText value="#{line.bill.paidDate}">

code/moya-web/WebContent/vip/viplist.xhtml

@@ -64,7 +64,7 @@
 					</p:column>
 					</p:column>
 
 
 					<p:column style="width: 90px; text-align: center;">
 					<p:column style="width: 90px; text-align: center;">
-						<p:commandButton id="delivebtn" rendered="#{not empty vip.id}" value="#{i18n['vip.deliver']}" actionListener="#{vipListView.deliverDialog(vip)}" >
+						<p:commandButton id="delivebtn" rendered="#{not empty vip.id}" value="#{i18n['vip.deliver']}" actionListener="#{vipListView.deliverDialog(vip.id)}" >
 							<p:ajax event="dialogReturn" listener="#{vipListView.updateViplist()}" update="products" />
 							<p:ajax event="dialogReturn" listener="#{vipListView.updateViplist()}" update="products" />
 						</p:commandButton>
 						</p:commandButton>
 					</p:column>
 					</p:column>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipListView.java

@@ -57,10 +57,12 @@ public class VipListView extends PaginationView<Vip> {
 		initView();
 		initView();
 	}
 	}
 
 
-	public void deliverDialog(Vip item) {
+	public void deliverDialog(Integer vipId) {
 		//getDeliverView().setVip(viplist.getRowData());
 		//getDeliverView().setVip(viplist.getRowData());
 
 
-		getDeliverView().setVip(item);
+		Vip vip = vipBean.find(vipId);
+
+		getDeliverView().setVip(vip);
 		logger.info("Set vip in deliverView to {}", deliverView.getVip());
 		logger.info("Set vip in deliverView to {}", deliverView.getVip());
 
 
 		Map<String, Object> options = new HashMap<>();
 		Map<String, Object> options = new HashMap<>();