added counting limits for computer place products

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

@@ -221,6 +221,13 @@ public class ProductBean implements ProductBeanLocal {
 
 
 				int freeCount = selectableCount.intValue() - unusedSlotcount;
 				int freeCount = selectableCount.intValue() - unusedSlotcount;
 
 
+				BigDecimal lim = getPrivateProductLimit(prod, user, userroles);
+				
+				if(prod != null && lim != null && lim.intValue() < freeCount){
+					//logger.info("product: {}, lim: {}", prod.getName(), lim.toString());
+					freeCount = lim.intValue();
+				} 
+					
 				// logger.info("Prodlimit selectable {}, unused {}, free {}, prod {}", selectableCount, unusedSlots, freeCount, prod);
 				// logger.info("Prodlimit selectable {}, unused {}, free {}, prod {}", selectableCount, unusedSlots, freeCount, prod);
 				ret.put(prod.getId(), BigDecimal.valueOf(freeCount));
 				ret.put(prod.getId(), BigDecimal.valueOf(freeCount));
 
 

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

@@ -90,7 +90,6 @@ public class ProductShopItemHelper extends GenericCDIView {
 
 
 		if (limitValue != null) {
 		if (limitValue != null) {
 			productsLeft = limitValue.subtract(item.getCount());
 			productsLeft = limitValue.subtract(item.getCount());
-			logger.debug("limitValue: {}", limitValue.toString());
 			if (productsLeft.compareTo(BigDecimal.ZERO) < 0) {
 			if (productsLeft.compareTo(BigDecimal.ZERO) < 0) {
 
 
 				this.setProductShopItemCount(item, limitValue);
 				this.setProductShopItemCount(item, limitValue);
@@ -103,8 +102,6 @@ public class ProductShopItemHelper extends GenericCDIView {
 			}
 			}
 		}
 		}
 
 
-		logger.debug("productsLeft: {}", productsLeft.toString());
-
 		item.setLimit(productsLeft);
 		item.setLimit(productsLeft);
 		return false;
 		return false;
 	}
 	}