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 2018/09/12 07:48:39 UTC
svn commit: r1840631 - in
/ofbiz/ofbiz-framework/trunk/applications/order/template:
entry/OrderAgreements.ftl entry/cart/ShowCart.ftl order/EditOrderItems.ftl
order/OrderItems.ftl
Author: jleroux
Date: Wed Sep 12 07:48:39 2018
New Revision: 1840631
URL: http://svn.apache.org/viewvc?rev=1840631&view=rev
Log:
Improved: 'Reserve After Date' should be available for sales orders only
(OFBIZ-10559)
Currently, the newly introduced in (OFBIZ-10534) 'Reserve After Date' field is
available for all types of orders, it should be available for sales orders only.
jleroux: I have also handled in when editing items
Thanks: Deepak Nigam
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl
ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl
ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl?rev=1840631&r1=1840630&r2=1840631&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl Wed Sep 12 07:48:39 2018
@@ -175,14 +175,16 @@ under the License.
</td>
</tr>
- <tr>
- <td class="label">
- <label>${uiLabelMap.OrderReserveAfterDateDefault}</label>
- </td>
- <td>
- <@htmlTemplate.renderDateTimeField name="reserveAfterDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="reserveAfterDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- </td>
- </tr>
+ <#if "SALES_ORDER" == cart.getOrderType()>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.OrderReserveAfterDateDefault}</label>
+ </td>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="reserveAfterDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="reserveAfterDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ </tr>
+ </#if>
<#if "PURCHASE_ORDER" == cart.getOrderType()>
<tr>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl?rev=1840631&r1=1840630&r2=1840631&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl Wed Sep 12 07:48:39 2018
@@ -135,14 +135,16 @@ under the License.
</div>
</td>
</tr>
- <tr>
- <td align="right"><div>${uiLabelMap.OrderReserveAfterDate} :</div></td>
- <td>
- <div>
- <@htmlTemplate.renderDateTimeField name="reserveAfterDate" value="${shoppingCart.getDefaultReserveAfterDate()!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item4" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- </div>
- </td>
- </tr>
+ <#if "SALES_ORDER" == shoppingCart.getOrderType()>
+ <tr>
+ <td align="right"><div>${uiLabelMap.OrderReserveAfterDate} :</div></td>
+ <td>
+ <div>
+ <@htmlTemplate.renderDateTimeField name="reserveAfterDate" value="${shoppingCart.getDefaultReserveAfterDate()!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item4" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </div>
+ </td>
+ </tr>
+ </#if>
<#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
<tr>
<td align="right"><div>${uiLabelMap.OrderOrderItemType} :</div></td>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl?rev=1840631&r1=1840630&r2=1840631&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl Wed Sep 12 07:48:39 2018
@@ -116,16 +116,18 @@ under the License.
<#-- now show status details per line item -->
<#assign currentItemStatus = orderItem.getRelatedOne("StatusItem", false)>
<td>
- <table>
- <tr>
- <td class="label">
- <span class="label">${uiLabelMap.OrderReserveAfterDate}</span>
- </td>
- <td>
- <@htmlTemplate.renderDateTimeField name="iradm_${orderItem.orderItemSeqId!}" event="" action="" value="${orderItem.reserveAfterDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="reserveAfterDate_${orderItem.orderItemSeqId!}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- </td>
- </tr>
- </table>
+ <#if "SALES_ORDER" == orderHeader.orderTypeId>
+ <table>
+ <tr>
+ <td class="label">
+ <span class="label">${uiLabelMap.OrderReserveAfterDate}</span>
+ </td>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="iradm_${orderItem.orderItemSeqId!}" event="" action="" value="${orderItem.reserveAfterDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="reserveAfterDate_${orderItem.orderItemSeqId!}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ </tr>
+ </table>
+ </#if>
${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br />
<#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
<#list orderItemStatuses as orderItemStatus>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl?rev=1840631&r1=1840630&r2=1840631&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl Wed Sep 12 07:48:39 2018
@@ -182,16 +182,18 @@ under the License.
<#-- now show status details per line item -->
<#assign currentItemStatus = orderItem.getRelatedOne("StatusItem", false)>
<td colspan="1" valign="top">
- <table>
- <tr>
- <td class="label">
- <span class="label">${uiLabelMap.OrderReserveAfterDate}</span>
- </td>
- <td>
- ${orderItem.reserveAfterDate!}
- </td>
- </tr>
- </table>
+ <#if "SALES_ORDER" == orderHeader.orderTypeId!>
+ <table>
+ <tr>
+ <td class="label">
+ <span class="label">${uiLabelMap.OrderReserveAfterDate}</span>
+ </td>
+ <td>
+ ${orderItem.reserveAfterDate!}
+ </td>
+ </tr>
+ </table>
+ </#if>
<div class="screenlet order-item-status-list<#if currentItemStatus.statusCode?has_content> ${currentItemStatus.statusCode}</#if>">
<div class="screenlet-body">