You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/09/09 14:36:01 UTC
svn commit: r1167135 - in /ofbiz/branches/release10.04: ./
applications/order/script/org/ofbiz/order/order/OrderServices.xml
applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Author: jleroux
Date: Fri Sep 9 12:36:01 2011
New Revision: 1167135
URL: http://svn.apache.org/viewvc?rev=1167135&view=rev
Log:
"Applied fix from trunk for revision: 1167116 "
------------------------------------------------------------------------
r1167116 | jleroux | 2011-09-09 13:50:01 +0200 (ven., 09 sept. 2011) | 3 lines
A patch from Paul Foxworthy "roleTypeId not copied from ProductStoreShipmentMethod to OrderItemShipGroup" https://issues.apache.org/jira/browse/OFBIZ-4389
In ordershippinginfo.ftl, a list of shipping methods is presented, and when one is chosen values are written into an OrderItemShipGroup. The shipping methods are defined by rows in ProductStoreShipMethod, and one of the attributes of this entity is a carrierRoleTypeId. Similarly, OrderItemShipGroup has a carrierRoleTypeId, but no data is being written into it.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 12:36:01 2011
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1053722,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,107520
5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094007,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504,1140358,1140362,1140375,1140469,1144537,1144791,1153768,1158126,1159080,1163036,1163093,1165130,1166591
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1053722,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,107520
5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094007,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504,1140358,1140362,1140375,1140469,1144537,1144791,1153768,1158126,1159080,1163036,1163093,1165130,1166591,1167116
Modified: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1167135&r1=1167134&r2=1167135&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml Fri Sep 9 12:36:01 2011
@@ -743,13 +743,15 @@ under the License.
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="OrderItemShipGroup" map="lookupPKMap" value-field="lookedUpValue"/>
<!-- splitting shipmentMethod request parameter value that contains "@" symbol
- into "shipmentMethodTypeId" and "carrierPartyId".
+ into "shipmentMethodTypeId", "carrierPartyId" and "carrierRoleTypeId".
-->
<call-bsh><![CDATA[
shipmentMethod = parameters.get("shipmentMethod");
if(shipmentMethod != null){
- parameters.put("shipmentMethodTypeId", shipmentMethod.substring(0, shipmentMethod.indexOf("@")));
- parameters.put("carrierPartyId", shipmentMethod.substring(shipmentMethod.indexOf("@")+1));
+ arr = shipmentMethod.split( "@" );
+ parameters.put("shipmentMethodTypeId", arr[0]);
+ parameters.put("carrierPartyId", arr[1]);
+ parameters.put("carrierRoleTypeId", arr[2]);
}
]]></call-bsh>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1167135&r1=1167134&r2=1167135&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Sep 9 12:36:01 2011
@@ -243,14 +243,14 @@ under the License.
<#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content>
<div>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
- <#-- passing the shipmentMethod value as the combination of two fields value
- i.e shipmentMethodTypeId & carrierPartyId and this two field values are separated bye
+ <#-- passing the shipmentMethod value as the combination of three fields value
+ i.e shipmentMethodTypeId & carrierPartyId & roleTypeId. Values are separated by
"@" symbol.
-->
<select name="shipmentMethod">
- <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId?if_exists}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId?if_exists}</#if> ${shipmentMethodType.get("description",locale)?default("")}</option>
+ <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
<#list productStoreShipmentMethList as productStoreShipmentMethod>
- <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId>
+ <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId>
<#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content>
<option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option>
</#if>