Merge branch 'tuoteJaPaikkaKorjaus' into 'master'

Tuote ja paikka korjaus

Seuraavat bugit korjattu
 * Defaulttimime paikkakarttaan.
 * Haetaan mime kuvasta uppiessa.
 * Admin-kaupassa käsiteltiin alennus määränä ja määrä alennuksena.
 * Admin-kaupasta tuli nullpointerexceptionia jos tuote loppuunmyyty, koska silloin määräksi tuli nolla, ja tykättiin jakaa määrällä.

See merge request !219

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

@@ -55,6 +55,8 @@ public class EventMapBean implements EventMapBeanLocal {
 
 
 	private static final Logger logger = LoggerFactory.getLogger(EventMapBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(EventMapBean.class);
 
 
+
+
 	@Override
 	@Override
 	@RolesAllowed(MapPermission.S_MANAGE_MAPS)
 	@RolesAllowed(MapPermission.S_MANAGE_MAPS)
 	public EventMap saveMap(EventMap eventmap) {
 	public EventMap saveMap(EventMap eventmap) {

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

@@ -420,7 +420,7 @@ public class ProductBean implements ProductBeanLocal {
 	public AccountEvent createAccountEvent(Product product, BigDecimal overriddenUnitPrice, BigDecimal quantity, EventUser user) {
 	public AccountEvent createAccountEvent(Product product, BigDecimal overriddenUnitPrice, BigDecimal quantity, EventUser user) {
 		user = eventUserFacade.reload(user);
 		user = eventUserFacade.reload(user);
 
 
-		AccountEvent ret = productPBean.createAccountEvent(product, overriddenUnitPrice, quantity, user, Calendar.getInstance(), null);
+		AccountEvent ret = productPBean.createAccountEvent(product, overriddenUnitPrice , quantity, user, Calendar.getInstance(), null);
 		cardTemplateBean.checkPrintedCard(user);
 		cardTemplateBean.checkPrintedCard(user);
 		return ret;
 		return ret;
 	}
 	}

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

@@ -164,6 +164,11 @@ public class EventMap extends GenericEntity {
 	}
 	}
 
 
 	public String getMimeType() {
 	public String getMimeType() {
+
+		// hardcoded default, because it's always nice to guess something
+		if(mimeType == null || mimeType.trim().equals(""))
+			return "image/png";
+
 		return mimeType;
 		return mimeType;
 	}
 	}
 
 

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

@@ -28,7 +28,7 @@ public enum LanEventPropertyKey {
 	PORTAL_EMAIL_NAME(Type.TEXT, "Moya Online Youth Accumulator"),
 	PORTAL_EMAIL_NAME(Type.TEXT, "Moya Online Youth Accumulator"),
 
 
 	ADMIN_MAIL(Type.TEXT, "moya@codecrew.fi"),
 	ADMIN_MAIL(Type.TEXT, "moya@codecrew.fi"),
-	EVENT_LAYOUT(Type.TEXT, "template1"),
+	EVENT_LAYOUT(Type.TEXT, "primelayout"),
 	SHOP_DEFAULT_CASH(Type.BOOL, null),
 	SHOP_DEFAULT_CASH(Type.BOOL, null),
 	PLACECODE_FROM_USER(Type.BOOL, "1"),
 	PLACECODE_FROM_USER(Type.BOOL, "1"),
 	PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null),
 	PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null),

code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionHandler.java

@@ -129,7 +129,6 @@ public class SessionHandler {
 		}
 		}
 		if (template == null) {
 		if (template == null) {
 			template = "primelayout";
 			template = "primelayout";
-
 		}
 		}
 		return template;
 		return template;
 	}
 	}

code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java

@@ -118,6 +118,7 @@ public class PlaceMapServlet extends HttpServlet {
 
 
 
 
 
 
+
 			EventMap map = placeBean.findMap(mapId);
 			EventMap map = placeBean.findMap(mapId);
 			logger.debug("Mapid: {}", mapId);
 			logger.debug("Mapid: {}", mapId);
 			ostream = response.getOutputStream();
 			ostream = response.getOutputStream();

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

@@ -119,6 +119,7 @@ public class MapManageView extends GenericCDIView {
 
 
 	public String submitBg()
 	public String submitBg()
 	{
 	{
+
 		byte[] bytes = bgFile.getContents();
 		byte[] bytes = bgFile.getContents();
 		if (bytes == null && bgFile.getSize() > 0)
 		if (bytes == null && bgFile.getSize() > 0)
 		{
 		{
@@ -131,6 +132,7 @@ public class MapManageView extends GenericCDIView {
 			}
 			}
 		}
 		}
 		map.setMapData(bytes);
 		map.setMapData(bytes);
+		map.setMimeType(bgFile.getContentType());
 		map = eventmapBean.saveMap(map);
 		map = eventmapBean.saveMap(map);
 		return null;
 		return null;
 	}
 	}

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

@@ -372,7 +372,7 @@ public class ProductShopView extends GenericCDIView {
 			//	retuser = productBean.createAccountEvent(shopitem.getProduct(), shopitem.getCount(), shopitem.getOverriddenUnitPrice(), userView.getSelectedUser()).getUser();
 			//	retuser = productBean.createAccountEvent(shopitem.getProduct(), shopitem.getCount(), shopitem.getOverriddenUnitPrice(), userView.getSelectedUser()).getUser();
 
 
 				BigDecimal overriddenPrice = (shopitem.isOverrideUnitPrice()) ? shopitem.getOverriddenUnitPrice() : null;
 				BigDecimal overriddenPrice = (shopitem.isOverrideUnitPrice()) ? shopitem.getOverriddenUnitPrice() : null;
-				retuser = productBean.createAccountEvent(shopitem.getProduct(), shopitem.getCount(), overriddenPrice, userView.getSelectedUser()).getUser();
+				retuser = productBean.createAccountEvent(shopitem.getProduct(),  overriddenPrice, shopitem.getCount(), userView.getSelectedUser()).getUser();
 
 
 			}
 			}
 		}
 		}

code/moya-web/src/main/java/fi/codecrew/moya/web/helper/LayoutView.java

@@ -105,7 +105,7 @@ public class LayoutView implements Serializable {
 				return null;
 				return null;
 
 
 			while (selectedTop.getParent() != null) {
 			while (selectedTop.getParent() != null) {
-				logger.debug("Traversing to top {}, key {}", selectedTop, selectedTop.getKey());
+		//		logger.debug("Traversing to top {}, key {}", selectedTop, selectedTop.getKey());
 				selectedSet.add(selectedTop);
 				selectedSet.add(selectedTop);
 				selectedTop = selectedTop.getParent();
 				selectedTop = selectedTop.getParent();
 			}
 			}

code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/ProductShopItem.java

@@ -208,6 +208,8 @@ public class ProductShopItem {
 
 
 
 
     public BigDecimal getOverriddenUnitPrice() {
     public BigDecimal getOverriddenUnitPrice() {
+		if(getCount().equals(BigDecimal.ZERO))
+			return getPrice();
 
 
 		if(!isOverrideUnitPrice())
 		if(!isOverrideUnitPrice())
 			return getPrice().divide(getCount());
 			return getPrice().divide(getCount());
@@ -241,6 +243,9 @@ public class ProductShopItem {
 
 
 
 
     public BigDecimal getUnitDiscount() {
     public BigDecimal getUnitDiscount() {
+		if(getCount().equals(BigDecimal.ZERO))
+			return BigDecimal.ZERO;
+
         return  getPrice().divide(getCount()).subtract(getProduct().getPrice());
         return  getPrice().divide(getCount()).subtract(getProduct().getPrice());
     }
     }