Fix paytrail payment checking

code/moya-web/WebContent/resources/cditools/bills/list.xhtml

@@ -40,8 +40,7 @@
 				<f:facet name="header">
 				<f:facet name="header">
 					<h:outputText value="#{i18n['bill.payer']}" />
 					<h:outputText value="#{i18n['bill.payer']}" />
 				</f:facet>
 				</f:facet>
-				<h:link rendered="#{billListView.canWriteBill}"
-					outcome="/useradmin/edit" value="#{bill.addr1}">
+				<h:link rendered="#{billListView.canWriteBill}" outcome="/useradmin/edit" value="#{bill.user.user.login}">
 					<f:param name="userid" value="#{bill.user.user.id}" />
 					<f:param name="userid" value="#{bill.user.user.id}" />
 				</h:link>
 				</h:link>
 				<h:outputText rendered="#{not billListView.canWriteBill}"
 				<h:outputText rendered="#{not billListView.canWriteBill}"
@@ -137,13 +136,7 @@
 					value="#{i18n['bill.isNotPaid']}" />
 					value="#{i18n['bill.isNotPaid']}" />
 			</p:column>
 			</p:column>
 			<p:column rendered="#{billListView.canWriteBill and not empty billListView.paytrailMerchantId}">
 			<p:column rendered="#{billListView.canWriteBill and not empty billListView.paytrailMerchantId}">
-				<form target="_blank" action="https://payment.paytrail.com/check-payment" method="post">
-					<input name="MERCHANT_ID" type="hidden" value="#{billListView.paytrailMerchantId}" />
-					<input name="ORDER_NUMBER" type="hidden" value="#{bill.id}" />
-					<input name="AUTHCODE" type="hidden" value="#{billListView.getAuthcodeForBill(bill.id)}" />
-					<input name="VERSION" type="hidden" value="2" />
-					<input name="submit" type="submit" value="Check payment state" />
-				</form>
+				<button onclick="showPaymentstatus('#{bill.id}'); return false;"><h:outputText value="#{i18n['bill.checkPaytrail']}" /></button>
 			</p:column>
 			</p:column>
 			
 			
 
 
@@ -159,7 +152,31 @@
 		</p:dataTable>
 		</p:dataTable>
 
 
 	</h:form>
 	</h:form>
+	
+	
+
+	<form id="paymentcheckform" target="_blank" action="https://payment.paytrail.com/check-payment" method="post">
+					<input name="MERCHANT_ID" type="hidden" value="#{billListView.paytrailMerchantId}" />
+					<input id="paymentordernr" name="ORDER_NUMBER" type="hidden" value="" />
+					<input id="paymentauthcode" name="AUTHCODE" type="hidden" value="" />
+					<input name="VERSION" type="hidden" value="2" />
+	</form>
+	<script type="text/javascript" >
+	function showPaymentstatus(id) {
+		$("#paymentordernr").val(id);
+		$("#paymentauthcode").val(authcodes[id]);
+		$("#paymentcheckform").submit();
+		return false;
+	}	
+	
+		var authcodes ={};
+		<ui:repeat var="ac" value="#{billListView.paytrailAuthcodes}">
+			<h:outputText value="authcodes['#{ac.key}'] ='#{ac.value}';" />
+		</ui:repeat>
+		
+	alert("Parsed javascript");
 
 
+	</script>
 
 
 </composite:implementation>
 </composite:implementation>
 </html>
 </html>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/QueueManageView.java

@@ -96,7 +96,9 @@ public class QueueManageView extends GenericCDIView {
 		{
 		{
 			ret.add(queue.getEntry(u));
 			ret.add(queue.getEntry(u));
 		}
 		}
-		return new ListDataModel<>(ret);
+		ListDataModel<MapReservationQueueEntry> retMod = new ListDataModel<>(ret);
+
+		return retMod;
 	}
 	}
 
 
 	public ListDataModel<MapReservationQueueEntry> getUserReserving() {
 	public ListDataModel<MapReservationQueueEntry> getUserReserving() {

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/BillListView.java

@@ -20,8 +20,11 @@ package fi.codecrew.moya.web.cdiview.shop;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
+import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.ConversationScoped;
@@ -93,6 +96,11 @@ public class BillListView extends GenericCDIView {
 		}
 		}
 	}
 	}
 
 
+	public Object[] getPaytrailAuthcodes() {
+		Set<Entry<Integer, String>> ret = paytrailAuthcodes.entrySet();
+		return ret.toArray();
+	}
+
 	public String getAuthcodeForBill(Integer id) {
 	public String getAuthcodeForBill(Integer id) {
 		return paytrailAuthcodes.get(id);
 		return paytrailAuthcodes.get(id);
 	}
 	}

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

@@ -72,6 +72,7 @@ bill.billMarkedPaidMail.subject = Bill marked paid
 bill.billNumber = Order number
 bill.billNumber = Order number
 bill.billPaidDate = Paid date
 bill.billPaidDate = Paid date
 bill.cancel = Cancel bill
 bill.cancel = Cancel bill
+bill.checkPaytrail = Check payment
 bill.deliveryTerms = Delivery terms
 bill.deliveryTerms = Delivery terms
 bill.edit  = edit
 bill.edit  = edit
 bill.expires = Expires
 bill.expires = Expires

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

@@ -72,6 +72,7 @@ bill.billMarkedPaidMail.subject = Lasku merkitty maksetuksi
 bill.billNumber = Tilausnumero
 bill.billNumber = Tilausnumero
 bill.billPaidDate = Maksup\u00E4iv\u00E4
 bill.billPaidDate = Maksup\u00E4iv\u00E4
 bill.cancel = Peruuta lasku
 bill.cancel = Peruuta lasku
+bill.checkPaytrail = Tarkista maksu
 bill.deliveryTerms = Toimitusehdot
 bill.deliveryTerms = Toimitusehdot
 bill.edit  = Muokkaa
 bill.edit  = Muokkaa
 bill.expires = Vanhentuu
 bill.expires = Vanhentuu