diff -r 6923a1414373 src/org/openbravo/retail/posterminal/OrderLoader.java --- a/src/org/openbravo/retail/posterminal/OrderLoader.java Mon Oct 09 15:40:28 2017 +0200 +++ b/src/org/openbravo/retail/posterminal/OrderLoader.java Fri Oct 13 11:21:00 2017 +0200 @@ -82,9 +82,7 @@ import org.openbravo.model.common.order.OrderLineOffer; import org.openbravo.model.common.order.OrderTax; import org.openbravo.model.common.order.OrderlineServiceRelation; -import org.openbravo.model.common.plm.AttributeSet; import org.openbravo.model.common.plm.AttributeSetInstance; -import org.openbravo.model.common.plm.Product; import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction; import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; import org.openbravo.model.financialmgmt.payment.FIN_OrigPaymentScheduleDetail; @@ -101,6 +99,7 @@ import org.openbravo.model.materialmgmt.transaction.MaterialTransaction; import org.openbravo.model.materialmgmt.transaction.ShipmentInOut; import org.openbravo.model.materialmgmt.transaction.ShipmentInOutLine; +import org.openbravo.retail.posterminal.utility.AttributesUtils; import org.openbravo.service.db.CallStoredProcedure; import org.openbravo.service.db.DalConnectionProvider; import org.openbravo.service.importprocess.ImportEntryManager; @@ -1238,9 +1237,11 @@ line.setMovementQuantity(qty); line.setStorageBin(bin); - if (jsonOrderLine.has("attributeValue") && jsonOrderLine.get("attributeValue") != null) { - line.setAttributeSetValue(fetchAttributeSetValue(jsonOrderLine.get("attributeValue") - .toString(), jsonOrderLine.getJSONObject("product").get("id").toString())); + if (OBMOBCUtils.isJsonObjectPropertyStringPresentNotNullAndNotEmptyString(jsonOrderLine, + "attributeValue")) { + line.setAttributeSetValue(AttributesUtils.fetchAttributeSetValue( + jsonOrderLine.get("attributeValue").toString(), jsonOrderLine.getJSONObject("product") + .get("id").toString())); } else { line.setAttributeSetValue(attributeSetInstance); } @@ -1323,9 +1324,11 @@ // shipment is created or is a C&R and is not a layaway, so all is delivered orderline.setDeliveredQuantity(orderline.getOrderedQuantity()); } - if (jsonOrderLine.has("attributeValue") && jsonOrderLine.get("attributeValue") != null) { - orderline.setAttributeSetValue(fetchAttributeSetValue(jsonOrderLine.get("attributeValue") - .toString(), jsonOrderLine.getJSONObject("product").get("id").toString())); + if (OBMOBCUtils.isJsonObjectPropertyStringPresentNotNullAndNotEmptyString(jsonOrderLine, + "attributeValue")) { + orderline.setAttributeSetValue(AttributesUtils.fetchAttributeSetValue( + jsonOrderLine.get("attributeValue").toString(), jsonOrderLine.getJSONObject("product") + .get("id").toString())); } lineReferences.add(orderline); @@ -1408,43 +1411,6 @@ } } - private AttributeSetInstance fetchAttributeSetValue(String attributeValue, String productId) { - AttributeSetInstance attrSetInst = null; - Product product = OBDal.getInstance().get(Product.class, productId); - try { - if (StringUtils.isNotEmpty(attributeValue) || StringUtils.isNotBlank(attributeValue)) { - OBCriteria attrSICrit = OBDal.getInstance().createCriteria( - AttributeSetInstance.class); - attrSICrit.add(Restrictions.eq(AttributeSetInstance.PROPERTY_DESCRIPTION, attributeValue)); - List attrSIList = attrSICrit.list(); - if (attrSIList.isEmpty() && attrSIList.size() == 0) { - attrSetInst = createAttributeSetValue(attributeValue, product.getAttributeSet()); - return attrSetInst; - } else { - attrSetInst = attrSIList.get(0); - return attrSetInst; - } - } else { - return attrSetInst; - } - } catch (Exception e) { - throw new OBException(e.getMessage(), e); - } - } - - private AttributeSetInstance createAttributeSetValue(String string, AttributeSet attributeSet) { - AttributeSetInstance newAttrSetInst = OBProvider.getInstance().get(AttributeSetInstance.class); - try { - newAttrSetInst.setAttributeSet(attributeSet); - newAttrSetInst.setDescription(string); - OBDal.getInstance().save(newAttrSetInst); - OBDal.getInstance().flush(); - } catch (Exception e) { - throw new OBException(e.getMessage(), e); - } - return newAttrSetInst; - } - protected void createLinesForServiceProduct() throws JSONException { Iterator> orderLineIterator = orderLineServiceList.entrySet() .iterator(); diff -r 6923a1414373 src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java --- a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java Mon Oct 09 15:40:28 2017 +0200 +++ b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java Fri Oct 13 11:21:00 2017 +0200 @@ -13,6 +13,7 @@ import java.util.List; import org.openbravo.client.kernel.ComponentProvider.Qualifier; +import org.openbravo.dal.core.OBContext; import org.openbravo.mobile.core.model.HQLProperty; import org.openbravo.mobile.core.model.ModelExtension; @@ -30,7 +31,7 @@ public List getHQLProperties(Object params) { ArrayList list = new ArrayList() { private static final long serialVersionUID = 1L; - + private final String currentLanguage = OBContext.getOBContext().getLanguage().getId(); { add(new HQLProperty("ordLine.product.id", "id")); add(new HQLProperty("ordLine.product.name", "name")); @@ -61,7 +62,9 @@ add(new HQLProperty("returnReason.name", "returnReasonName")); add(new HQLProperty("ordLine.goodsShipmentLine.id", "goodsShipmentLine")); add(new HQLProperty( - "(select case when line.attributeSetValue is not null then line.attributeSetValue.description else null end FROM OrderLine line where line.id = ordLine.id)", + "(select case when line.attributeSetValue is not null then (m_getjsondescription(line.attributeSetValue.id, 'Y', '" + + currentLanguage + + "')) ELSE null end FROM OrderLine line where line.id = ordLine.id)", "attributeValue")); } }; diff -r 6923a1414373 src/org/openbravo/retail/posterminal/utility/AttributesUtils.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/retail/posterminal/utility/AttributesUtils.java Fri Oct 13 11:21:00 2017 +0200 @@ -0,0 +1,338 @@ +/* + ************************************************************************************ + * Copyright (C) 2017 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ +package org.openbravo.retail.posterminal.utility; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.hibernate.criterion.Restrictions; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.provider.OBProvider; +import org.openbravo.base.session.OBPropertiesProvider; +import org.openbravo.dal.service.OBCriteria; +import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; +import org.openbravo.model.common.plm.Attribute; +import org.openbravo.model.common.plm.AttributeInstance; +import org.openbravo.model.common.plm.AttributeSet; +import org.openbravo.model.common.plm.AttributeSetInstance; +import org.openbravo.model.common.plm.AttributeUse; +import org.openbravo.model.common.plm.AttributeValue; +import org.openbravo.model.common.plm.Product; + +public class AttributesUtils { + + private static final Logger log = Logger.getLogger(AttributesUtils.class); + + public static AttributeSetInstance fetchAttributeSetValue(String attributeValue, String productId) { + AttributeSetInstance attrSetInst = null; + String validatedAttributeSetInstanceDescription = ""; + Product product = OBDal.getInstance().get(Product.class, productId); + if (product.getAttributeSet() != null) { + try { + if (StringUtils.isNotEmpty(attributeValue) || StringUtils.isNotBlank(attributeValue)) { + validatedAttributeSetInstanceDescription = AttributesUtils + .generateValidAttSetInstanceDescription(attributeValue, product); + + OBCriteria attrSICrit = OBDal.getInstance().createCriteria( + AttributeSetInstance.class); + attrSICrit.add(Restrictions.eq(AttributeSetInstance.PROPERTY_DESCRIPTION, + validatedAttributeSetInstanceDescription)); + List attrSIList = attrSICrit.list(); + if (attrSIList.isEmpty() && attrSIList.size() == 0) { + attrSetInst = AttributesUtils.createAttributeSetValue( + validatedAttributeSetInstanceDescription, product); + return attrSetInst; + } else { + attrSetInst = attrSIList.get(0); + return attrSetInst; + } + } else { + return attrSetInst; + } + } catch (Exception e) { + throw new OBException(e.getMessage(), e); + } + } else { + log.warn("Warning: Trying to fetch an Attribute Set instance for a product which is not configured to use attributes. (" + + product.getIdentifier() + ")"); + return null; + } + } + + public static String generateValidAttSetInstanceDescription( + String receivedAttSetInstanceDescription, String productId) { + return generateValidAttSetInstanceDescription(receivedAttSetInstanceDescription, OBDal + .getInstance().get(Product.class, productId)); + } + + public static String generateValidAttSetInstanceDescription( + String receivedAttSetInstanceDescription, Product product) { + if (product.getAttributeSet() != null) { + return AttributesUtils.generateValidAttSetInstanceDescription( + receivedAttSetInstanceDescription, product, product.getAttributeSet()); + } else { + log.warn("generateValidAttSetInstanceDescription method has been called using a product (" + + product.getIdentifier() + ") without attributeSet."); + return ""; + } + } + + private static String generateValidAttSetInstanceDescription( + String receivedAttSetInstanceDescription, Product product, AttributeSet attSet) { + String result = ""; + log.debug("Att Description received: " + receivedAttSetInstanceDescription); + String[] receivedAttSetInstanceDescription_parts = receivedAttSetInstanceDescription.split("_"); + + int currentPart = 0; + int numberOfParts = receivedAttSetInstanceDescription_parts.length; + log.debug("Number of parts of Att Description: " + numberOfParts); + + List lstAttributes = getInstanciableAndMandatoryAttributesUsedByAttributeSetSortedBySeqNoAsc(attSet); + for (Attribute att : lstAttributes) { + if (currentPart >= numberOfParts) { + throw new OBException("Product -" + product.getIdentifier() + "- Uses an AttributeSet -" + + attSet.getIdentifier() + "- which requires at least " + (currentPart + 1) + + " values, but just " + numberOfParts + " was detected", true); + } + if (att.isList()) { + log.debug("Value for attribute (with restricted list of vaules) -" + att.getIdentifier() + + "- of attSet -" + attSet.getIdentifier() + "- used by Product -" + + product.getIdentifier() + "- is -" + + receivedAttSetInstanceDescription_parts[currentPart] + "-"); + String valueToValidate = receivedAttSetInstanceDescription_parts[currentPart]; + if (isValidValueForAttribute(att, valueToValidate)) { + result += receivedAttSetInstanceDescription_parts[currentPart] + "_"; + } else { + throw new OBException("Product -" + product.getIdentifier() + + "- Uses an Attribute marked as List. Value received (" + valueToValidate + + ") is not valid. ", true); + } + } else { + log.debug("Value for attribute (without valid list of vaules) -" + att.getIdentifier() + + "- of attSet -" + attSet.getIdentifier() + "- used by Product -" + + product.getIdentifier() + "- is -" + + receivedAttSetInstanceDescription_parts[currentPart] + "-"); + result += receivedAttSetInstanceDescription_parts[currentPart] + "_"; + } + log.debug("AttSetInstance description for product -" + product.getIdentifier() + + "- after an iteration of attUse is -" + result + "-"); + currentPart += 1; + } + + if (attSet.isLot()) { + if (currentPart >= numberOfParts) { + throw new OBException("Product -" + product.getIdentifier() + "- Uses an AttributeSet -" + + attSet.getIdentifier() + "- which requires at least " + (currentPart + 1) + + " values, but just " + numberOfParts + " was detected", true); + } + log.debug("Att Set (" + attSet.getIdentifier() + ") uses lot. lot value is -" + + receivedAttSetInstanceDescription_parts[currentPart] + "-"); + result += "L" + receivedAttSetInstanceDescription_parts[currentPart] + "_"; + currentPart += 1; + } + + if (attSet.isSerialNo()) { + if (currentPart >= numberOfParts) { + throw new OBException("Product -" + product.getIdentifier() + "- Uses an AttributeSet -" + + attSet.getIdentifier() + "- which requires at least " + (currentPart + 1) + + " values, but just " + numberOfParts + " was detected", true); + } + log.debug("Att Set (" + attSet.getIdentifier() + + ") uses serialNo. It must be the first part (" + + receivedAttSetInstanceDescription_parts[currentPart] + ")"); + result += "#" + receivedAttSetInstanceDescription_parts[currentPart] + "_"; + currentPart += 1; + } + + if (attSet.isExpirationDate()) { + if (currentPart >= numberOfParts) { + throw new OBException("Product -" + product.getIdentifier() + "- Uses an AttributeSet -" + + attSet.getIdentifier() + "- which requires at least " + (currentPart + 1) + + " values, but just " + numberOfParts + " was detected", true); + } + String receivedExpirationDateStrValue = receivedAttSetInstanceDescription_parts[currentPart]; + Date receivedExpirationDate; + + log.debug("Att Set (" + attSet.getIdentifier() + + ") uses expiration date. Value received for expDate is -" + + receivedExpirationDateStrValue + "-"); + + final String dateFormatForDescription = (String) OBPropertiesProvider.getInstance() + .getOpenbravoProperties().get("dateFormat.java"); + try { + receivedExpirationDate = new SimpleDateFormat(dateFormatForDescription) + .parse(receivedExpirationDateStrValue); + } catch (Exception e) { + throw new OBException( + "Product -" + + product.getIdentifier() + + "- Uses expirationdate Attribute. Value received is not valid. Format doesn't match. Expected format (" + + dateFormatForDescription + ") doesn't match with value (" + + receivedExpirationDateStrValue + ")", true); + } + final String validatedExpirationDateStrValue = new SimpleDateFormat(dateFormatForDescription) + .format(receivedExpirationDate); + log.debug("Expiration date value for product -" + product.getIdentifier() + "- is -" + + validatedExpirationDateStrValue + "-"); + result += validatedExpirationDateStrValue + "_"; + currentPart += 1; + } + + result = result.substring(0, result.length() - 1); + return result; + } + + private static AttributeSetInstance createAttributeSetValue( + String receivedAttSetInstanceDescriptionWithSymbols, Product product) { + if (product.getAttributeSet() != null) { + try { + String[] receivedAttSetInstanceDescriptionWithSymbols_parts = receivedAttSetInstanceDescriptionWithSymbols + .split("_"); + + int currentPart = 0; + int numberOfParts = receivedAttSetInstanceDescriptionWithSymbols_parts.length; + + // Create Att Set Instance + AttributeSetInstance newAttrSetInst = OBProvider.getInstance().get( + AttributeSetInstance.class); + newAttrSetInst.setAttributeSet(product.getAttributeSet()); + newAttrSetInst.setDescription(receivedAttSetInstanceDescriptionWithSymbols); + OBDal.getInstance().save(newAttrSetInst); + + // If attSet uses other attributes, Att instance must be created + List lstAttributes = getInstanciableAndMandatoryAttributesUsedByAttributeSetSortedBySeqNoAsc(product + .getAttributeSet()); + if (lstAttributes != null && lstAttributes.size() > 0) { + // We are using attributes -> Att Instance must be created for each attribute used + for (Attribute att : lstAttributes) { + String attValue = ""; + attValue = receivedAttSetInstanceDescriptionWithSymbols_parts[currentPart]; + final AttributeInstance attInstance = (AttributeInstance) OBProvider.getInstance().get( + AttributeInstance.ENTITY_NAME); + attInstance.setAttribute(att); + attInstance.setSearchKey(attValue); + attInstance.setAttributeSetValue(newAttrSetInst); + OBDal.getInstance().save(attInstance); + currentPart += 1; + } + } + + if (product.getAttributeSet().isLot()) { + if (currentPart >= numberOfParts) { + // manage error + // Should not happen because it has been already managed by + // generateValidAttSetInstanceDescription + } + String currentLotWithSymbol = receivedAttSetInstanceDescriptionWithSymbols_parts[currentPart]; + String currentLotWithOutSymbol = currentLotWithSymbol.substring(1); + newAttrSetInst.setLotName(currentLotWithOutSymbol); + currentPart += 1; + } + + if (product.getAttributeSet().isSerialNo()) { + if (currentPart >= numberOfParts) { + // manage error + // Should not happen because it has been already managed by + // generateValidAttSetInstanceDescription + } + String currentSerialNoWithSymbol = receivedAttSetInstanceDescriptionWithSymbols_parts[currentPart]; + String currentSerialNoWithOutSymbol = currentSerialNoWithSymbol.substring(1); + newAttrSetInst.setSerialNo(currentSerialNoWithOutSymbol); + currentPart += 1; + } + + if (product.getAttributeSet().isExpirationDate()) { + if (currentPart >= numberOfParts) { + // manage error + // Should not happen because it has been already managed by + // generateValidAttSetInstanceDescription + } + String receivedExpirationDateStrValue = receivedAttSetInstanceDescriptionWithSymbols_parts[currentPart]; + Date receivedExpirationDate; + + final String dateFormatForDescription = (String) OBPropertiesProvider.getInstance() + .getOpenbravoProperties().get("dateFormat.java"); + try { + receivedExpirationDate = new SimpleDateFormat(dateFormatForDescription) + .parse(receivedExpirationDateStrValue); + } catch (Exception e) { + throw new OBException( + "Product -" + + product.getIdentifier() + + "- Uses expirationdate Attribute. Value received is not valid. Format doesn't match. Expected format (" + + dateFormatForDescription + ") doesn't match with value (" + + receivedExpirationDateStrValue + ")", true); + } + + OBDal.getInstance().flush(); + newAttrSetInst.setExpirationDate(receivedExpirationDate); + currentPart += 1; + } + + return newAttrSetInst; + } catch (Exception e) { + throw new OBException(e.getMessage(), e); + } + } else { + log.warn("createAttributeSetValue method has been called using a product (" + + product.getIdentifier() + ") without attributeSet."); + return null; + } + } + + private static List getInstanciableAndMandatoryAttributesUsedByAttributeSetSortedBySeqNoAsc( + AttributeSet attributeSet) { + List lstAttributes = new ArrayList(); + try { + StringBuilder hqlQueryString = new StringBuilder(); + hqlQueryString.append("attributeSet.id = :attSetId "); + hqlQueryString.append("ORDER BY seqNo asc"); + OBQuery attUseQuery = OBDal.getInstance().createQuery(AttributeUse.class, + hqlQueryString.toString()); + attUseQuery.setNamedParameter("attSetId", attributeSet.getId()); + List lstAttUse = attUseQuery.list(); + for (AttributeUse attUse : lstAttUse) { + if (attUse.getAttribute().isInstanceAttribute() && attUse.getAttribute().isMandatory()) { + lstAttributes.add(attUse.getAttribute()); + } + } + } catch (Exception e) { + throw new OBException(e.getMessage(), e); + } + return lstAttributes; + } + + private static boolean isValidValueForAttribute(Attribute att, String value) { + if (!att.isList()) { + log.warn("isValidValueForAttribute function is being called for attribute not marked as list -" + + att.getIdentifier() + "-"); + return true; + } + StringBuilder hqlQueryString = new StringBuilder(); + hqlQueryString.append("attribute.id = :attId AND "); + hqlQueryString.append("name = :nameValue "); + OBQuery attValueQuery = OBDal.getInstance().createQuery(AttributeValue.class, + hqlQueryString.toString()); + attValueQuery.setNamedParameter("attId", att.getId()); + attValueQuery.setNamedParameter("nameValue", value); + List lstAttValues = attValueQuery.list(); + if (lstAttValues != null) { + if (lstAttValues.size() > 0) { + return true; + } + } + return false; + } + +} \ No newline at end of file diff -r 6923a1414373 web/org.openbravo.retail.posterminal/js/components/renderorderline.js --- a/web/org.openbravo.retail.posterminal/js/components/renderorderline.js Mon Oct 09 15:40:28 2017 +0200 +++ b/web/org.openbravo.retail.posterminal/js/components/renderorderline.js Fri Oct 13 11:21:00 2017 +0200 @@ -108,7 +108,7 @@ this.createComponent({ style: 'display: block;', components: [{ - content: OB.I18N.getLabel('OBPOS_AttributeValue') + this.model.get('attributeValue'), + content: OB.I18N.getLabel('OBPOS_AttributeValue') + (this.model.get('attSetInstanceDesc') ? this.model.get('attSetInstanceDesc') : this.model.get('attributeValue')), attributes: { style: 'float: left; width: 100%; clear: left;' }