Merge branch 'neomap' into 'master'

Fix placeslot checking

See merge request !140

code/moya-beans/ejbModule/fi/codecrew/moya/beans/VerkkomaksutFiBean.java

@@ -97,6 +97,10 @@ public class VerkkomaksutFiBean implements VerkkomaksutFiBeanLocal {
 	@Override
 	public boolean isSvmEnabled()
 	{
+		if (!permbean.hasPermission(BillPermission.CREATE_VERKKOMAKSU))
+		{
+			return false;
+		}
 		LanEventPrivateProperty expire = eventbean.getPrivateProperty(LanEventPrivatePropertyKey.VERKKOMAKSU_KEY_EXPIRE);
 		String merchantid = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_ID);
 		String merchantPassword = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_PASSWORD);

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

@@ -18,6 +18,7 @@
  */
 package fi.codecrew.moya.facade;
 
+import java.util.Calendar;
 import java.util.List;
 
 import javax.ejb.EJB;
@@ -96,8 +97,13 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
 		CriteriaQuery<Long> q = cb.createQuery(Long.class);
 		Root<PlaceSlot> root = q.from(PlaceSlot.class);
 		q.select(cb.count(root));
-
-		q.where(cb.equal(root.get(PlaceSlot_.product), prod));
+		Path<Bill> bill = root.get(PlaceSlot_.bill);
+		Path<Calendar> billexp = bill.get(Bill_.expires);
+		q.where(cb.equal(root.get(PlaceSlot_.product), prod),
+				cb.or(cb.isNull(billexp),
+						cb.greaterThan(billexp, Calendar.getInstance())
+						)
+				);
 
 		Long count = super.getSingleNullableResult(getEm().createQuery(q));
 		return count;

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

@@ -102,7 +102,7 @@ public class AjaxMapView extends GenericCDIView {
 	public String buySelectedPlaces() {
 		try {
 			EventUser user = userview.getSelectedUser();
-			placebean.buySelectedPlaces(user);
+			placebean.reserveSelectedPlaces(user);
 			return "/place/myGroups";
 		} catch (BortalCatchableException e) {
 			addFaceMessage("mapView.errorWhileBuyingPlaces");

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

@@ -99,7 +99,7 @@ public class BillEditView extends GenericCDIView {
 
 	public VerkkomaksutReturnEntry getVerkkomaksuFiToken()
 	{
-		if (bill != null && vmreturn == null)
+		if (isVerkkomaksuFiAvailable() &&  bill != null && vmreturn == null)
 		{
 			vmreturn = vmbean.getSvmToken(bill);
 			logger.info("Vmtoken url {}, token {}", vmreturn.getUrl(), vmreturn.getToken());