svn commit: r1736868 [19/20] - in /ofbiz/trunk/applications/orde
Locked
svn commit: r1736868 [19/20] - in /ofbiz/trunk/applications/orde
 
|
Propchange: ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl (added) +++ ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,210 @@ +<#-- +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. +--> + +<#-- TODO: Convert hard-coded text to UI label properties --> + +<#if security.hasEntityPermission("PAYPROC", "_VIEW", session)> + <div class='button-bar button-style-1'> + <a href="<@ofbizUrl>paysetup</@ofbizUrl>" class='selected'>Payment Setup</a> + </div> +</#if> + +<#if security.hasEntityPermission("PAYPROC", "_VIEW", session)> +<table border="0" width='100%' cellpadding='0' cellspacing=0 class='boxoutside'> + <tr> + <td width='100%'> + <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxtop'> + <tr> + <td> + <div class='boxhead'> Payment Processor Setup</div> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td width='100%'> + <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxbottom'> + <tr> + <td> + <table width="100%" cellpadding="2" cellspacing="2" border="0"> + <tr class="header-row"> + <td nowrap="nowrap"><div>WebSite</div></td> + <td nowrap="nowrap"><div>PayMethod Type</div></td> + <td nowrap="nowrap"><div>Auth Service</div></td> + <td nowrap="nowrap"><div>Re-Auth Service</td> + <td nowrap="nowrap"><div>Capture Service</div></td> + <td nowrap="nowrap"><div>Refund Service</td> + <td nowrap="nowrap"><div>Payment Config</div></td> + <td nowrap="nowrap"><div> </div></td> + </tr> + <#if paymentSetups?has_content> + <#list paymentSetups as paymentSetting> + <#if rowStyle?? && rowStyle == "alternate-row"> + <#assign rowStyle = "alternate-rowSelected"> + <#else> + <#assign rowStyle = "alternate-row"> + </#if> + <tr class="${rowStyle}"> + <td><div>${paymentSetting.siteName!}</div></td> + <td><div>${paymentSetting.description!}</div></td> + <td><div>${paymentSetting.paymentAuthService!}</div></td> + <td><div>${paymentSetting.paymentReAuthService!}</div></td> + <td><div>${paymentSetting.paymentCaptureService!}</div></td> + <td><div>${paymentSetting.paymentRefundService!}</div></td> + <td><div>${paymentSetting.paymentConfiguration!}</div></td> + <td nowrap="nowrap"> + <div> + <#if security.hasEntityPermission("PAYPROC", "_UPDATE", session)> + <a href="<@ofbizUrl>paysetup?webSiteId=${paymentSetting.webSiteId!}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId!}</@ofbizUrl>" class="buttontext">Edit</a> + </#if> + <#if security.hasEntityPermission("PAYPROC", "_DELETE", session)> + <a href="<@ofbizUrl>removeWebSitePaymentSetting?webSiteId=${paymentSetting.webSiteId!}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId!}</@ofbizUrl>" class="buttontext">Remove</a> + </#if> + </div> + </td> + </tr> + </#list> + <#else> + <tr> + <td colspan="8"><div>No settings found.</div></td> + </tr> + </#if> + </table> + </td> + </tr> + </table> + </td> + </tr> +</table> + +<#if security.hasEntityPermission("PAYPROC", "_CREATE", session)> +<br /> +<table border="0" width='100%' cellpadding='0' cellspacing=0 class='boxoutside'> + <tr> + <td width='100%'> + <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxtop'> + <tr> + <td width='90%'> + <#if webSitePayment?has_content> + <div class='boxhead'> Update Setting</div> + <#else> + <div class='boxhead'> Add New Setting</div> + </#if> + </td> + <#if webSitePayment?has_content> + <td align='right' width='10%'><a href="<@ofbizUrl>paysetup</@ofbizUrl>" class="lightbuttontext">Add New</a></td> + <#else> + <td align='right' width='10%'></td> + </#if> + </tr> + </table> + </td> + </tr> + <tr> + <td width='100%'> + <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxbottom'> + <tr> + <td> + <#if webSitePayment?has_content> + <form method="post" action="<@ofbizUrl>updateWebSitePaymentSetting</@ofbizUrl>"> + <#else> + <form method="post" action="<@ofbizUrl>createWebSitePaymentSetting</@ofbizUrl>"> + </#if> + <table border='0' cellpadding='2' cellspacing='0'> + <tr> + <td width="26%" align="right"><div>WebSite</div></td> + <td> </td> + <td width="74%"> + <#if webSitePayment?has_content> + <input type='hidden' name='webSiteId' value='${webSitePayment.webSiteId}' /> + <div> + <b>${webSitePayment.siteName}</b> (This cannot be changed without re-creating the setting.) + </div> + <#else> + <select name="webSiteId"> + <#list webSites as nextWebSite> + <option value='${nextWebSite.webSiteId}'>${nextWebSite.siteName}</option> + </#list> + </select> + </#if> + </td> + </tr> + <tr> + <td width="26%" align="right"><div>Payment Method Type</div></td> + <td> </td> + <td width="74%"> + <#if webSitePayment?has_content> + <input type='hidden' name='paymentMethodTypeId' value='${webSitePayment.paymentMethodTypeId}' /> + <div> + <b>${webSitePayment.description}</b> (This cannot be changed without re-creating the setting.) + </div> + <#else> + <select name="paymentMethodTypeId"> + <#list paymentMethodTypes as nextPayType> + <option value='${nextPayType.paymentMethodTypeId}'>${nextPayType.description}</option> + </#list> + </select> + </#if> + </td> + </tr> + + <tr> + <td width="26%" align="right"><div>Processor Auth Service</div></td> + <td> </td> + <td width="74%"><input type="text" name="paymentAuthService" value="${payInfo.paymentAuthService!}" size="30" maxlength="60" /></td> + </tr> + <tr> + <td width="26%" align="right"><div>Processor Re-Auth Service</div></td> + <td> </td> + <td width="74%"><input type="text" name="paymentReAuthService" value="${payInfo.paymentReAuthService!}" size="30" maxlength="60" /></td> + </tr> + <tr> + <td width="26%" align="right"><div>Processor Capture Service</div></td> + <td> </td> + <td width="74%"><input type="text" name="paymentCaptureService" value="${payInfo.paymentCaptureService!}" size="30" maxlength="60" /></td> + </tr> + <tr> + <td width="26%" align="right"><div>Processor Refund Service</div></td> + <td> </td> + <td width="74%"><input type="text" name="paymentRefundService" value="${payInfo.paymentRefundService!}" size="30" maxlength="60" /></td> + </tr> + <tr> + <td width="26%" align="right"><div>Processor Properties URL</div></td> + <td> </td> + <td width="74%"><input type="text" name="paymentConfiguration" value="${payInfo.paymentConfiguration!}" size="30" maxlength="60" /></td> + </tr> + <tr> + <td colspan='2'> </td> + <td colspan='1'><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> + </tr> + </table> + </form> + </td> + </tr> + </table> + </td> + </tr> +</table> +</#if> + +<#else> + <br /> + <h3>You do not have permission to view this page. ("PAYSETUP_VIEW" or "PAYSETUP_ADMIN" needed)</h3> +</#if> Propchange: ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/task/ordertasklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/task/ordertasklist.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/task/ordertasklist.ftl (added) +++ ofbiz/trunk/applications/order/template/task/ordertasklist.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,291 @@ +<#-- +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. +--> + +<script language="JavaScript" type="text/javascript"> +<!-- // + function viewOrder(form) { + if (form.taskStatus.value == "WF_NOT_STARTED") { + if (form.delegate.checked) { + form.action = "<@ofbizUrl>acceptassignment</@ofbizUrl>"; + } else { + form.action = "<@ofbizUrl>orderview</@ofbizUrl>"; + } + } else { + if (form.delegate.checked) { + form.action = "<@ofbizUrl>delegateassignment</@ofbizUrl>"; + } else { + form.action = "<@ofbizUrl>orderview</@ofbizUrl>"; + } + } + form.submit(); + } +// --> +</script> + +<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)> +<#assign tasksFound = false> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.OrderOrderNeedingAttention}</div> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <tr> + <td width='100%'> + <#if poList?has_content> + <#assign tasksFound = true> + <table cellspacing="0" class="basic-table"> + <tr> + <td> + <h3>${uiLabelMap.OrderOrderPurchaseToBeScheduled}</h3> + <table cellspacing="0" class="basic-table hover-bar"> + <tr class="header-row"> + <td>${uiLabelMap.OrderOrderNumber}</td> + <td>${uiLabelMap.CommonName}</td> + <td>${uiLabelMap.OrderOrderDate}</td> + <td>${uiLabelMap.CommonStatus}</td> + <td width="1" align="right">${uiLabelMap.OrderOrderItems}</td> + <td width="1" align="right">${uiLabelMap.OrderItemTotal}</td> + <td width="1"> </td> + <td width="1"> </td> + </tr> + <#assign alt_row = false> + <#list poList as orderHeaderAndRole> + <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeaderAndRole)> + <#assign statusItem = orderHeaderAndRole.getRelatedOne("StatusItem", true)> + <#assign placingParty = orh.getPlacingParty()!> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>orderview?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>${orderHeaderAndRole.orderId}</a></td> + <td> + <div> + <#assign partyId = "_NA_"> + <#if placingParty?has_content> + <#assign partyId = placingParty.partyId> + <#if placingParty.getEntityName() == "Person"> + <#if placingParty.lastName??> + ${placingParty.lastName}<#if placingParty.firstName??>, ${placingParty.firstName}</#if> + <#else> + ${uiLabelMap.CommonNA} + </#if> + <#else> + <#if placingParty.groupName??> + ${placingParty.groupName} + <#else> + ${uiLabelMap.CommonNA} + </#if> + </#if> + <#else> + ${uiLabelMap.CommonNA} + </#if> + </div> + </td> + <td><span style="white-space: nowrap;">${orderHeaderAndRole.getString("orderDate")}</span></td> + <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td> + <td align="right">${orh.getTotalOrderItemsQuantity()?string.number}</td> + <td align="right"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orderHeaderAndRole.currencyUom!/></td> + <td width="1"> </td> + <td align='right'> + <a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>Schedule Delivery</a> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </td> + </tr> + </table> + </#if> + + <#if partyTasks?has_content> + <#assign tasksFound = true> + <table cellspacing="0" class="basic-table hover-bar"> + <tr> + <td> + <h3>${uiLabelMap.OrderWorkflow}</h3> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>">${uiLabelMap.OrderOrderNumber}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>">${uiLabelMap.CommonName}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>">${uiLabelMap.OrderOrderDate}</a></td> + <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>">Total</a></td> + <td width="1"> </td> + <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>">${uiLabelMap.OrderStartDateTime}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>">${uiLabelMap.CommonPriority}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>">${uiLabelMap.CommonMyStatus}</a></td> + </tr> + <#assign alt_row = false> + <#list partyTasks as task> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> + <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> + <a href="<@ofbizUrl>orderview?${orderStr}</@ofbizUrl>" class="buttontext"> + ${task.orderId} + </a> + </td> + <td> + <div> + <#if task.customerPartyId??> + <a href="${customerDetailLink}${task.customerPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> + <#else> + N/A + </#if> + </div> + </td> + <td> + <div> + ${task.get("orderDate").toString()} + </div> + </td> + <td width="1" align="right"><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></td> + <td width="1"> </td> + <td> + <#if task.actualStartDate??> + <#assign actualStartDate = task.get("actualStartDate").toString()> + <#else> + <#assign actualStartDate = "N/A"> + </#if> + <div>${actualStartDate}</div> + </td> + <td>${task.priority?default("0")}</td> + <td> + <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}${StringUtil.wrapString(externalKeyParam)}" target="workeffort" class="buttontext"> + ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} + </a> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </td> + </tr> + </table> + </#if> + + <#if roleTasks?has_content> + <#assign tasksFound = true> + <table cellspacing="0" class="basic-table"> + <tr> + <td> + <h3>${uiLabelMap.CommonWorkflowActivityUserRole}</h3> + <table cellspacing="0" class="basic-table hover-bar"> + <tr class="header-row"> + <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>">${uiLabelMap.OrderOrderNumber}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>">${uiLabelMap.CommonName}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>">${uiLabelMap.OrderOrderDate}</a></td> + <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>">${uiLabelMap.CommonTotal}</a></td> + <td width="1"> </td> + <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>">${uiLabelMap.CommonStartDateTime}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=wepaPartyId</@ofbizUrl>">${uiLabelMap.PartyParty}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=roleTypeId</@ofbizUrl>">${uiLabelMap.PartyRole}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>">${uiLabelMap.CommonPriority}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>">${uiLabelMap.CommonStatus}</a></td> + <td> </td> + </tr> + <#assign alt_row = false> + <#list roleTasks as task> + <form method="get" name="F${task.workEffortId}"> + <input type="hidden" name="orderId" value="${task.orderId}" /> + <input type="hidden" name="workEffortId" value="${task.workEffortId}" /> + <input type="hidden" name="taskStatus" value="${task.currentStatusId}" /> + <#if task.statusId?? && task.statusId == "CAL_SENT"> + <input type="hidden" name="partyId" value="${userLogin.partyId}" /> + <input type="hidden" name="roleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}" /> + <#else> + <input type="hidden" name="partyId" value="${userLogin.partyId}" /> + <input type="hidden" name="roleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}" /> + <input type="hidden" name="fromPartyId" value="${task.wepaPartyId}" /> + <input type="hidden" name="fromRoleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="fromFromDate" value="${task.get("fromDate").toString()}" /> + <input type="hidden" name="toPartyId" value="${userLogin.partyId}" /> + <input type="hidden" name="toRoleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="toFromDate" value="${now}" /> + <input type="hidden" name="startActivity" value="true" /> + </#if> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> + <a href="javascript:viewOrder(document.F${task.workEffortId});" class="buttontext"> + ${task.orderId} + </a> + </td> + <td> + <#if task.customerPartyId??> + <a href="${customerDetailLink}${task.customerPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> + <#else> + + </#if> + </td> + <td> + <div> + ${task.get("orderDate").toString()} + </div> + </td> + <td width="1" align="right"><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></td> + <td width="1"> </td> + <td> + <#if task.actualStartDate??> + <#assign actualStartDate = task.get("actualStartDate").toString()> + <#else> + <#assign actualStartDate = "N/A"> + </#if> + <div>${actualStartDate}</div> + </td> + <td> + <#if task.wepaPartyId == "_NA_"> + <div>N/A</div> + <#else> + <a href="${customerDetailLink}${task.wepaPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${task.wepaPartyId}</a> + </#if> + </td> + <td>${Static["org.ofbiz.order.task.TaskWorker"].getRoleDescription(task)}</td> + <td>${task.priority?default("0")}</td> + <td> + <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}" target="workeffort" class="buttontext"> + ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} + </a> + </td> + <#if task.statusId?? && task.statusId == "CAL_SENT"> + <td align="right"><input type="checkbox" name="delegate" value="true" checked="checked" /></td> + <#else> + <td align="right"><input type="checkbox" name="delegate" value="true" /></td> + </#if> + </tr> + </form> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </td> + </tr> + </table> + </#if> + <#if !tasksFound> + <div>${uiLabelMap.CommonNoTaskAssigned}</div> + </#if> + </td> + </tr> + </table> + </div> +</div> +<#else> + <h3>You do not have permission to view this page. ("ORDERMGR_VIEW" or "ORDERMGR_ADMIN" needed)</h3> +</#if> \ No newline at end of file Propchange: ofbiz/trunk/applications/order/template/task/ordertasklist.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/task/ordertasklist.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/task/ordertasklist.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Mon Mar 28 11:14:22 2016 @@ -123,7 +123,7 @@ under the License. <include-form name="ViewRequestStatus" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> + <html><html-template location="component://order/template/request/requestContactMech.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequest"> <include-form name="ViewRequestCommunicationEvents" location="component://order/widget/ordermgr/CustRequestForms.xml"/> @@ -296,7 +296,7 @@ under the License. </container> <include-form name="EditCustRequestItem" location="component://order/widget/ordermgr/CustRequestForms.xml"/> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/CopyRequestItem.ftl"/></html> + <html><html-template location="component://order/template/request/CopyRequestItem.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -322,7 +322,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestitemnotes.ftl"/></html> + <html><html-template location="component://order/template/request/requestitemnotes.ftl"/></html> </platform-specific> <include-form name="ListRequestItemNotes" location="component://order/widget/ordermgr/CustRequestForms.xml"/> <include-form name="EditRequestItemNote" location="component://order/widget/ordermgr/CustRequestForms.xml"/> @@ -385,7 +385,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/QuoteLinks.ftl"/></html> + <html><html-template location="component://order/template/request/QuoteLinks.ftl"/></html> </platform-specific> <include-form name="ListRequestQuoteItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </screenlet> @@ -492,7 +492,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/ViewRequestItemInfo.ftl"/></html> + <html><html-template location="component://order/template/request/ViewRequestItemInfo.ftl"/></html> </platform-specific> </widgets> </section> @@ -690,7 +690,7 @@ under the License. <set field="parameters.subject" value="You request has been received and is registered as Customer request: ${custRequest.custRequestName}[${custRequest.custRequestId}]"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/request/CreateCustRequestNotification.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/request/CreateCustRequestNotification.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label text="Customer requestId is required: ${parameters.custRequestId} value: ${custRequestId}"></label> @@ -708,7 +708,7 @@ under the License. <set field="title" value="${uiLabelMap.OrderCustRequestNotificationMailCompleted} #${custRequestId}"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/request/CompletedCustRequestNotification.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label text="Customer requestId is required: ${parameters.custRequestId} value: ${custRequestId}"></label> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Mon Mar 28 11:14:22 2016 @@ -29,7 +29,7 @@ under the License. <set field="hidebottomlinks" value="Y"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/minicart.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/minicart.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -37,14 +37,14 @@ under the License. <screen name="promoUseDetailsInline"> <section> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promoUseDetailsInline.ftl"/></html></platform-specific> </widgets> </section> </screen> <screen name="orderHeaderInfo"> <section> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/orderHeaderInfo.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/orderHeaderInfo.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -54,7 +54,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/orderShortcuts.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/orderShortcuts.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -80,15 +80,15 @@ under the License. <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/javascript.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showcart.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showcartitems.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promoCodes.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/manualPromotions.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promoText.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/associatedProducts.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotionsApplied.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/javascript.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/showcart.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/addItemsToShoppingList.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/showcartitems.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promoCodes.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/manualPromotions.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promoText.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/associatedProducts.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promotionsApplied.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -106,7 +106,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/survey.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/survey.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -123,7 +123,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showAllPromotions.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/showAllPromotions.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -151,9 +151,9 @@ under the License. <not><if-empty field="productPromo"/></not> </condition> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotiondetails.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotioncategories.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotionproducts.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promotiondetails.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promotioncategories.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promotionproducts.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label text="${uiLabelMap.OrderErrorNoPromotionFoundWithID} [${productPromoId?if_exists}]" style="h2"/> @@ -203,7 +203,7 @@ under the License. <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> <platform-specific><html> - <html-template location="component://order/webapp/ordermgr/order/GiftCertificates.ftl"/></html> + <html-template location="component://order/template/order/GiftCertificates.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Mon Mar 28 11:14:22 2016 @@ -28,7 +28,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ChooseCatalog.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/choosecatalog.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/choosecatalog.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -38,7 +38,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearchOptions.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/keywordsearchbox.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -48,7 +48,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/sidedeepcategory.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -61,7 +61,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/productsummary.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/productsummary.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -72,7 +72,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/breadcrumbs.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -80,7 +80,7 @@ under the License. <screen name="compareproductslist"> <section> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/compareproductslist.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/compareproductslist.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -129,7 +129,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/categorydetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/categorydetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -169,10 +169,10 @@ under the License. </actions> <widgets> <include-screen name="breadcrumbs"/> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/editProduct.ftl"/></html></platform-specific> - <!--<platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/productdetail.ftl"/></html></platform-specific>--> + <platform-specific><html><html-template location="component://order/template/entry/catalog/editProduct.ftl"/></html></platform-specific> + <!--<platform-specific><html><html-template location="component://order/template/product/productdetail.ftl"/></html></platform-specific>--> <!-- Warning: this ftl file in the order component is slightly different from that of the ecommerce one (the edit product link is shown) --> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/productdetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/productdetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -187,9 +187,9 @@ under the License. </actions> <widgets> <include-screen name="breadcrumbs"/> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/editProduct.ftl"/></html></platform-specific> - <!--<platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl"/></html></platform-specific>--> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/configproductdetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/editProduct.ftl"/></html></platform-specific> + <!--<platform-specific><html><html-template location="component://order/template/product/configproductdetail.ftl"/></html></platform-specific>--> + <platform-specific><html><html-template location="component://order/template/entry/catalog/configproductdetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -199,7 +199,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/inlineProductDetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -213,7 +213,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/keywordsearch.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/keywordsearch.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -236,7 +236,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/advancedsearch.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/advancedsearch.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -252,7 +252,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/quickadd.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/quickadd.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -264,7 +264,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/quickaddsummary.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -281,7 +281,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://order/webapp/ordermgr/entry/catalog/compareproducts.ftl"/> + <html-template location="component://order/template/entry/catalog/compareproducts.ftl"/> </html> </platform-specific> </decorator-section> @@ -302,7 +302,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl"/></html> + <html><html-template location="component://order/template/entry/catalog/ProductUomDropDownOnly.ftl"/></html> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Mon Mar 28 11:14:22 2016 @@ -33,7 +33,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryTabBar.ftl"/></html> + <html><html-template location="component://order/template/entry/OrderEntryTabBar.ftl"/></html> </platform-specific> <decorator-section-include name="body"/> </widgets> @@ -59,7 +59,7 @@ under the License. <widgets> <container style="screenlet"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html> + <html><html-template location="component://order/template/entry/OrderEntryCatalogTabBar.ftl"/></html> </platform-specific> <container style="screenlet-body"> <decorator-section-include name="body"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Mon Mar 28 11:14:22 2016 @@ -34,7 +34,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl"/></html> + <html><html-template location="component://order/template/entry/OrderEntryCheckOutTabBar.ftl"/></html> </platform-specific> <decorator-section-include name="body"/> </widgets> @@ -61,7 +61,7 @@ under the License. <container> <label style="h1" text="${uiLabelMap.OrderQuickFinalizeOrder}"/> </container> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkoutoptions.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/checkoutoptions.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -78,7 +78,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/custsettings.ftl"/></html> + <html><html-template location="component://order/template/entry/custsettings.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -96,7 +96,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/shipsettings.ftl"/></html> + <html><html-template location="component://order/template/entry/shipsettings.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -114,7 +114,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/editShipAddress.ftl"/></html> + <html><html-template location="component://order/template/entry/editShipAddress.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -132,7 +132,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/SetItemShipGroups.ftl"/></html> + <html><html-template location="component://order/template/entry/SetItemShipGroups.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -151,7 +151,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/optionsettings.ftl"/></html> + <html><html-template location="component://order/template/entry/optionsettings.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -169,7 +169,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/billsettings.ftl"/></html> + <html><html-template location="component://order/template/entry/billsettings.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -198,10 +198,10 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/setAdditionalParty.ftl"/></html> + <html><html-template location="component://order/template/entry/setAdditionalParty.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/additionalPartyListing.ftl"/></html> + <html><html-template location="component://order/template/entry/additionalPartyListing.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -219,7 +219,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/orderterms.ftl"/></html> + <html><html-template location="component://order/template/entry/orderterms.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -238,16 +238,16 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/order/orderheaderinfo.ftl"/></html> + <html><html-template location="component://order/template/entry/order/orderheaderinfo.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl"/></html> + <html><html-template location="component://order/template/entry/order/orderpaymentinfo.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl"/></html> + <html><html-template location="component://order/template/entry/order/shipGroupConfirmSummary.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/order/orderitems.ftl"/></html> + <html><html-template location="component://order/template/entry/order/orderitems.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -266,7 +266,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkoutshippingaddress.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/checkoutshippingaddress.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -285,7 +285,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkoutpayment.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/checkoutpayment.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -307,7 +307,7 @@ under the License. </entity-condition> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/customertaxinfo.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/customertaxinfo.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -324,7 +324,7 @@ under the License. <widgets> <container style="screenlet"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html> + <html><html-template location="component://order/template/entry/OrderEntryCatalogTabBar.ftl"/></html> </platform-specific> <container style="screenlet-body"> <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="LookupBulkAddSupplierProductsInApprovedOrder"></include-form> @@ -346,7 +346,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/SplitShip.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/SplitShip.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Mon Mar 28 11:14:22 2016 @@ -28,7 +28,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkinits.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/checkinits.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -44,7 +44,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/orderagreements.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/orderagreements.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Mon Mar 28 11:14:22 2016 @@ -49,7 +49,7 @@ under the License. <section> <widgets> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/order/orderReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -59,15 +59,15 @@ under the License. <widgets> <!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page --> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/order/orderReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <!-- order items and totals --> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportBody.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/order/orderReportBody.fo.ftl"/></xsl-fo> </platform-specific> <!-- return policies and notes are shown in the last page --> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportConditions.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/order/orderReportConditions.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -82,7 +82,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy"/> </actions> <widgets> - <platform-specific><xsl-fo><html-template location="component://order/webapp/ordermgr/order/companyHeader.fo.ftl"/></xsl-fo></platform-specific> + <platform-specific><xsl-fo><html-template location="component://order/template/order/companyHeader.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -111,7 +111,7 @@ under the License. <section> <widgets> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/return/returnReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -121,15 +121,15 @@ under the License. <widgets> <!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page --> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/return/returnReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <!-- order items and totals --> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportBody.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/return/returnReportBody.fo.ftl"/></xsl-fo> </platform-specific> <!-- return policies and notes are shown in the last page --> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportConditions.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/return/returnReportConditions.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -160,7 +160,7 @@ under the License. <section> <widgets> <platform-specific> - <xsl-fo><html-template location="component://order/webapp/ordermgr/order/shipGroups.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://order/template/order/shipGroups.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml Mon Mar 28 11:14:22 2016 @@ -44,7 +44,7 @@ under the License. <decorator-screen name="CommonOrderReportDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/reports/reportlist.ftl"/></html> + <html><html-template location="component://order/template/reports/reportlist.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Mon Mar 28 11:14:22 2016 @@ -27,7 +27,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://order/webapp/ordermgr/return/returnLinks.ftl"/> + <html-template location="component://order/template/return/returnLinks.ftl"/> </html> </platform-specific> <decorator-section-include name="body"/> @@ -74,7 +74,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleFindQuickReturn}"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/return/quickReturn.ftl"/></html> + <html><html-template location="component://order/template/return/quickReturn.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -117,7 +117,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleReturnList}"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/return/returnList.ftl"/></html> + <html><html-template location="component://order/template/return/returnList.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -140,7 +140,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://order/webapp/ordermgr/return/returnItems.ftl"/> + <html-template location="component://order/template/return/returnItems.ftl"/> </html> </platform-specific> </widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml Mon Mar 28 11:14:22 2016 @@ -44,7 +44,7 @@ under the License. <decorator-screen name="CommonOrderTaskDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/setup/paymentsetup.ftl"/></html> + <html><html-template location="component://order/template/setup/paymentsetup.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Mon Mar 28 11:14:22 2016 @@ -92,7 +92,7 @@ Also add this back to appheader.ftl: <decorator-screen name="CommonOrderTaskDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/task/ordertasklist.ftl"/></html> + <html><html-template location="component://order/template/task/ordertasklist.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |