You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2018/02/24 07:55:23 UTC
svn commit: r1825194 - in /ofbiz/branches/release16.11: ./
applications/datamodel/entitydef/
applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/
specialpurpose/webpos/data/ specialpurpose/webpos/entitydef/
Author: arunpatidar
Date: Sat Feb 24 07:55:23 2018
New Revision: 1825194
URL: http://svn.apache.org/viewvc?rev=1825194&view=rev
Log:
Applied fix from trunk for revision: 1825192
===
Fixed: Survey response data lost on loadCartFromOrder service. (OFBIZ-10232)
Thanks Suraj Khurana for your contribution.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml
ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 24 07:55:23 2018
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,
1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,
1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml?rev=1825194&r1=1825193&r2=1825194&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml Sat Feb 24 07:55:23 2018
@@ -3056,7 +3056,7 @@ under the License.
</view-link>
</view-entity>
- <view-entity entity-name="PartyClassificationGroupAndType" package-name="org.ofbiz.party.party" title="PartyClassificationGroup and PartyClassificationTypeView">
+ <view-entity entity-name="PartyClassificationGroupAndType" package-name="org.apache.ofbiz.party.party" title="PartyClassificationGroup and PartyClassificationTypeView">
<member-entity entity-alias="PCG" entity-name="PartyClassificationGroup"/>
<member-entity entity-alias="PCT" entity-name="PartyClassificationType"/>
<alias-all entity-alias="PCG"/>
Modified: ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1825194&r1=1825193&r2=1825194&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java Sat Feb 24 07:55:23 2018
@@ -54,6 +54,8 @@ import org.apache.ofbiz.entity.Delegator
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericPK;
import org.apache.ofbiz.entity.GenericValue;
+import org.apache.ofbiz.entity.condition.EntityCondition;
+import org.apache.ofbiz.entity.condition.EntityOperator;
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntityUtil;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
@@ -3866,27 +3868,18 @@ public class ShoppingCart implements Ite
List<GenericValue> allInfos = new LinkedList<GenericValue>();
for (ShoppingCartItem item : this) {
List<String> responses = UtilGenerics.checkList(item.getAttribute("surveyResponses"));
- GenericValue response = null;
if (responses != null) {
- for (String responseId : responses) {
- try {
- response = this.getDelegator().findOne("SurveyResponse", UtilMisc.toMap("surveyResponseId", responseId), false);
- } catch (GenericEntityException e) {
- Debug.logError(e, "Unable to obtain SurveyResponse record for ID : " + responseId, module);
+ try {
+ List<GenericValue> surveyResponses = EntityQuery.use(getDelegator()).from("SurveyResponse").where(EntityCondition.makeCondition("surveyResponseId", EntityOperator.IN, responses)).queryList();
+ if (surveyResponses != null) {
+ for (GenericValue surveyResponse : surveyResponses) {
+ surveyResponse.set("orderItemSeqId", item.getOrderItemSeqId());
+ allInfos.add(surveyResponse);
+ }
}
+ } catch (GenericEntityException e) {
+ Debug.logError(e, "Unable to obtain SurveyResponse record", module);
}
- // this case is executed when user selects "Create as new Order" for Gift cards
- } else {
- String surveyResponseId = (String) item.getAttribute("surveyResponseId");
- try {
- response = this.getDelegator().findOne("SurveyResponse", UtilMisc.toMap("surveyResponseId", surveyResponseId), false);
- } catch (GenericEntityException e) {
- Debug.logError(e, "Unable to obtain SurveyResponse record for ID : " + surveyResponseId, module);
- }
- }
- if (response != null) {
- response.set("orderItemSeqId", item.getOrderItemSeqId());
- allInfos.add(response);
}
}
return allInfos;
Modified: ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1825194&r1=1825193&r2=1825194&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java Sat Feb 24 07:55:23 2018
@@ -501,7 +501,7 @@ public class ShoppingCartServices {
}
// attach surveyResponseId for each item
if (UtilValidate.isNotEmpty(surveyResponseResult)){
- cartItem.setAttribute("surveyResponseId",surveyResponseResult.get("surveyResponseId"));
+ cartItem.setAttribute("surveyResponses", UtilMisc.toList(surveyResponseResult.get("surveyResponseId")));
}
// attach addition item information
cartItem.setStatusId(item.getString("statusId"));
Modified: ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml?rev=1825194&r1=1825193&r2=1825194&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml Sat Feb 24 07:55:23 2018
@@ -24,54 +24,54 @@ under the License.
<!-- MCS->PSS Central Server to Per Store Server -->
<EntityGroup entityGroupId="5500" entityGroupName="POS: Central Server to Per Store Server"/>
<!-- these are used to update sync settings on the POS terminals from the central server -->
- <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
<!-- this is the general product information needed for pricing, promotions, basic product info, etc; the per store server will also include inventory, etc information -->
- <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.product" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.product" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
<EntityGroupEntry entityGroupId="5500" entityOrPackage="PosTerminal" applEnumId="ESIA_INCLUDE"/>
<!-- PSS->POS Per Store Server to POS Terminal -->
<EntityGroup entityGroupId="5501" entityGroupName="POS: Per Store Server to POS Terminal"/>
<!-- these are used to update sync settings on the POS terminals from the central server -->
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
<!-- this is the general product information needed for pricing, promotions, basic product info, etc -->
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.product" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.price" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.promo" applEnumId="ESIA_INCLUDE"/>
- <!-- org.ofbiz.product.category is needed for certain promotions, probably won't be used much for category browsing in the POS -->
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.category" applEnumId="ESIA_INCLUDE"/>
- <!-- org.ofbiz.party.party may be needed for certain promotions -->
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.specialpurpose.pos.PosTerminal" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.product" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.price" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.promo" applEnumId="ESIA_INCLUDE"/>
+ <!-- org.apache.ofbiz.product.category is needed for certain promotions, probably won't be used much for category browsing in the POS -->
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.category" applEnumId="ESIA_INCLUDE"/>
+ <!-- org.apache.ofbiz.party.party may be needed for certain promotions -->
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.specialpurpose.pos.PosTerminal" applEnumId="ESIA_INCLUDE"/>
<!-- POS->PSS POS Terminal to Per Store Server -->
<EntityGroup entityGroupId="5505" entityGroupName="POS: POS Terminal to Per Store Server"/>
- <!-- org.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+ <!-- org.apache.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
<!-- all order and related information, including payment, etc info -->
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
<!-- NOTE: no inventory information will be on the POS terminal, so don't send any over -->
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
<!-- PSS->MCS Per Store Server to Central Server -->
<EntityGroup entityGroupId="5506" entityGroupName="POS: Per Store Server to Central Server"/>
- <!-- org.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+ <!-- org.apache.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
<!-- all order and related information, including payment, etc info -->
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
<!-- include inventory and issuance info -->
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.shipment.issuance" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.product.inventory" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.shipment.issuance" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.product.inventory" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
<!-- Some examples of EntitySync settings for pulling and pushing data around -->
Modified: ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml?rev=1825194&r1=1825193&r2=1825194&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml Sat Feb 24 07:55:23 2018
@@ -30,15 +30,15 @@ under the License.
<!-- ========================================================= -->
<!-- ======================== Data Model ===================== -->
<!-- The modules in this file are as follows: -->
- <!-- - org.ofbiz.specialpurpose.pos -->
+ <!-- - org.apache.ofbiz.specialpurpose.pos -->
<!-- ========================================================= -->
<!-- ========================================================= -->
- <!-- org.ofbiz.specialpurpose.pos -->
+ <!-- org.apache.ofbiz.specialpurpose.pos -->
<!-- ========================================================= -->
<entity entity-name="PosTerminal"
- package-name="org.ofbiz.specialpurpose.pos"
+ package-name="org.apache.ofbiz.specialpurpose.pos"
title="Pos Terminal">
<field name="posTerminalId" type="id-ne"></field>
<field name="facilityId" type="id"></field>
@@ -47,7 +47,7 @@ under the License.
<prim-key field="posTerminalId"/>
</entity>
<entity entity-name="PosTerminalLog"
- package-name="org.ofbiz.specialpurpose.pos"
+ package-name="org.apache.ofbiz.specialpurpose.pos"
title="Pos Terminal Log">
<field name="posTerminalLogId" type="id-ne"></field>
<field name="posTerminalId" type="id-ne"></field>
@@ -74,7 +74,7 @@ under the License.
</relation>
</entity>
<entity entity-name="PosTerminalState"
- package-name="org.ofbiz.specialpurpose.pos"
+ package-name="org.apache.ofbiz.specialpurpose.pos"
title="Pos Terminal State">
<field name="posTerminalId" type="id-ne"></field>
<field name="openedDate" type="date-time"></field>
@@ -96,7 +96,7 @@ under the License.
</relation>
</entity>
<entity entity-name="PosTerminalInternTx"
- package-name="org.ofbiz.specialpurpose.pos"
+ package-name="org.apache.ofbiz.specialpurpose.pos"
title="Pos Terminal Internal Transaction">
<field name="posTerminalLogId" type="id-ne"></field>
<field name="paidAmount" type="currency-amount"></field>