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/12/21 14:52:20 UTC
svn commit: r1552902 - in /ofbiz/branches/release13.07: ./
applications/order/webapp/ordermgr/entry/optionsettings.ftl
Author: jleroux
Date: Sat Dec 21 13:52:19 2013
New Revision: 1552902
URL: http://svn.apache.org/r1552902
Log:
"Applied fix from trunk for revision: 1552901 "
------------------------------------------------------------------------
r1552901 | jleroux | 2013-12-21 14:50:08 +0100 (sam. 21 déc. 2013) | 15 lignes
>From a wrong Christian Carlow's patch for "ShipBeforeDate/ShipAfterDate of additional ship groups displayed incorrectly on shipping options page of Customer Order Entry app" https://issues.apache.org/jira/browse/OFBIZ-5381
ShipBeforeDate/ShipAfterDate of ship groups are displayed incorrectly on the shipping options page of the Customer Order Entry app. The dates is set correctly but the shipping options page does not get the shipping date by shipGroupIndex. Instead it gets the shipBeforeDate/shipAfterDate of the order item. The page should be changed to get the dates by passing in the shipGroupIndex: cart.getShipAfterDate(shipGroupIndex)
To reproduce
1. Create new order for DemoCustCompany
2. Add productId "GZ-BASKET" with quantity 10
3. Click "Finalize Order" link
4. Click "Create New Ship Group" button on Shipping page and then click "Continue" link
5. Assign 5 of GZ-BASKET to Ship Group 2 and click "Continue" link
6. Select shipping methods and set shipBeforeDate/shipAfterDate and click "Continue" link
7. Click the "Options" link to return to previous ship options page
8. Notice the dates of the second ship group are incorrectly set to the same values as the date of the first ship group
jleroux: Christian's patch was reversed, with his comment I eventually got the idea
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/optionsettings.ftl
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1552901
Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1552902&r1=1552901&r2=1552902&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sat Dec 21 13:52:19 2013
@@ -149,7 +149,7 @@ under the License.
<tr>
<td colspan="2">
<div>
- <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" event="" action="" value="${(cart.getShipBeforeDate())?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" event="" action="" value="${(cart.getShipBeforeDate(shipGroupIndex))?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
@@ -161,7 +161,7 @@ under the License.
<tr>
<td colspan="2">
<div>
- <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" event="" action="" value="${(cart.getShipAfterDate())?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" event="" action="" value="${(cart.getShipAfterDate(shipGroupIndex))?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>