You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/12/20 11:15:54 UTC
svn commit: r1818774 - in /ofbiz/ofbiz-plugins/trunk/ecommerce:
template/request/ widget/
Author: deepak
Date: Wed Dec 20 11:15:54 2017
New Revision: 1818774
URL: http://svn.apache.org/viewvc?rev=1818774&view=rev
Log:
Improved: Update markup of List Requests page according to standard markup given by Bootstrap v4.0.s (OFBIZ-10092)
Thanks Nitish Mishra for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl (with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl (with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl (with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl?rev=1818774&view=auto
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl Wed Dec 20 11:15:54 2017
@@ -0,0 +1,78 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if fulfillContactMech?has_content>
+
+<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyAddressMailingShipping>
+ <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)!>
+<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyToEmailAddress>
+ <#assign emailAddress = fulfillContactMech.infoString!>
+<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyPhoneNumber>
+ <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)!>
+</#if>
+
+<div class="card">
+ <div class="card-header">
+ <strong>${uiLabelMap.PartyContactInformation}</strong>
+ </div>
+ <div class="screenlet-body">
+ <table class="table">
+ <tr>
+ <td>
+ ${label?default(uiLabelMap.PartyUnknown)}
+ </td>
+ <td valign="top" width="70%">
+ <div>
+ <#if emailAddress?has_content>${emailAddress}</#if>
+
+ <#if postalAddress?has_content>
+ <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1!}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
+ ${postalAddress.city!},
+ <#if postalAddress.stateProvinceGeoId?has_content>
+ <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
+ ${stateProvince.abbreviation?default(stateProvince.geoId)}
+ </#if>
+ ${postalAddress.postalCode!}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
+ ${country.geoName?default(country.geoId)}
+ </#if>
+ </#if>
+
+ <#if telecomNumber?has_content>
+ ${telecomNumber.countryCode!}
+ <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
+ <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+ <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
+ <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+ </#if>
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+</#if>
\ No newline at end of file
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl?rev=1818774&view=auto
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl Wed Dec 20 11:15:54 2017
@@ -0,0 +1,45 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="card">
+ <div class="card-header">
+ <strong>${uiLabelMap.CommonDate}</strong>
+ </div>
+ <div class="card-body">
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.OrderRequestDate} :</strong>
+ ${(custRequest.custRequestDate.toString())?default("N/A")}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.OrderRequestCreatedDate} :</strong>
+ ${(custRequest.createdDate.toString())?default("N/A")}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.OrderRequestLastModifiedDate} :</strong>
+ ${(custRequest.lastModifiedDate.toString())?default("N/A")}
+ </div>
+ </div>
+ </div>
+</div>
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl?rev=1818774&r1=1818773&r2=1818774&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl Wed Dec 20 11:15:54 2017
@@ -16,110 +16,65 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}</div>
+<div class="card">
+ <div class="card-header">
+ <strong>${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}</strong>
</div>
- <div class="screenlet-body">
- <table cellspacing="0" class="basic-table">
- <#-- request header information -->
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonType}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId!)}
- </td>
- </tr>
- <tr><td colspan="7"><hr /></td></tr>
- <#-- request status information -->
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonStatus}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${(statusItem.get("description", locale))?default(custRequest.statusId!)}
- </td>
- </tr>
- <#-- party -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.PartyPartyId}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${custRequest.fromPartyId!}
- </td>
- </tr>
- <#-- request name -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonName}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${custRequest.custRequestName!}
- </td>
- </tr>
- <#-- request description -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonDescription}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${custRequest.description!}
- </td>
- </tr>
- <#-- request currency -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonCurrency}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- <#if currency??>${currency.get("description", locale)?default(custRequest.maximumAmountUomId!)}</#if>
- </td>
- </tr>
- <#-- request currency -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.ProductProductStore}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- <#if store??>${store.storeName?default(custRequest.productStoreId!)}</#if>
- </td>
- </tr>
- <#-- request comment -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonInternalComment}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${custRequest.internalComment!}
- </td>
- </tr>
- <#-- request reason -->
- <tr><td colspan="7"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.CommonReason}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- ${custRequest.reason!}
- </td>
- </tr>
- </table>
+ <div class="card-body">
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonType} :</strong>
+ ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId!)}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonStatus} :</strong>
+ ${(statusItem.get("description", locale))?default(custRequest.statusId!)}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.PartyPartyId} :</strong>
+ ${custRequest.fromPartyId?default("N/A")}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonName} :</strong>
+ ${custRequest.custRequestName?default("N/A")}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonDescription} :</strong>
+ ${custRequest.description?default("N/A")}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonCurrency} :</strong>
+ <#if currency??>${currency.get("description", locale)?default(custRequest.maximumAmountUomId!)}</#if>
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonInternalComment} :</strong>
+ ${custRequest.internalComment?default("N/A")}
+ </div>
+ </div>
+ <hr/>
+ <div layout="row">
+ <div class="col-12">
+ <strong>${uiLabelMap.CommonReason} :</strong>
+ ${custRequest.reason?default("N/A")}
+ </div>
+ </div>
</div>
</div>
\ No newline at end of file
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl?rev=1818774&r1=1818773&r2=1818774&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl Wed Dec 20 11:15:54 2017
@@ -17,78 +17,76 @@ specific language governing permissions
under the License.
-->
-<div class="screenlet">
- <h3>${uiLabelMap.EcommerceRequestHistory}</h3>
- <div class="screenlet-body">
- <table>
+<div class="card m-3">
+ <div class="card-header">
+ <strong>${uiLabelMap.EcommerceRequestHistory}</strong>
+ </div>
+ <div class="card-body">
+ <table class="table">
+ <thead>
<tr>
- <td width="10%">
- <div><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></div>
- </td>
- <td width="10"> </td>
- <td width="10%">
- <div><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></div>
- </td>
- <td width="10"> </td>
- <td width="20%">
- <div>${uiLabelMap.CommonName}</div>
- </td>
- <td width="10"> </td>
- <td width="40%">
- <div>${uiLabelMap.CommonDescription}</div>
- </td>
- <td width="10"> </td>
- <td width="10%">
- <div>${uiLabelMap.CommonStatus}</div>
- </td>
- <td width="10"> </td>
- <td width="20%">
- <div>${uiLabelMap.OrderRequestDate}</div>
- <div>${uiLabelMap.OrderRequestCreatedDate}</div>
- <div>${uiLabelMap.OrderRequestLastModifiedDate}</div>
- </td>
- <td width="10"> </td>
- <td width="10"> </td>
+ <th>
+ ${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}
+ </th>
+ <th>
+ ${uiLabelMap.CommonType}
+ </th>
+ <th>
+ ${uiLabelMap.CommonName}
+ </th>
+ <th>
+ ${uiLabelMap.CommonDescription}
+ </th>
+ <th>
+ ${uiLabelMap.CommonStatus}
+ </th>
+ <th>
+ ${uiLabelMap.OrderRequestDate}
+ </th>
+ <th>
+ ${uiLabelMap.OrderRequestCreatedDate}
+ </th>
+ <th>
+ ${uiLabelMap.OrderRequestLastModifiedDate}
+ </th>
+ <th colspan="2"></th>
</tr>
+ </thead>
<#list requestList as custRequest>
<#assign status = custRequest.getRelatedOne("StatusItem", true)>
<#assign type = custRequest.getRelatedOne("CustRequestType", true)>
-
- <tr>
- <td>
- <div>${custRequest.custRequestId}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div>${type.get("description",locale)!}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div>${custRequest.custRequestName!}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div>${custRequest.description!}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div>${status.get("description",locale)}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div><span style="white-space: nowrap;">${custRequest.custRequestDate!}</span></div>
- <div><span style="white-space: nowrap;">${custRequest.createdDate!}</span></div>
- <div><span style="white-space: nowrap;">${custRequest.lastModifiedDate!}</span></div>
- </td>
- <td width="10"> </td>
- <td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
- </td>
- <td width="10"> </td>
- </tr>
+ <tbody>
+ <tr>
+ <td>
+ ${custRequest.custRequestId?default("N/A")}
+ </td>
+ <td>
+ ${type.get("description",locale)?default("N/A")}
+ </td>
+ <td>
+ ${custRequest.custRequestName?default("N/A")}
+ </td>
+ <td>
+ ${custRequest.description?default("N/A")}
+ </td>
+ <td>
+ ${status.get("description",locale)?default("N/A")}
+ </td>
+ <td>
+ ${custRequest.custRequestDate?default("N/A")}
+ </td>
+ <td>${custRequest.createdDate?default("N/A")}</td>
+ <td>${custRequest.lastModifiedDate?default("N/A")}</td>
+ <td colspan="2">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
+ </td>
+ </tr>
+ </tbody>
</#list>
<#if !requestList?has_content>
- <tr><td colspan="9"><h3>${uiLabelMap.OrderNoRequestFound}</h3></td></tr>
+ <div class="alert alert-light" role="alert">
+ ${uiLabelMap.OrderNoRequestFound}
+ </div>
</#if>
</table>
</div>
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl?rev=1818774&r1=1818773&r2=1818774&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl Wed Dec 20 11:15:54 2017
@@ -16,22 +16,23 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.OrderRequestRoles}</div>
+<#if requestParties?has_content>
+
+<div class="card">
+ <div class="card-header">
+ <strong>${uiLabelMap.OrderRequestRoles}</strong>
</div>
- <div class="screenlet-body">
+ <div class="card-body">
<table cellspacing="0" class="basic-table">
<#assign row = 1>
<#list requestParties as requestParty>
<#assign roleType = requestParty.getRelatedOne("RoleType", false)>
<#assign party = requestParty.getRelatedOne("Party", false)>
<tr>
- <td align="right" valign="top" width="15%" class="label">
- ${roleType.get("description", locale)!}
+ <td>
+ ${roleType.get("description", locale)!}
</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td>
${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(party)}
</td>
</tr>
@@ -42,4 +43,5 @@ under the License.
</#list>
</table>
</div>
-</div>
\ No newline at end of file
+</div>
+</#if>
\ No newline at end of file
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl?rev=1818774&view=auto
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl Wed Dec 20 11:15:54 2017
@@ -0,0 +1,68 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="card">
+ <div class="card-header">
+ <strong>${uiLabelMap.OrderRequestItems}</strong>
+ </div>
+ <div class="card-body">
+ <table class="table">
+ <thead>
+ <tr>
+ <th>${uiLabelMap.ProductItem}</th>
+ <th>${uiLabelMap.OrderProduct}</th>
+ <th>${uiLabelMap.ProductQuantity}</th>
+ <th>${uiLabelMap.OrderAmount}</th>
+ <th>${uiLabelMap.OrderRequestMaximumAmount}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <#assign alt_row = false>
+ <tbody>
+ <#list requestItems as requestItem>
+ <#if requestItem.productId??>
+ <#assign product = requestItem.getRelatedOne("Product", false)>
+ </#if>
+ <tr>
+ <td>
+ <#if showRequestManagementLinks??>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${requestItem.custRequestItemSeqId}</a>
+ <#else>
+ ${requestItem.custRequestItemSeqId}
+ </#if>
+ </td>
+ <td>
+ <div>
+ ${(product.internalName)!}
+ <#if showRequestManagementLinks??>
+ <a href="/catalog/control/EditProduct?productId=${requestItem.productId!}" class="buttontext">${requestItem.productId!}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${requestItem.productId!}</a>
+ </#if>
+ </div>
+ </td>
+ <td>${requestItem.quantity?default("N/A")}</td>
+ <td>${requestItem.selectedAmount?default("N/A")}</td>
+ <td><@ofbizCurrency amount=requestItem.maximumAmount isoCode=request.maximumAmountUomId/></td>
+ </tr>
+ </#list>
+ </tbody>
+ </table>
+ </div>
+</div>
\ No newline at end of file
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml?rev=1818774&r1=1818773&r2=1818774&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml Wed Dec 20 11:15:54 2017
@@ -91,15 +91,15 @@ under the License.
<html><html-template location="component://ecommerce/template/request/RequestInfo.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/request/ViewRequestItemInfo.ftl"/></html>
+ <html><html-template location="component://ecommerce/template/request/ViewRequestItemInfo.ftl"/></html>
</platform-specific>
</container>
<container style="righthalf">
<platform-specific>
- <html><html-template location="component://order/template/request/RequestDate.ftl"/></html>
+ <html><html-template location="component://ecommerce/template/request/RequestDate.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/request/RequestContactMech.ftl"/></html>
+ <html><html-template location="component://ecommerce/template/request/RequestContactMech.ftl"/></html>
</platform-specific>
<platform-specific>
<html><html-template location="component://ecommerce/template/request/RequestRoles.ftl"/></html>