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 2013/11/05 23:14:19 UTC
svn commit: r1539161 - in /ofbiz/branches/release11.04: ./
applications/order/webapp/ordermgr/entry/optionsettings.ftl
Author: jleroux
Date: Tue Nov 5 22:14:18 2013
New Revision: 1539161
URL: http://svn.apache.org/r1539161
Log:
"Applied fix from trunk for revision: 1539156"
------------------------------------------------------------------------
r1539156 | jleroux | 2013-11-05 23:13:05 +0100 (mar. 05 nov. 2013) | 12 lignes
A patch from Christian Carlow for "Ship estimate does not appear on shipping options page of purchase order finalization screen" https://issues.apache.org/jira/browse/OFBIZ-OFBIZ-5388 - OFBIZ-5388
The ship estimate field of the shipping options page of the purchase order finalization screen is not populated with the itemShipGroupEstimate value.
To reproduce:
1. Create an purchase order to DemoSupplier for product
GZ-1000
2. Finalize the order and click continue until reaching the shipping options page
3. Set the Shipping Estimate Amount and click Continue
4. Click the "Options" link to navigate to the previous page and notice that the shipping estimate field is not set to the value submitted in the previous step
This patch sets the value of the shipping estimate field to the ship group estimate.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/optionsettings.ftl
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1539156
Modified: ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1539161&r1=1539160&r2=1539161&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/optionsettings.ftl Tue Nov 5 22:14:18 2013
@@ -116,7 +116,7 @@ under the License.
<tr>
<input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="STANDARD@_NA_" />
<td>
- <input type='text' name='${shipGroupIndex?default("0")}_ship_estimate'/>
+ <input type='text' name='${shipGroupIndex?default("0")}_ship_estimate' value="${cart.getItemShipGroupEstimate(shipGroupIndex?default('0'))?if_exists}"/>
</td>
</tr>
</#if>