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 2016/03/28 13:14:24 UTC
svn commit: r1736868 [1/20] - in /ofbiz/trunk/applications/order: template/
template/entry/ template/entry/cart/ template/entry/catalog/
template/entry/order/ template/order/ template/product/ template/quote/
template/reports/ template/request/ templat...
Author: jleroux
Date: Mon Mar 28 11:14:22 2016
New Revision: 1736868
URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
Log:
A patch from Pierre Smits for <<relocate .ftl files in the order component>> https://issues.apache.org/jira/browse/OFBIZ-6819
Added:
ofbiz/trunk/applications/order/template/
ofbiz/trunk/applications/order/template/entry/
ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl (with props)
ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl (with props)
ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl (with props)
ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl (with props)
ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with props)
ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl (with props)
ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (with props)
ofbiz/trunk/applications/order/template/entry/billsettings.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/
ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl (with props)
ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/
ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/category.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/product.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl (with props)
ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl (with props)
ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with props)
ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl (with props)
ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl (with props)
ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl (with props)
ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl (with props)
ofbiz/trunk/applications/order/template/entry/custsettings.ftl (with props)
ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl (with props)
ofbiz/trunk/applications/order/template/entry/optionsettings.ftl (with props)
ofbiz/trunk/applications/order/template/entry/order/
ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl (with props)
ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl (with props)
ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl (with props)
ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl (with props)
ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl (with props)
ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl (with props)
ofbiz/trunk/applications/order/template/entry/orderagreements.ftl (with props)
ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with props)
ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with props)
ofbiz/trunk/applications/order/template/entry/poheader.ftl (with props)
ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl (with props)
ofbiz/trunk/applications/order/template/entry/shipsettings.ftl (with props)
ofbiz/trunk/applications/order/template/entry/survey.ftl (with props)
ofbiz/trunk/applications/order/template/order/
ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl (with props)
ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl (with props)
ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl (with props)
ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl (with props)
ofbiz/trunk/applications/order/template/order/appendorderitem.ftl (with props)
ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl (with props)
ofbiz/trunk/applications/order/template/order/editorderitems.ftl (with props)
ofbiz/trunk/applications/order/template/order/findOrders.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl (with props)
ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderitems.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderlist.ftl (with props)
ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl (with props)
ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderstats.ftl (with props)
ofbiz/trunk/applications/order/template/order/orderterms.ftl (with props)
ofbiz/trunk/applications/order/template/order/receivepayment.ftl (with props)
ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl (with props)
ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl (with props)
ofbiz/trunk/applications/order/template/order/transitions.ftl (with props)
ofbiz/trunk/applications/order/template/order/viewimage.ftl (with props)
ofbiz/trunk/applications/order/template/product/
ofbiz/trunk/applications/order/template/product/configproductdetail.ftl (with props)
ofbiz/trunk/applications/order/template/product/productdetail.ftl (with props)
ofbiz/trunk/applications/order/template/quote/
ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with props)
ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl (with props)
ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl (with props)
ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl (with props)
ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl (with props)
ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with props)
ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with props)
ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl (with props)
ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl (with props)
ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl (with props)
ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with props)
ofbiz/trunk/applications/order/template/reports/
ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl (with props)
ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl (with props)
ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy (with props)
ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (with props)
ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl (with props)
ofbiz/trunk/applications/order/template/reports/orderitemreport.xml (with props)
ofbiz/trunk/applications/order/template/reports/orderreport.xml (with props)
ofbiz/trunk/applications/order/template/reports/reportlist.ftl (with props)
ofbiz/trunk/applications/order/template/request/
ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl (with props)
ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl (with props)
ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl (with props)
ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl (with props)
ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl (with props)
ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl (with props)
ofbiz/trunk/applications/order/template/request/requestContactMech.ftl (with props)
ofbiz/trunk/applications/order/template/request/requestDate.ftl (with props)
ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl (with props)
ofbiz/trunk/applications/order/template/return/
ofbiz/trunk/applications/order/template/return/quickReturn.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnHeader.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnItemInc.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnItems.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnLinks.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnList.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl (with props)
ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl (with props)
ofbiz/trunk/applications/order/template/setup/
ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl (with props)
ofbiz/trunk/applications/order/template/task/
ofbiz/trunk/applications/order/template/task/ordertasklist.ftl (with props)
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
Added: ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,40 @@
+<#--
+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="screenlet">
+<div class="screenlet-title-bar">
+ <ul>
+ <#if orderHeader?has_content>
+ <li class="h3">
+ ${uiLabelMap.PageTitleLookupBulkAddProduct}
+ </li>
+ <#else>
+ <li class="h3">
+ ${uiLabelMap.CommonCreate}
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ ${uiLabelMap.OrderPurchaseOrder}
+ <#else>
+ ${uiLabelMap.OrderSalesOrder}
+ </#if>
+ </li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
+ </#if>
+ </ul>
+</div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,52 @@
+<#--
+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 stepTitleId??>
+ <#assign stepTitle = uiLabelMap.get(stepTitleId)>
+</#if>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ ${uiLabelMap.OrderPurchaseOrder}
+ <#else>
+ ${uiLabelMap.OrderSalesOrder}
+ </#if>
+ : ${stepTitle!}
+ </li>
+
+ <#if isLastStep == "N">
+ <li><a href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <#else>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
+ </#if>
+
+ <#list checkoutSteps?reverse as checkoutStep>
+ <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
+ <#if checkoutStep.enabled == "N">
+ <li><span class="disabled">${stepUiLabel}</span></li>
+ <#else>
+ <li><a href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
+ </#if>
+ </#list>
+ </ul>
+ <br class="clear" />
+ </div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,60 @@
+<#--
+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="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">
+ ${uiLabelMap.CommonCreate}
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ ${uiLabelMap.OrderPurchaseOrder}
+ <#else>
+ ${uiLabelMap.OrderSalesOrder}
+ </#if>
+ </li>
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)>
+ <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
+ <#else>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
+ </#if>
+ <#else>
+ <#if shoppingCart.size() = 0>
+ <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
+ <li class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
+ <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
+ <#else>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
+ </#if>
+ </#if>
+
+ <#if (shoppingCart.size() > 0)>
+ <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
+ <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
+ <#else>
+ <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
+ <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
+ </#if>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
+ </ul>
+ <br class="clear">
+ </div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,112 @@
+<#--
+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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
+<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="removeEmptyShipGroups"/>
+</form>
+
+<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
+<tr>
+ <td width='100%'>
+ <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
+ <tr>
+ <td>
+ <#list 1..shoppingCart.getShipGroupSize() as currIndex>
+ <#assign shipGroupIndex = currIndex - 1>
+ <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
+ <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td colspan="2">
+ <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> - ${uiLabelMap.OrderDropShipped} - ${supplier.groupName?default(supplier.partyId)}</#if></h1>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div>${uiLabelMap.ProductProduct}</div>
+ </td>
+ <td>
+ <div>${uiLabelMap.CommonQuantity}</div>
+ </td>
+ <td>
+ <div>${uiLabelMap.ProductMoveQuantity}</div>
+ </td>
+ <td>
+ <div>${uiLabelMap.OrderShipGroupTo}</div>
+ </td>
+ </tr>
+
+ <#assign shipGroupItems = shoppingCart.getShipGroupItems(shipGroupIndex)>
+ <#assign shoppingCartItems = shipGroupItems.keySet().iterator()>
+ <form method="post" action="<@o...@ofbizUrl>" name="assignitemtoshipgroup${shipGroupIndex}">
+ <input type="hidden" name="_useRowSubmit" value="N" />
+ <#assign rowCount = 0>
+ <#list shoppingCartItems as shoppingCartItem>
+ <#assign cartLineIndex = shoppingCart.getItemIndex(shoppingCartItem)>
+ <#assign shipGroupItemQuantity = shipGroupItems.get(shoppingCartItem)>
+ <input type="hidden" name="itemIndex_o_${rowCount}" value="${cartLineIndex}"/>
+ <input type="hidden" name="clearEmptyGroups_o_${rowCount}" value="false"/>
+ <input type="hidden" name="fromGroupIndex_o_${rowCount}" value="${shipGroupIndex}"/>
+ <tr>
+ <td>
+ <div>[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div>
+ </td>
+ <td>
+ <div>${shipGroupItemQuantity}</div>
+ </td>
+ <td>
+ <div><input type="text" name="quantity_o_${rowCount}" value="${shipGroupItemQuantity}"/></div>
+ </td>
+ <td>
+ <div>
+ <select name="toGroupIndex_o_${rowCount}">
+ <option value="${shipGroupIndex}">---</option>
+ <#list 0..(shoppingCart.getShipGroupSize() - 1) as groupIdx>
+ <#assign groupNumber = groupIdx + 1>
+ <option value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr} ${groupNumber}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <#assign rowCount = rowCount + 1>
+ </#list>
+ <#if (rowCount > 0)>
+ <tr>
+ <td colspan="3"> </td>
+ <td>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonSubmit}"/>
+ </td>
+ </tr>
+ </#if>
+ </table>
+ <input type="hidden" name="_rowCount" value="${rowCount}" />
+ </form>
+ </#list>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<br />
+<#else>
+ <h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,263 @@
+<#--
+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">
+//<![CDATA[
+function submitForm(form, mode, value) {
+ if (mode == "DN") {
+ // done action; payment info
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "CS") {
+ // continue shopping
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NA") {
+ // new address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SV") {
+ // save option; return to current screen
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SA") {
+ // selected shipping address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ }
+}
+//]]>
+</script>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderItemGroups}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <#assign shipGroups = cart.getShipGroups()>
+ <#if (shipGroups.size() > 0)>
+ <#assign groupIdx = 0>
+ <#list shipGroups as group>
+ <#assign shipEstimateWrapper = Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher, cart, groupIdx)>
+ <#assign carrierShipmentMethods = shipEstimateWrapper.getShippingMethods()>
+ <#assign groupNumber = groupIdx + 1>
+ <form method="post" action="#" name="editgroupform${groupIdx}" style="margin: 0;">
+ <input type="hidden" name="groupIndex" value="${groupIdx}"/>
+ <tr>
+ <td>
+ <div class="tabletext"><b>${uiLabelMap.CommonGroup} ${groupNumber}:</b></div>
+ <#list group.getShipItems() as item>
+ <#assign groupItem = group.getShipItemInfo(item)>
+ <div class="tabletext"> ${item.getName()} - (${groupItem.getItemQuantity()})</div>
+ </#list>
+ </td>
+ <td>
+ <div>
+ <span class='tabletext'>${uiLabelMap.CommonAdd}:</span>
+ <a href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
+ </div>
+ <div>
+ <#assign selectedContactMechId = cart.getShippingContactMechId(groupIdx)?default("")>
+ <select name="shippingContactMechId" class="selectBox" onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA', null);">
+ <option value="">${uiLabelMap.OrderSelectShippingAddress}</option>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <option value="${shippingAddress.contactMechId}" <#if (shippingAddress.contactMechId == selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
+ </#list>
+ </select>
+ </div>
+ <#if cart.getShipmentMethodTypeId(groupIdx)??>
+ <#assign selectedShippingMethod = cart.getShipmentMethodTypeId(groupIdx) + "@" + cart.getCarrierPartyId(groupIdx)>
+ <#else>
+ <#assign selectedShippingMethod = "">
+ </#if>
+ <select name="shipmentMethodString" class="selectBox">
+ <option value="">${uiLabelMap.OrderSelectShippingMethod}</option>
+ <#list carrierShipmentMethods as carrierShipmentMethod>
+ <#assign shippingEst = shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
+ <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
+ <option value="${shippingMethod}" <#if (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
+ <#if carrierShipmentMethod.partyId != "_NA_">
+ ${carrierShipmentMethod.partyId!}
+ </#if>
+ ${carrierShipmentMethod.description!}
+ <#if shippingEst?has_content>
+ -
+ <#if (shippingEst > -1)>
+ <@ofbizCurrency amount=shippingEst isoCode=cart.getCurrency()/>
+ <#else>
+ ${uiLabelMap.OrderCalculatedOffline}
+ </#if>
+ </#if>
+ </option>
+ </#list>
+ </select>
+
+ <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
+ <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
+ </td>
+ <td>
+ <div>
+ <select name="maySplit" class="selectBox">
+ <#assign maySplitStr = cart.getMaySplit(groupIdx)?default("")>
+ <option value="">${uiLabelMap.OrderSplittingPreference}</option>
+ <option value="false" <#if maySplitStr == "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
+ <option value="true" <#if maySplitStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
+ </select>
+ </div>
+ <div>
+ <select name="isGift" class="selectBox">
+ <#assign isGiftStr = cart.getIsGift(groupIdx)?default("")>
+ <option value="">${uiLabelMap.OrderIsGift} ?</option>
+ <option value="false" <#if isGiftStr == "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
+ <option value="true" <#if isGiftStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
+ </select>
+ </div>
+
+ <h2>${uiLabelMap.OrderGiftMessage}</h2>
+ <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
+ </td>
+ <td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td>
+ </tr>
+ <#assign groupIdx = groupIdx + 1>
+ <#if group_has_next>
+ <tr>
+ <td colspan="6"><hr /></td>
+ </tr>
+ </#if>
+ </form>
+ </#list>
+ <#else>
+ <div class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
+ </#if>
+ </table>
+ </div>
+</div>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderAssignItems}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
+ <td> </td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+
+ <#list cart.items() as cartLine>
+ <#assign cartLineIndex = cart.getItemIndex(cartLine)>
+ <tr>
+ <form method="post" action="<@o...@ofbizUrl>" name="editgroupform" style="margin: 0;">
+ <input type="hidden" name="itemIndex" value="${cartLineIndex}"/>
+ <td>
+ <div class="tabletext">
+ <#if cartLine.getProductId()??>
+ <#-- product item -->
+ <#-- start code to display a small image of the product -->
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
+ <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if smallImageUrl?string?has_content>
+ <a href="<@o...@ofbizUrl>">
+ <img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" />
+ </a>
+ </#if>
+ <#-- end code to display a small image of the product -->
+ <a href="<@o...@ofbizUrl>" class="buttontext">${cartLine.getProductId()} -
+ ${cartLine.getName()!}</a> : ${cartLine.getDescription()!}
+
+ <#-- display the registered ship groups and quantity -->
+ <#assign itemShipGroups = cart.getShipGroups(cartLine)>
+ <#list itemShipGroups.entrySet() as group>
+ <div class="tabletext">
+ <#assign groupNumber = group.getKey() + 1>
+ <b>Group - </b>${groupNumber} / <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
+ </div>
+ </#list>
+
+ <#-- if inventory is not required check to see if it is out of stock and needs to have a message shown about that... -->
+ <#assign itemProduct = cartLine.getProduct()>
+ <#assign isStoreInventoryNotRequiredAndNotAvailable = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request, itemProduct, cartLine.getQuantity(), false, false)>
+ <#if isStoreInventoryNotRequiredAndNotAvailable && itemProduct.inventoryMessage?has_content>
+ <b>(${itemProduct.inventoryMessage})</b>
+ </#if>
+
+ <#else>
+ <#-- this is a non-product item -->
+ <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!}
+ </#if>
+ </div>
+
+ </td>
+ <td align="right">
+ <div class="tabletext">${cartLine.getQuantity()?string.number} </div>
+ </td>
+ <td>
+ <div> </div>
+ </td>
+ <td align="center">
+ <input size="6" class="inputBox" type="text" name="quantity" value="${cartLine.getQuantity()?string.number}"/>
+ </td>
+ <td>
+ <div> </div>
+ </td>
+ <td>
+ <div class="tabletext">${uiLabelMap.CommonFrom}:
+ <select name="fromGroupIndex" class="selectBox">
+ <#list itemShipGroups.entrySet() as group>
+ <#assign groupNumber = group.getKey() + 1>
+ <option value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ <td>
+ <div class="tabletext">${uiLabelMap.CommonTo}:
+ <select name="toGroupIndex" class="selectBox">
+ <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
+ <#assign groupNumber = groupIdx + 1>
+ <option value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
+ </#list>
+ <option value="-1">${uiLabelMap.CommonNew} ${uiLabelMap.CommonGroup}</option>
+ </select>
+ </div>
+ </td>
+ <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonSubmit}"/></td>
+ </form>
+ </tr>
+ </#list>
+ </table>
+ </div>
+</div>
+
+<table>
+ <tr valign="top">
+ <td>
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
+ </td>
+ <td align="right">
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.CommonContinue}</a>
+ </td>
+ </tr>
+</table>
Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,64 @@
+<#--
+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.
+-->
+
+<#-- ==================== Party Listing dialog box ========================= -->
+<#if additionalPartyRoleMap?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
+ </div>
+ <div class="screenlet-body">
+ <table border="0" width="100%" cellpadding="0">
+ <#list roleList as role>
+ <tr>
+ <td valign="bottom"><div>${roleData[role].get("description", locale)}</div></td>
+ </tr>
+ <tr>
+ <td colspan="4"><hr /></td>
+ </tr>
+ <#list additionalPartyRoleMap[role] as party>
+ <tr>
+ <td><div>${party}</div></td>
+ <td>
+ <div>
+ <#if partyData[party].type == "person">
+ ${partyData[party].firstName!}
+ <#else>
+ ${partyData[party].groupName!}
+ </#if>
+ </div>
+ </td>
+ <td>
+ <div>
+ <#if partyData[party].type == "person">
+ ${partyData[party].lastName!}
+ </#if>
+ </div>
+ </td>
+ <td align="right">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </td>
+ </tr>
+ </#list>
+ <tr><td> </td></tr>
+ </#list>
+ </table>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,80 @@
+<#--
+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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
+
+<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="ship"/>
+ <table width="100%" border="0" align="center" cellspacing='0' cellpadding='0' class='boxoutside'>
+ <tr><td>
+
+ <#-- header table -->
+
+ <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxtop'>
+ <tr>
+ <td valign="middle">
+ <div class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
+ <tr><td colspan="3"><hr /></td></tr>
+
+ <#-- postal addresses for chosen id -->
+
+ <#if partyContactMechPurposes??>
+ <#list partyContactMechPurposes as partyContactMechPurpose>
+ <#assign shippingAddress = partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
+
+ <#-- skip non-postal addresses -->
+
+ <#if shippingAddress.toName??>
+ <tr>
+ <td valign="top" nowrap="nowrap">
+ <input type="radio" name="shipping_contact_mech_id" value="${partyContactMechPurpose.contactMechId}" />
+ </td>
+ <td nowrap="nowrap"> </td>
+ <td width="100%">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
+ <#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
+ <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if>
+ <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if>
+ <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
+ </#list>
+ </#if>
+
+ </table>
+
+ </td></tr>
+ </table>
+</form>
+
+<#else>
+ <h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/billsettings.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,516 @@
+<#--
+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 type="text/javascript">
+//<![CDATA[
+function shipBillAddr() {
+ if (document.checkoutsetupform.useShipAddr.checked) {
+ window.location = "<@o...@ofbizUrl>";
+ } else {
+ window.location = "<@o...@ofbizUrl>";
+ }
+}
+
+function makeExpDate() {
+ document.checkoutsetupform.expireDate.value = document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value + "/" + document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
+}
+//]]>
+</script>
+
+<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
+<div class="screenlet">
+ <div class="screenlet-body">
+ <#if request.getAttribute("paymentMethodId")?? || ( (paymentMethodList?has_content || billingAccountList?has_content) && !requestParameters.createNew??)>
+ <#-- initial screen when we have a associated party -->
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="payment"/>
+ <table width="100%" cellpadding="1" cellspacing="0" border="0">
+ <tr>
+ <td colspan="2">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a>
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ <#if billingAccountList?has_content>
+ <tr>
+ <td width="1%">
+ <select name="billingAccountId">
+ <option value=""></option>
+ <#list billingAccountList as billingAccount>
+ <#assign availableAmount = billingAccount.accountBalance?double>
+ <#if (billingAccount.accountLimit)??>
+ <#assign accountLimit = billingAccount.accountLimit?double />
+ <#else>
+ <#assign accountLimit = 0.00 />
+ </#if>
+ <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
+ </#list>
+ </select>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td width="1%" align="right">
+ <input type="text" size="5" name="billingAccountAmount" value=""/>
+ </td>
+ <td width="50%">
+ ${uiLabelMap.OrderBillUpTo}
+ </td>
+ <td> </td>
+ </tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
+ <tr>
+ <td width="1%">
+ <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
+ </td>
+ <td colspan="2" width="50%">
+ <label for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ <tr>
+ <td width="1%">
+ <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
+ </td>
+ <td colspan="2" width="50%">
+ <label for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label>
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ <#if paymentMethodList?has_content>
+ <#list paymentMethodList as paymentMethod>
+ <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
+ <tr>
+ <td width="1%">
+ <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <label for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}">
+ CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </label>
+ <span>
+ ${uiLabelMap.OrderCardSecurityCode} <input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
+ </span>
+ </td>
+ <td align="right"><a href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
+ </tr>
+ <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+ <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
+ <tr>
+ <td width="1%">
+ <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <label for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}">
+ EFT: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </label>
+ </td>
+ <td align="right"><a href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ </#if>
+ </#list>
+ <#else>
+ <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
+ </#if>
+ </table>
+ </form>
+ <#elseif paymentMethodType?? || finalizeMode?default("") == "payment">
+ <#-- after initial screen; show detailed screens for selected type -->
+ <#if paymentMethodType == "CC">
+ <#if postalAddress?has_content>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/>
+ <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/>
+ <#elseif requestParameters.useShipAddr??>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <#else>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ </#if>
+ </#if>
+ <#if paymentMethodType == "EFT">
+ <#if postalAddress?has_content>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/>
+ <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/>
+ <#elseif requestParameters.useShipAddr??>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <#else>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ </#if>
+ </#if>
+
+ <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/>
+ <input type="hidden" name="partyId" value="${cart.getPartyId()}"/>
+ <input type="hidden" name="paymentMethodType" value="${paymentMethodType}"/>
+ <input type="hidden" name="finalizeMode" value="payment"/>
+ <input type="hidden" name="createNew" value="Y"/>
+ <#if requestParameters.useShipAddr??>
+ <input type="hidden" name="contactMechId" value="${postalFields.contactMechId}"/>
+ </#if>
+
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <#if cart.getShippingContactMechId()??>
+ <tr>
+ <td width="26%" align="right"= valign="top">
+ <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr??>checked="checked"</#if>/>
+ </td>
+ <td colspan="2" valign="center">
+ <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3"><hr /></td>
+ </tr>
+ </#if>
+
+ <#if orderPerson?has_content>
+ <#assign toName = "">
+ <#if orderPerson.personalTitle?has_content><#assign toName = orderPerson.personalTitle + " "></#if>
+ <#assign toName = toName + orderPerson.firstName + " ">
+ <#if orderPerson.middleName?has_content><#assign toName = toName + orderPerson.middleName + " "></#if>
+ <#assign toName = toName + orderPerson.lastName>
+ <#if orderPerson.suffix?has_content><#assign toName = toName + " " + orderPerson.suffix></#if>
+ <#else>
+ <#assign toName = postalFields.toName?default("")>
+ </#if>
+
+ <#-- generic address information -->
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonToName}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="attnName" value="${postalFields.attnName!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="30" name="address1" value="${postalFields.address1!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="30" name="address2" value="${postalFields.address2!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCity}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="30" name="city" value="${postalFields.city!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
+ <#if postalFields.stateProvinceGeoId??>
+ <option>${postalFields.stateProvinceGeoId}</option>
+ <option value="${postalFields.stateProvinceGeoId}">---</option>
+ </#if>
+ <option value=""></option>
+ ${screens.render("component://common/widget/CommonScreens.xml#states")}
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="countryGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
+ <#if postalFields.countryGeoId??>
+ <option>${postalFields.countryGeoId}</option>
+ <option value="${postalFields.countryGeoId}">---</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+ </select>
+ *</td>
+ </tr>
+
+ <#-- credit card fields -->
+ <#if paymentMethodType == "CC">
+ <#if !creditCard?has_content>
+ <#assign creditCard = requestParameters>
+ </#if>
+ <input type="hidden" name="expireDate" value="${creditCard.expireDate!}"/>
+ <tr>
+ <td colspan="3"><hr /></td>
+ </tr>
+
+ <tr>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPrefixCard}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="titleOnCard">
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
+ <option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
+ <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
+ <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
+ <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingSuffixCard}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="suffixOnCard">
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> checked="checked"</#if>>Jr.</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> checked="checked"</#if>>Sr.</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "I")> checked="checked"</#if>>I</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "II")> checked="checked"</#if>>II</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "III")> checked="checked"</#if>>III</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> checked="checked"</#if>>IV</option>
+ <option<#if ((creditCard.suffixOnCard)?default("") == "V")> checked="checked"</#if>>V</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardType}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="cardType">
+ <#if creditCard.cartType??>
+ <option>${creditCard.cardType}</option>
+ <option value="${creditCard.cardType}">---</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
+ </select>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber!}"/>
+ *</td>
+ </tr>
+ <#--<tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.OrderCardSecurityCode}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="5" maxlength="10" name="cardSecurityCode" value=""/>
+ </td>
+ </tr>-->
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <#assign expMonth = "">
+ <#assign expYear = "">
+ <#if creditCard?? && creditCard.expDate??>
+ <#assign expDate = creditCard.expireDate>
+ <#if (expDate?? && expDate.indexOf("/") > 0)>
+ <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
+ <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
+ </#if>
+ </#if>
+ <select name="expMonth" onchange="javascript:makeExpDate();">
+ <#if creditCard?has_content && expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign ccExprMonth = requestParameters.expMonth!></#if>
+ <#if ccExprMonth?has_content>
+ <option value="${ccExprMonth!}">${ccExprMonth!}</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
+ </select>
+ <select name="expYear" onchange="javascript:makeExpDate();">
+ <#if creditCard?has_content && expYear?has_content><#assign ccExprYear = expYear><#else><#assign ccExprYear = requestParameters.expYear!></#if>
+ <#if ccExprYear?has_content>
+ <option value="${ccExprYear!}">${ccExprYear!}</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
+ </select>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="30" name="description" value="${creditCard.description!}"/>
+ </td>
+ </tr>
+ </#if>
+
+ <#-- eft fields -->
+ <#if paymentMethodType =="EFT">
+ <#if !eftAccount?has_content>
+ <#assign eftAccount = requestParameters>
+ </#if>
+ <tr>
+ <td colspan="3"><hr /></td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName!}"/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber!}"/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="accountType">
+ <option>${eftAccount.accountType!}</option>
+ <option></option>
+ <option>Checking</option>
+ <option>Savings</option>
+ </select>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber!}"/>
+ *</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description!}"/>
+ </td>
+ </tr>
+ </#if>
+ </table>
+ <#else>
+ <#-- initial screen show a list of options -->
+
+ <script type="text/javascript">
+
+ function setCheckoutPaymentId( selectedValue ) {
+ checkoutForm = document.getElementById('checkoutsetupform');
+ if( selectedValue.match('^EXT_.*') ) {
+ checkoutForm.action = '<@o...@ofbizUrl>?checkOutPaymentId=' + selectedValue ;
+ } else {
+ checkoutForm.action = '<@o...@ofbizUrl>?paymentMethodType=' + selectedValue ;
+ }
+ }
+ </script>
+
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform" id="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="payment"/>
+ <input type="hidden" name="createNew" value="${(requestParameters.createNew)!}"/>
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <#if "Y" != requestParameters.createNew?default("")>
+ <tr>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
+ <td width='50%' nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
+ <td width="50%" nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ </#if>
+ <tr>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/>
+ <td width='50%' nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/>
+ <td width='50%' nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
+ </tr>
+ </table>
+ </form>
+ </#if>
+ </div>
+</div>
+<#else>
+ <h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,61 @@
+<#--
+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.
+-->
+
+<!-- Screenlet to add cart to shopping list. The shopping lists are presented in a dropdown box. -->
+
+<#if (shoppingLists??) && (shoppingCartSize > 0)>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
+ </div>
+ <div class="screenlet-body">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <form method="post" name="addBulkToShoppingList" action="<@o...@ofbizUrl>" style='margin: 0;'>
+ <#assign index = 0/>
+ <#list shoppingCart.items() as cartLine>
+ <#if (cartLine.getProductId()??) && !cartLine.getIsPromo()>
+ <input type="hidden" name="selectedItem" value="${index}"/>
+ </#if>
+ <#assign index = index + 1/>
+ </#list>
+ <table border="0">
+ <tr>
+ <td>
+ <div>
+ <select name='shoppingListId'>
+ <#list shoppingLists as shoppingList>
+ <option value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
+ </#list>
+ <option value="">---</option>
+ <option value="">${uiLabelMap.OrderNewShoppingList}</option>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,47 @@
+<#--
+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 (shoppingCart.getOrderType() == "SALES_ORDER")>
+ <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)!>
+</#if>
+
+<#if associatedProducts?has_content>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderHelpAlsoInterestedIn}</div>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" cellpadding="1" border="0">
+ <#-- random complementary products -->
+ <#list associatedProducts as assocProduct>
+ <tr>
+ <td>
+ ${setRequestAttribute("optProduct", assocProduct)}
+ ${setRequestAttribute("listIndex", assocProduct_index)}
+ ${screens.render(productsummaryScreen)}
+ </td>
+ </tr>
+ <#if assocProduct_has_next>
+ <tr><td><hr/></td></tr>
+ </#if>
+ </#list>
+ </table>
+ </div>
+ </div>
+</#if>
Re: svn commit: r1736868 [1/20] - in /ofbiz/trunk/applications/order:
template/ template/entry/ template/entry/cart/ template/entry/catalog/
template/entry/order/ template/order/ template/product/ template/quote/
template/reports/ template/request/ templat...
Posted by Deepak Dixit <de...@hotwaxsystems.com>.
Thanks Jacques :)
Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
On Sat, Apr 2, 2016 at 4:10 PM, Jacques Le Roux <
jacques.le.roux@les7arts.com> wrote:
> You are right Deepak!
>
> We not only lose history when doing so but we also lose annotation which
> is even more annoying.
>
> I will revert all the recent changes I committed and we (committers) need
> to do the job directly in our working copies.
>
> So I'm happy from help from other committers to do so. I think it's even
> easier for us than applying patches, etc.
>
> Note: patches should never be used to move files, we all (committers at
> least) need to remember that, my bad sorry :/
>
> Thanks
>
> Jacques
>
> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>
>> Hi Jacques,
>>
>> I think we need to use svn mv command to move files to new location else
>> we
>> will lose the svn history of all files.
>>
>> Thanks & Regards
>> --
>> Deepak Dixit
>> www.hotwaxsystems.com
>>
>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>
>> Author: jleroux
>>> Date: Mon Mar 28 11:14:22 2016
>>> New Revision: 1736868
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>> Log:
>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/
>>> ofbiz/trunk/applications/order/template/entry/
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/
>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/transitions.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/product/
>>>
>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/
>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/reports/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/request/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
>>> (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/
>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnList.ftl
>>> (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/setup/
>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/task/
>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
>>> (with
>>> props)
>>> Modified:
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,40 @@
>>> +<#--
>>> +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="screenlet">
>>> +<div class="screenlet-title-bar">
>>> + <ul>
>>> + <#if orderHeader?has_content>
>>> + <li class="h3">
>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>> + </li>
>>> + <#else>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>> + </#if>
>>> + </ul>
>>> +</div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (added)
>>> +++
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,52 @@
>>> +<#--
>>> +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 stepTitleId??>
>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>> +</#if>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + : ${stepTitle!}
>>> + </li>
>>> +
>>> + <#if isLastStep == "N">
>>> + <li><a
>>>
>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>> + <#else>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>> + </#if>
>>> +
>>> + <#list checkoutSteps?reverse as checkoutStep>
>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>> + <#if checkoutStep.enabled == "N">
>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>> + </#if>
>>> + </#list>
>>> + </ul>
>>> + <br class="clear" />
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> Mon
>>> Mar 28 11:14:22 2016
>>> @@ -0,0 +1,60 @@
>>> +<#--
>>> +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="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>> (shoppingCart.size() = 0)>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>> + </#if>
>>> + <#else>
>>> + <#if shoppingCart.size() = 0>
>>> + <li
>>> class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>> + <li
>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>> + </#if>
>>> + </#if>
>>> +
>>> + <#if (shoppingCart.size() > 0)>
>>> + <li><a
>>>
>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>> + <li><a
>>>
>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>> + <#else>
>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>> + </#if>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>> + </ul>
>>> + <br class="clear">
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,112 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode"
>>> value="removeEmptyShipGroups"/>
>>> +</form>
>>> +
>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>> class='boxoutside'>
>>> +<tr>
>>> + <td width='100%'>
>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr>
>>> + <td>
>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>> + <#assign shipGroupIndex = currIndex - 1>
>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>> + <table width="100%" cellpadding="1" border="0"
>>> cellpadding="0" cellspacing="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <h1>${uiLabelMap.OrderShipGroup}
>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>> ${uiLabelMap.OrderDropShipped} -
>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td>
>>> + <div>${uiLabelMap.ProductProduct}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>> + </td>
>>> + </tr>
>>> +
>>> + <#assign shipGroupItems =
>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>> + <#assign shoppingCartItems =
>>> shipGroupItems.keySet().iterator()>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>> + <#assign rowCount = 0>
>>> + <#list shoppingCartItems as shoppingCartItem>
>>> + <#assign cartLineIndex =
>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>> + <#assign shipGroupItemQuantity =
>>> shipGroupItems.get(shoppingCartItem)>
>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>> value="${cartLineIndex}"/>
>>> + <input type="hidden"
>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>> value="${shipGroupIndex}"/>
>>> + <tr>
>>> + <td>
>>> + <div>[${shoppingCartItem.getProductId()}]
>>> ${shoppingCartItem.getName()!}:
>>> ${shoppingCartItem.getDescription()!}</div>
>>> + </td>
>>> + <td>
>>> + <div>${shipGroupItemQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div><input type="text"
>>> name="quantity_o_${rowCount}"
>>> value="${shipGroupItemQuantity}"/></div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="toGroupIndex_o_${rowCount}">
>>> + <option value="${shipGroupIndex}">---</option>
>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>> groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>> ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <#assign rowCount = rowCount + 1>
>>> + </#list>
>>> + <#if (rowCount > 0)>
>>> + <tr>
>>> + <td colspan="3"> </td>
>>> + <td>
>>> + <input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> + </table>
>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>> + </form>
>>> + </#list>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </td>
>>> + </tr>
>>> +</table>
>>> +
>>> +<br />
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar
>>> 28
>>> 11:14:22 2016
>>> @@ -0,0 +1,263 @@
>>> +<#--
>>> +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">
>>> +//<![CDATA[
>>> +function submitForm(form, mode, value) {
>>> + if (mode == "DN") {
>>> + // done action; payment info
>>> +
>>>
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "CS") {
>>> + // continue shopping
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "NA") {
>>> + // new address
>>> +
>>>
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "SV") {
>>> + // save option; return to current screen
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "SA") {
>>> + // selected shipping address
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + }
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <#assign shipGroups = cart.getShipGroups()>
>>> + <#if (shipGroups.size() > 0)>
>>> + <#assign groupIdx = 0>
>>> + <#list shipGroups as group>
>>> + <#assign shipEstimateWrapper =
>>>
>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>> cart, groupIdx)>
>>> + <#assign carrierShipmentMethods =
>>> shipEstimateWrapper.getShippingMethods()>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <form method="post" action="#"
>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>> + <input type="hidden" name="groupIndex"
>>> value="${groupIdx}"/>
>>> + <tr>
>>> + <td>
>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>> ${groupNumber}:</b></div>
>>> + <#list group.getShipItems() as item>
>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>> + <div
>>> class="tabletext"> ${item.getName()} -
>>> (${groupItem.getItemQuantity()})</div>
>>> + </#list>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <span
>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>> + <a
>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA',
>>> '');"
>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>> + </div>
>>> + <div>
>>> + <#assign selectedContactMechId =
>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>> + <select name="shippingContactMechId"
>>> class="selectBox"
>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>> null);">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>> + <#list shippingContactMechList as
>>> shippingContactMech>
>>> + <#assign shippingAddress =
>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>> + <option
>>> value="${shippingAddress.contactMechId}" <#if
>>> (shippingAddress.contactMechId ==
>>>
>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>> + <#assign selectedShippingMethod =
>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>> cart.getCarrierPartyId(groupIdx)>
>>> + <#else>
>>> + <#assign selectedShippingMethod = "">
>>> + </#if>
>>> + <select name="shipmentMethodString"
>>> class="selectBox">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>> + <#list carrierShipmentMethods as
>>> carrierShipmentMethod>
>>> + <#assign shippingEst =
>>>
>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>> + <#assign shippingMethod =
>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>> carrierShipmentMethod.partyId>
>>> + <option value="${shippingMethod}" <#if
>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>> + ${carrierShipmentMethod.partyId!}
>>> + </#if>
>>> + ${carrierShipmentMethod.description!}
>>> + <#if shippingEst?has_content>
>>> + -
>>> + <#if (shippingEst > -1)>
>>> + <@ofbizCurrency amount=shippingEst
>>> isoCode=cart.getCurrency()/>
>>> + <#else>
>>> + ${uiLabelMap.OrderCalculatedOffline}
>>> + </#if>
>>> + </#if>
>>> + </option>
>>> + </#list>
>>> + </select>
>>> +
>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>> wrap="hard"
>>>
>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="maySplit" class="selectBox">
>>> + <#assign maySplitStr =
>>> cart.getMaySplit(groupIdx)?default("")>
>>> + <option
>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>> + <option value="false" <#if maySplitStr ==
>>>
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>> + <option value="true" <#if maySplitStr ==
>>>
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>> + </select>
>>> + </div>
>>> + <div>
>>> + <select name="isGift" class="selectBox">
>>> + <#assign isGiftStr =
>>> cart.getIsGift(groupIdx)?default("")>
>>> + <option value="">${uiLabelMap.OrderIsGift}
>>> ?</option>
>>> + <option value="false" <#if isGiftStr ==
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>> + <option value="true" <#if isGiftStr ==
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>> + </select>
>>> + </div>
>>> +
>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>> wrap="hard"
>>> name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>> + </td>
>>> + <td><input type="button" class="smallSubmit"
>>> value="${uiLabelMap.CommonSave}"
>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>> null);"/></td>
>>> + </tr>
>>> + <#assign groupIdx = groupIdx + 1>
>>> + <#if group_has_next>
>>> + <tr>
>>> + <td colspan="6"><hr /></td>
>>> + </tr>
>>> + </#if>
>>> + </form>
>>> + </#list>
>>> + <#else>
>>> + <div
>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>> + </#if>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <tr>
>>> + <td><div
>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>> + <td> </td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>> + <td> </td>
>>> + <td> </td>
>>> + </tr>
>>> +
>>> + <#list cart.items() as cartLine>
>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>> + <tr>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>> style="margin: 0;">
>>> + <input type="hidden" name="itemIndex"
>>> value="${cartLineIndex}"/>
>>> + <td>
>>> + <div class="tabletext">
>>> + <#if cartLine.getProductId()??>
>>> + <#-- product item -->
>>> + <#-- start code to display a small image of the
>>> product -->
>>> + <#assign smallImageUrl =
>>>
>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>> + <#if !smallImageUrl?string?has_content><#assign
>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>> + <#if smallImageUrl?string?has_content>
>>> + <a
>>>
>>> href="<@o...@ofbizUrl>">
>>> + <img
>>>
>>> src="<@o...@ofbizContentUrl>"
>>> class="cssImgSmall" alt="" />
>>> + </a>
>>> + </#if>
>>> + <#-- end code to display a small image of the
>>> product -->
>>> + <a
>>>
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${cartLine.getProductId()} -
>>> + ${cartLine.getName()!}</a> :
>>> ${cartLine.getDescription()!}
>>> +
>>> + <#-- display the registered ship groups and
>>> quantity -->
>>> + <#assign itemShipGroups =
>>> cart.getShipGroups(cartLine)>
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <div class="tabletext">
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <b>Group - </b>${groupNumber} /
>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>> + </div>
>>> + </#list>
>>> +
>>> + <#-- if inventory is not required check to see if
>>> it is out of stock and needs to have a message shown about that... -->
>>> + <#assign itemProduct = cartLine.getProduct()>
>>> + <#assign
>>> isStoreInventoryNotRequiredAndNotAvailable
>>> =
>>>
>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>> itemProduct, cartLine.getQuantity(), false, false)>
>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>> itemProduct.inventoryMessage?has_content>
>>> + <b>(${itemProduct.inventoryMessage})</b>
>>> + </#if>
>>> +
>>> + <#else>
>>> + <#-- this is a non-product item -->
>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>> ${cartLine.getName()!}
>>> + </#if>
>>> + </div>
>>> +
>>> + </td>
>>> + <td align="right">
>>> + <div
>>>
>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td align="center">
>>> + <input size="6" class="inputBox" type="text"
>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>> + <select name="fromGroupIndex" class="selectBox">
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <option
>>> value="${group.getKey()}">${uiLabelMap.CommonGroup}
>>> ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>> + <select name="toGroupIndex" class="selectBox">
>>> + <#list 0..(cart.getShipGroupSize() - 1) as
>>> groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>> + </#list>
>>> + <option value="-1">${uiLabelMap.CommonNew}
>>> ${uiLabelMap.CommonGroup}</option>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td><input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>> + </form>
>>> + </tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<table>
>>> + <tr valign="top">
>>> + <td>
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>> + </td>
>>> + <td align="right">
>>> + <a href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>> + </td>
>>> + </tr>
>>> +</table>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,64 @@
>>> +<#--
>>> +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.
>>> +-->
>>> +
>>> +<#-- ==================== Party Listing dialog box
>>> ========================= -->
>>> +<#if additionalPartyRoleMap?has_content>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table border="0" width="100%" cellpadding="0">
>>> + <#list roleList as role>
>>> + <tr>
>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>> locale)}</div></td>
>>> + </tr>
>>> + <tr>
>>> + <td colspan="4"><hr /></td>
>>> + </tr>
>>> + <#list additionalPartyRoleMap[role] as party>
>>> + <tr>
>>> + <td><div>${party}</div></td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].firstName!}
>>> + <#else>
>>> + ${partyData[party].groupName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].lastName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td align="right">
>>> + <a
>>>
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>> + </td>
>>> + </tr>
>>> + </#list>
>>> + <tr><td> </td></tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon
>>> Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,80 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>> cellpadding='0' class='boxoutside'>
>>> + <tr><td>
>>> +
>>> + <#-- header table -->
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxtop'>
>>> + <tr>
>>> + <td valign="middle">
>>> + <div
>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> +
>>> + <#-- postal addresses for chosen id -->
>>> +
>>> + <#if partyContactMechPurposes??>
>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>> + <#assign shippingAddress =
>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>> +
>>> + <#-- skip non-postal addresses -->
>>> +
>>> + <#if shippingAddress.toName??>
>>> + <tr>
>>> + <td valign="top" nowrap="nowrap">
>>> + <input type="radio" name="shipping_contact_mech_id"
>>> value="${partyContactMechPurpose.contactMechId}" />
>>> + </td>
>>> + <td nowrap="nowrap"> </td>
>>> + <td width="100%">
>>> + <div>
>>> + <#if
>>>
>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>> /></#if>
>>> + <#if
>>>
>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>> + <#if
>>> shippingAddress.stateProvinceGeoId?has_content><br
>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>> + <#if shippingAddress.postalCode?has_content><br
>>> />${shippingAddress.postalCode}</#if>
>>> + <#if shippingAddress.countryGeoId?has_content><br
>>> />${shippingAddress.countryGeoId}</#if>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + </#list>
>>> + </#if>
>>> +
>>> + </table>
>>> +
>>> + </td></tr>
>>> + </table>
>>> +</form>
>>> +
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon
>>> Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,516 @@
>>> +<#--
>>> +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 type="text/javascript">
>>> +//<![CDATA[
>>> +function shipBillAddr() {
>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>> + window.location =
>>>
>>> "<@o...@ofbizUrl>";
>>> + } else {
>>> + window.location =
>>>
>>> "<@o...@ofbizUrl>";
>>> + }
>>> +}
>>> +
>>> +function makeExpDate() {
>>> + document.checkoutsetupform.expireDate.value =
>>>
>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>> + "/" +
>>>
>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<div class="screenlet">
>>> + <div class="screenlet-body">
>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>> !requestParameters.createNew??)>
>>> + <#-- initial screen when we have a associated party -->
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>> border="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>
>>
Re: svn commit: r1736868 [1/20] - in
/ofbiz/trunk/applications/order: template/ template/entry/
template/entry/cart/ template/entry/catalog/ template/entry/order/
template/order/ template/product/ template/quote/ template/reports/
template/request/ templat...
Posted by Jacques Le Roux <ja...@les7arts.com>.
This is now done properly with history and annotations restored.
Jacques
Le 02/04/2016 12:40, Jacques Le Roux a écrit :
> You are right Deepak!
>
> We not only lose history when doing so but we also lose annotation which is even more annoying.
>
> I will revert all the recent changes I committed and we (committers) need to do the job directly in our working copies.
>
> So I'm happy from help from other committers to do so. I think it's even easier for us than applying patches, etc.
>
> Note: patches should never be used to move files, we all (committers at least) need to remember that, my bad sorry :/
>
> Thanks
>
> Jacques
>
> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>> Hi Jacques,
>>
>> I think we need to use svn mv command to move files to new location else we
>> will lose the svn history of all files.
>>
>> Thanks & Regards
>> --
>> Deepak Dixit
>> www.hotwaxsystems.com
>>
>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>
>>> Author: jleroux
>>> Date: Mon Mar 28 11:14:22 2016
>>> New Revision: 1736868
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>> Log:
>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/
>>> ofbiz/trunk/applications/order/template/entry/
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with props)
>>> ofbiz/trunk/applications/order/template/order/
>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/transitions.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/product/
>>>
>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/
>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/reports/
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/request/
>>>
>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/
>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnList.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/setup/
>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/task/
>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl (with
>>> props)
>>> Modified:
>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,40 @@
>>> +<#--
>>> +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="screenlet">
>>> +<div class="screenlet-title-bar">
>>> + <ul>
>>> + <#if orderHeader?has_content>
>>> + <li class="h3">
>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>> + </li>
>>> + <#else>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>> + </#if>
>>> + </ul>
>>> +</div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,52 @@
>>> +<#--
>>> +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 stepTitleId??>
>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>> +</#if>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + : ${stepTitle!}
>>> + </li>
>>> +
>>> + <#if isLastStep == "N">
>>> + <li><a
>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>> + </#if>
>>> +
>>> + <#list checkoutSteps?reverse as checkoutStep>
>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>> + <#if checkoutStep.enabled == "N">
>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>> + </#if>
>>> + </#list>
>>> + </ul>
>>> + <br class="clear" />
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Mon
>>> Mar 28 11:14:22 2016
>>> @@ -0,0 +1,60 @@
>>> +<#--
>>> +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="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>> (shoppingCart.size() = 0)>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>
>>> + </#if>
>>> + <#else>
>>> + <#if shoppingCart.size() = 0>
>>> + <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>> + <li
>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>> + </#if>
>>> + </#if>
>>> +
>>> + <#if (shoppingCart.size() > 0)>
>>> + <li><a
>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>> + <li><a
>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>> + <#else>
>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>> + </#if>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>> + </ul>
>>> + <br class="clear">
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,112 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="removeEmptyShipGroups"/>
>>> +</form>
>>> +
>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>> class='boxoutside'>
>>> +<tr>
>>> + <td width='100%'>
>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr>
>>> + <td>
>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>> + <#assign shipGroupIndex = currIndex - 1>
>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>> + <table width="100%" cellpadding="1" border="0"
>>> cellpadding="0" cellspacing="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <h1>${uiLabelMap.OrderShipGroup}
>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>> ${uiLabelMap.OrderDropShipped} -
>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td>
>>> + <div>${uiLabelMap.ProductProduct}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>> + </td>
>>> + </tr>
>>> +
>>> + <#assign shipGroupItems =
>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>> + <#assign shoppingCartItems =
>>> shipGroupItems.keySet().iterator()>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>> + <#assign rowCount = 0>
>>> + <#list shoppingCartItems as shoppingCartItem>
>>> + <#assign cartLineIndex =
>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>> + <#assign shipGroupItemQuantity =
>>> shipGroupItems.get(shoppingCartItem)>
>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>> value="${cartLineIndex}"/>
>>> + <input type="hidden"
>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>> value="${shipGroupIndex}"/>
>>> + <tr>
>>> + <td>
>>> + <div>[${shoppingCartItem.getProductId()}]
>>> ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div>
>>> + </td>
>>> + <td>
>>> + <div>${shipGroupItemQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div><input type="text" name="quantity_o_${rowCount}"
>>> value="${shipGroupItemQuantity}"/></div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="toGroupIndex_o_${rowCount}">
>>> + <option value="${shipGroupIndex}">---</option>
>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>> groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>> ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <#assign rowCount = rowCount + 1>
>>> + </#list>
>>> + <#if (rowCount > 0)>
>>> + <tr>
>>> + <td colspan="3"> </td>
>>> + <td>
>>> + <input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> + </table>
>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>> + </form>
>>> + </#list>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </td>
>>> + </tr>
>>> +</table>
>>> +
>>> +<br />
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar 28
>>> 11:14:22 2016
>>> @@ -0,0 +1,263 @@
>>> +<#--
>>> +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">
>>> +//<![CDATA[
>>> +function submitForm(form, mode, value) {
>>> + if (mode == "DN") {
>>> + // done action; payment info
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "CS") {
>>> + // continue shopping
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "NA") {
>>> + // new address
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>>
>>> + form.submit();
>>> + } else if (mode == "SV") {
>>> + // save option; return to current screen
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "SA") {
>>> + // selected shipping address
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + }
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <#assign shipGroups = cart.getShipGroups()>
>>> + <#if (shipGroups.size() > 0)>
>>> + <#assign groupIdx = 0>
>>> + <#list shipGroups as group>
>>> + <#assign shipEstimateWrapper =
>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>> cart, groupIdx)>
>>> + <#assign carrierShipmentMethods =
>>> shipEstimateWrapper.getShippingMethods()>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <form method="post" action="#"
>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>> + <input type="hidden" name="groupIndex"
>>> value="${groupIdx}"/>
>>> + <tr>
>>> + <td>
>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>> ${groupNumber}:</b></div>
>>> + <#list group.getShipItems() as item>
>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>> + <div
>>> class="tabletext"> ${item.getName()} -
>>> (${groupItem.getItemQuantity()})</div>
>>> + </#list>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <span
>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>> + <a
>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');"
>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>> + </div>
>>> + <div>
>>> + <#assign selectedContactMechId =
>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>> + <select name="shippingContactMechId"
>>> class="selectBox"
>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>> null);">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>> + <#list shippingContactMechList as
>>> shippingContactMech>
>>> + <#assign shippingAddress =
>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>> + <option
>>> value="${shippingAddress.contactMechId}" <#if
>>> (shippingAddress.contactMechId ==
>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>> + <#assign selectedShippingMethod =
>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>> cart.getCarrierPartyId(groupIdx)>
>>> + <#else>
>>> + <#assign selectedShippingMethod = "">
>>> + </#if>
>>> + <select name="shipmentMethodString" class="selectBox">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>> + <#list carrierShipmentMethods as
>>> carrierShipmentMethod>
>>> + <#assign shippingEst =
>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>> + <#assign shippingMethod =
>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>> carrierShipmentMethod.partyId>
>>> + <option value="${shippingMethod}" <#if
>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>> + ${carrierShipmentMethod.partyId!}
>>> + </#if>
>>> + ${carrierShipmentMethod.description!}
>>> + <#if shippingEst?has_content>
>>> + -
>>> + <#if (shippingEst > -1)>
>>> + <@ofbizCurrency amount=shippingEst
>>> isoCode=cart.getCurrency()/>
>>> + <#else>
>>> + ${uiLabelMap.OrderCalculatedOffline}
>>> + </#if>
>>> + </#if>
>>> + </option>
>>> + </#list>
>>> + </select>
>>> +
>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>> wrap="hard"
>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="maySplit" class="selectBox">
>>> + <#assign maySplitStr =
>>> cart.getMaySplit(groupIdx)?default("")>
>>> + <option
>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>> + <option value="false" <#if maySplitStr ==
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>> + <option value="true" <#if maySplitStr ==
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>> + </select>
>>> + </div>
>>> + <div>
>>> + <select name="isGift" class="selectBox">
>>> + <#assign isGiftStr =
>>> cart.getIsGift(groupIdx)?default("")>
>>> + <option value="">${uiLabelMap.OrderIsGift}
>>> ?</option>
>>> + <option value="false" <#if isGiftStr ==
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>> + <option value="true" <#if isGiftStr ==
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>> + </select>
>>> + </div>
>>> +
>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>> wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>> + </td>
>>> + <td><input type="button" class="smallSubmit"
>>> value="${uiLabelMap.CommonSave}"
>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>> null);"/></td>
>>> + </tr>
>>> + <#assign groupIdx = groupIdx + 1>
>>> + <#if group_has_next>
>>> + <tr>
>>> + <td colspan="6"><hr /></td>
>>> + </tr>
>>> + </#if>
>>> + </form>
>>> + </#list>
>>> + <#else>
>>> + <div
>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>> + </#if>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <tr>
>>> + <td><div
>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>> + <td> </td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>> + <td> </td>
>>> + <td> </td>
>>> + </tr>
>>> +
>>> + <#list cart.items() as cartLine>
>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>> + <tr>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>> style="margin: 0;">
>>> + <input type="hidden" name="itemIndex"
>>> value="${cartLineIndex}"/>
>>> + <td>
>>> + <div class="tabletext">
>>> + <#if cartLine.getProductId()??>
>>> + <#-- product item -->
>>> + <#-- start code to display a small image of the
>>> product -->
>>> + <#assign smallImageUrl =
>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>> + <#if !smallImageUrl?string?has_content><#assign
>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>> + <#if smallImageUrl?string?has_content>
>>> + <a
>>> href="<@o...@ofbizUrl>">
>>> + <img
>>> src="<@o...@ofbizContentUrl>"
>>> class="cssImgSmall" alt="" />
>>> + </a>
>>> + </#if>
>>> + <#-- end code to display a small image of the
>>> product -->
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${cartLine.getProductId()} -
>>> + ${cartLine.getName()!}</a> :
>>> ${cartLine.getDescription()!}
>>> +
>>> + <#-- display the registered ship groups and
>>> quantity -->
>>> + <#assign itemShipGroups =
>>> cart.getShipGroups(cartLine)>
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <div class="tabletext">
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <b>Group - </b>${groupNumber} /
>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>> + </div>
>>> + </#list>
>>> +
>>> + <#-- if inventory is not required check to see if
>>> it is out of stock and needs to have a message shown about that... -->
>>> + <#assign itemProduct = cartLine.getProduct()>
>>> + <#assign isStoreInventoryNotRequiredAndNotAvailable
>>> =
>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>> itemProduct, cartLine.getQuantity(), false, false)>
>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>> itemProduct.inventoryMessage?has_content>
>>> + <b>(${itemProduct.inventoryMessage})</b>
>>> + </#if>
>>> +
>>> + <#else>
>>> + <#-- this is a non-product item -->
>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>> ${cartLine.getName()!}
>>> + </#if>
>>> + </div>
>>> +
>>> + </td>
>>> + <td align="right">
>>> + <div
>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td align="center">
>>> + <input size="6" class="inputBox" type="text"
>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>> + <select name="fromGroupIndex" class="selectBox">
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <option
>>> value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>> + <select name="toGroupIndex" class="selectBox">
>>> + <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>> + </#list>
>>> + <option value="-1">${uiLabelMap.CommonNew}
>>> ${uiLabelMap.CommonGroup}</option>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td><input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>> + </form>
>>> + </tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<table>
>>> + <tr valign="top">
>>> + <td>
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>> + </td>
>>> + <td align="right">
>>> + <a href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>> + </td>
>>> + </tr>
>>> +</table>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,64 @@
>>> +<#--
>>> +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.
>>> +-->
>>> +
>>> +<#-- ==================== Party Listing dialog box
>>> ========================= -->
>>> +<#if additionalPartyRoleMap?has_content>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table border="0" width="100%" cellpadding="0">
>>> + <#list roleList as role>
>>> + <tr>
>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>> locale)}</div></td>
>>> + </tr>
>>> + <tr>
>>> + <td colspan="4"><hr /></td>
>>> + </tr>
>>> + <#list additionalPartyRoleMap[role] as party>
>>> + <tr>
>>> + <td><div>${party}</div></td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].firstName!}
>>> + <#else>
>>> + ${partyData[party].groupName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].lastName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td align="right">
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>> + </td>
>>> + </tr>
>>> + </#list>
>>> + <tr><td> </td></tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,80 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>> cellpadding='0' class='boxoutside'>
>>> + <tr><td>
>>> +
>>> + <#-- header table -->
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxtop'>
>>> + <tr>
>>> + <td valign="middle">
>>> + <div
>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> +
>>> + <#-- postal addresses for chosen id -->
>>> +
>>> + <#if partyContactMechPurposes??>
>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>> + <#assign shippingAddress =
>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>> +
>>> + <#-- skip non-postal addresses -->
>>> +
>>> + <#if shippingAddress.toName??>
>>> + <tr>
>>> + <td valign="top" nowrap="nowrap">
>>> + <input type="radio" name="shipping_contact_mech_id"
>>> value="${partyContactMechPurpose.contactMechId}" />
>>> + </td>
>>> + <td nowrap="nowrap"> </td>
>>> + <td width="100%">
>>> + <div>
>>> + <#if
>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
>>> + <#if
>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
>>> + <#if
>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>> + <#if
>>> shippingAddress.stateProvinceGeoId?has_content><br
>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>> + <#if shippingAddress.postalCode?has_content><br
>>> />${shippingAddress.postalCode}</#if>
>>> + <#if shippingAddress.countryGeoId?has_content><br
>>> />${shippingAddress.countryGeoId}</#if>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + </#list>
>>> + </#if>
>>> +
>>> + </table>
>>> +
>>> + </td></tr>
>>> + </table>
>>> +</form>
>>> +
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,516 @@
>>> +<#--
>>> +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 type="text/javascript">
>>> +//<![CDATA[
>>> +function shipBillAddr() {
>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>> + window.location =
>>> "<@o...@ofbizUrl>";
>>> + } else {
>>> + window.location =
>>> "<@o...@ofbizUrl>";
>>> + }
>>> +}
>>> +
>>> +function makeExpDate() {
>>> + document.checkoutsetupform.expireDate.value =
>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>> + "/" +
>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<div class="screenlet">
>>> + <div class="screenlet-body">
>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>> !requestParameters.createNew??)>
>>> + <#-- initial screen when we have a associated party -->
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>> border="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <a href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <#if billingAccountList?has_content>
>>> + <tr>
>>> + <td width="1%">
>>> + <select name="billingAccountId">
>>> + <option value=""></option>
>>> + <#list billingAccountList as billingAccount>
>>> + <#assign availableAmount =
>>> billingAccount.accountBalance?double>
>>> + <#if (billingAccount.accountLimit)??>
>>> + <#assign accountLimit =
>>> billingAccount.accountLimit?double />
>>> + <#else>
>>> + <#assign accountLimit = 0.00 />
>>> + </#if>
>>> + <option
>>> value="${billingAccount.billingAccountId}" <#if
>>> billingAccount.billingAccountId ==
>>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit:
>>> <@ofbizCurrency amount=accountLimit
>>> isoCode=billingAccount.accountCurrencyUomId/></option>
>>> + </#list>
>>> + </select>
>>> + </td>
>>> + <td width="50%">
>>> +
>>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>>> + </td>
>>> + <td> </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="1%" align="right">
>>> + <input type="text" size="5"
>>> name="billingAccountAmount" value=""/>
>>> + </td>
>>> + <td width="50%">
>>> + ${uiLabelMap.OrderBillUpTo}
>>> + </td>
>>> + <td> </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio" id="checkOutPaymentId_EXT_OFFLINE"
>>> name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? &&
>>> checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
>>> + </td>
>>> + <td colspan="2" width="50%">
>>> + <label
>>> for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio" id="checkOutPaymentId_EXT_COD"
>>> name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? &&
>>> checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
>>> + </td>
>>> + <td colspan="2" width="50%">
>>> + <label
>>> for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <#if paymentMethodList?has_content>
>>> + <#list paymentMethodList as paymentMethod>
>>> + <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
>>> + <#assign creditCard =
>>> paymentMethod.getRelatedOne("CreditCard", false)>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio"
>>> id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}"
>>> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
>>> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
>>> checkOutPaymentId>checked="checked"</#if>/>
>>> + </td>
>>> + <td width="50%">
>>> + <label
>>> for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}">
>>> +
>>> CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
>>> + <#if
>>> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
>>> + </label>
>>> + <span>
>>> + ${uiLabelMap.OrderCardSecurityCode} <input
>>> type="text" size="5" maxlength="10"
>>> name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
>>> + </span>
>>> + </td>
>>> + <td align="right"><a
>>> href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
>>> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
>>> + </tr>
>>> + <#elseif paymentMethod.paymentMethodTypeId ==
>>> "EFT_ACCOUNT">
>>> + <#assign eftAccount =
>>> paymentMethod.getRelatedOne("EftAccount", false)>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio"
>>> id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}"
>>> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
>>> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
>>> checkOutPaymentId>checked="checked"</#if>/>
>>> + </td>
>>> + <td width="50%">
>>> + <label
>>> for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}">
>>> + EFT: ${eftAccount.bankName!}:
>>> ${eftAccount.accountNumber!}
>>> + <#if
>>> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
>>> + </label>
>>> + </td>
>>> + <td align="right"><a
>>> href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
>>> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + </#if>
>>> + </#list>
>>> + <#else>
>>> + <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
>>> + </#if>
>>> + </table>
>>> + </form>
>>> + <#elseif paymentMethodType?? || finalizeMode?default("") ==
>>> "payment">
>>> + <#-- after initial screen; show detailed screens for selected
>>> type -->
>>> + <#if paymentMethodType == "CC">
>>> + <#if postalAddress?has_content>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="paymentMethodId"
>>> value="${creditCard.paymentMethodId!}"/>
>>> + <input type="hidden" name="contactMechId"
>>> value="${postalAddress.contactMechId!}"/>
>>> + <#elseif requestParameters.useShipAddr??>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <#else>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + </#if>
>>> + </#if>
>>> + <#if paymentMethodType == "EFT">
>>> + <#if postalAddress?has_content>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="paymentMethodId"
>>> value="${eftAccount.paymentMethodId!}"/>
>>> + <input type="hidden" name="contactMechId"
>>> value="${postalAddress.contactMechId!}"/>
>>> + <#elseif requestParameters.useShipAddr??>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>> + <#else>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + </#if>
>>> + </#if>
>>> +
>>> + <input type="hidden" name="contactMechTypeId"
>>> value="POSTAL_ADDRESS"/>
>>> + <input type="hidden" name="partyId"
>>> value="${cart.getPartyId()}"/>
>>> + <input type="hidden" name="paymentMethodType"
>>> value="${paymentMethodType}"/>
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <input type="hidden" name="createNew" value="Y"/>
>>> + <#if requestParameters.useShipAddr??>
>>> + <input type="hidden" name="contactMechId"
>>> value="${postalFields.contactMechId}"/>
>>> + </#if>
>>> +
>>> + <table width="100%" border="0" cellpadding="1" cellspacing="0">
>>> + <#if cart.getShippingContactMechId()??>
>>> + <tr>
>>> + <td width="26%" align="right"= valign="top">
>>> + <input type="checkbox" name="useShipAddr" value="Y"
>>> onclick="javascript:shipBillAddr();" <#if
>>> requestParameters.useShipAddr??>checked="checked"</#if>/>
>>> + </td>
>>> + <td colspan="2" valign="center">
>>> +
>>> <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td colspan="3"><hr /></td>
>>> + </tr>
>>> + </#if>
>>> +
>>> + <#if orderPerson?has_content>
>>> + <#assign toName = "">
>>> + <#if orderPerson.personalTitle?has_content><#assign toName
>>> = orderPerson.personalTitle + " "></#if>
>>> + <#assign toName = toName + orderPerson.firstName + " ">
>>> + <#if orderPerson.middleName?has_content><#assign toName =
>>> toName + orderPerson.middleName + " "></#if>
>>> + <#assign toName = toName + orderPerson.lastName>
>>> + <#if orderPerson.suffix?has_content><#assign toName =
>>> toName + " " + orderPerson.suffix></#if>
>>> + <#else>
>>> + <#assign toName = postalFields.toName?default("")>
>>> + </#if>
>>> +
>>> + <#-- generic address information -->
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonToName}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60" name="toName"
>>> value="${toName}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="attnName" value="${postalFields.attnName!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="30"
>>> name="address1" value="${postalFields.address1!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="30"
>>> name="address2" value="${postalFields.address2!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonCity}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="30" name="city"
>>> value="${postalFields.city!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="stateProvinceGeoId" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>>
>>> + <#if postalFields.stateProvinceGeoId??>
>>> + <option>${postalFields.stateProvinceGeoId}</option>
>>> + <option
>>> value="${postalFields.stateProvinceGeoId}">---</option>
>>> + </#if>
>>> + <option value=""></option>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#states")}
>>> + </select>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="12" maxlength="10"
>>> name="postalCode" value="${postalFields.postalCode!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="countryGeoId" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>>
>>> + <#if postalFields.countryGeoId??>
>>> + <option>${postalFields.countryGeoId}</option>
>>> + <option
>>> value="${postalFields.countryGeoId}">---</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#countries")}
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> +
>>> + <#-- credit card fields -->
>>> + <#if paymentMethodType == "CC">
>>> + <#if !creditCard?has_content>
>>> + <#assign creditCard = requestParameters>
>>> + </#if>
>>> + <input type="hidden" name="expireDate"
>>> value="${creditCard.expireDate!}"/>
>>> + <tr>
>>> + <td colspan="3"><hr /></td>
>>> + </tr>
>>> +
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" class='inputBox' size="30"
>>> maxlength="60" name="companyNameOnCard"
>>> value="${creditCard.companyNameOnCard!}"/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingPrefixCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="titleOnCard">
>>> + <option
>>> value="">${uiLabelMap.CommonSelectOne}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
>>> + </select>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="60"
>>> name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="15" maxlength="60"
>>> name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="60"
>>> name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingSuffixCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="suffixOnCard">
>>> + <option
>>> value="">${uiLabelMap.CommonSelectOne}</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "Jr.")> checked="checked"</#if>>Jr.</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "Sr.")> checked="checked"</#if>>Sr.</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "I")> checked="checked"</#if>>I</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "II")> checked="checked"</#if>>II</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "III")> checked="checked"</#if>>III</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "IV")> checked="checked"</#if>>IV</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "V")> checked="checked"</#if>>V</option>
>>> + </select>
>>> + </td>
>>> + </tr>
>>> +
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingCardType}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="cardType">
>>> + <#if creditCard.cartType??>
>>> + <option>${creditCard.cardType}</option>
>>> + <option value="${creditCard.cardType}">---</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="30"
>>> name="cardNumber" value="${creditCard.cardNumber!}"/>
>>> + *</td>
>>> + </tr>
>>> + <#--<tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.OrderCardSecurityCode}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="5" maxlength="10"
>>> name="cardSecurityCode" value=""/>
>>> + </td>
>>> + </tr>-->
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <#assign expMonth = "">
>>> + <#assign expYear = "">
>>> + <#if creditCard?? && creditCard.expDate??>
>>> + <#assign expDate = creditCard.expireDate>
>>> + <#if (expDate?? && expDate.indexOf("/") > 0)>
>>> + <#assign expMonth =
>>> expDate.substring(0,expDate.indexOf("/"))>
>>> + <#assign expYear =
>>> expDate.substring(expDate.indexOf("/")+1)>
>>> + </#if>
>>> + </#if>
>>> + <select name="expMonth"
>>> onchange="javascript:makeExpDate();">
>>> + <#if creditCard?has_content &&
>>> expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign
>>> ccExprMonth = requestParameters.expMonth!></#if>
>>> + <#if ccExprMonth?has_content>
>>> + <option
>>> value="${ccExprMonth!}">${ccExprMonth!}</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
>>> + </select>
>>> + <select name="expYear"
>>> onchange="javascript:makeExpDate();">
>>> + <#if creditCard?has_content &&
>>> expYear?has_content><#assign ccExprYear = expYear><#else><#assign
>>> ccExprYear = requestParameters.expYear!></#if>
>>> + <#if ccExprYear?has_content>
>>> + <option
>>> value="${ccExprYear!}">${ccExprYear!}</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="30"
>>> name="description" value="${creditCard.description!}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> +
>>> + <#-- eft fields -->
>>> + <#if paymentMethodType =="EFT">
>>> + <#if !eftAccount?has_content>
>>> + <#assign eftAccount = requestParameters>
>>> + </#if>
>>> + <tr>
>>> + <td colspan="3"><hr /></td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="bankName" value="${eftAccount.bankName!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="10" maxlength="30"
>>> name="routingNumber" value="${eftAccount.routingNumber!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="accountType">
>>> + <option>${eftAccount.accountType!}</option>
>>> + <option></option>
>>> + <option>Checking</option>
>>> + <option>Savings</option>
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="40"
>>> name="accountNumber" value="${eftAccount.accountNumber!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="description" value="${eftAccount.description!}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> + </table>
>>> + <#else>
>>> + <#-- initial screen show a list of options -->
>>> +
>>> + <script type="text/javascript">
>>> +
>>> + function setCheckoutPaymentId( selectedValue ) {
>>> + checkoutForm =
>>> document.getElementById('checkoutsetupform');
>>> + if( selectedValue.match('^EXT_.*') ) {
>>> + checkoutForm.action =
>>> '<@o...@ofbizUrl>?checkOutPaymentId=' + selectedValue ;
>>> + } else {
>>> + checkoutForm.action =
>>> '<@o...@ofbizUrl>?paymentMethodType=' + selectedValue ;
>>> + }
>>> + }
>>> + </script>
>>> +
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform"
>>> id="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <input type="hidden" name="createNew"
>>> value="${(requestParameters.createNew)!}"/>
>>> + <table width="100%" border="0" cellpadding="1"
>>> cellspacing="0">
>>> + <#if "Y" != requestParameters.createNew?default("")>
>>> + <tr>
>>> + <td width='1%' nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId??
>>> && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/></td>
>>> + <td width='50%'
>>> nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + <tr>
>>> + <td width="1%" nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? &&
>>> checkOutPaymentId == "EXT_COD">checked="checked"</#if>
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/></td>
>>> + <td width="50%"
>>> nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + </#if>
>>> + <tr>
>>> + <td width='1%' nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="CC"
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/>
>>> + <td width='50%'
>>> nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + <tr>
>>> + <td width='1%' nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="EFT"
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/>
>>> + <td width='50%'
>>> nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
>>> + </tr>
>>> + </table>
>>> + </form>
>>> + </#if>
>>> + </div>
>>> +</div>
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,61 @@
>>> +<#--
>>> +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.
>>> +-->
>>> +
>>> +<!-- Screenlet to add cart to shopping list. The shopping lists are
>>> presented in a dropdown box. -->
>>> +
>>> +<#if (shoppingLists??) && (shoppingCartSize > 0)>
>>> + <div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table border="0" cellspacing="0" cellpadding="0">
>>> + <tr>
>>> + <td>
>>> + <form method="post" name="addBulkToShoppingList"
>>> action="<@o...@ofbizUrl>" style='margin: 0;'>
>>> + <#assign index = 0/>
>>> + <#list shoppingCart.items() as cartLine>
>>> + <#if (cartLine.getProductId()??) &&
>>> !cartLine.getIsPromo()>
>>> + <input type="hidden" name="selectedItem"
>>> value="${index}"/>
>>> + </#if>
>>> + <#assign index = index + 1/>
>>> + </#list>
>>> + <table border="0">
>>> + <tr>
>>> + <td>
>>> + <div>
>>> + <select name='shoppingListId'>
>>> + <#list shoppingLists as shoppingList>
>>> + <option
>>> value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
>>> + </#list>
>>> + <option value="">---</option>
>>> + <option
>>> value="">${uiLabelMap.OrderNewShoppingList}</option>
>>> + </select>
>>> + <input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.OrderAddToShoppingList}"/>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </form>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </div>
>>> + </div>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,47 @@
>>> +<#--
>>> +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 (shoppingCart.getOrderType() == "SALES_ORDER")>
>>> + <#assign associatedProducts =
>>> Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request,
>>> true)!>
>>> +</#if>
>>> +
>>> +<#if associatedProducts?has_content>
>>> + <div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderHelpAlsoInterestedIn}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table cellspacing="0" cellpadding="1" border="0">
>>> + <#-- random complementary products -->
>>> + <#list associatedProducts as assocProduct>
>>> + <tr>
>>> + <td>
>>> + ${setRequestAttribute("optProduct", assocProduct)}
>>> + ${setRequestAttribute("listIndex", assocProduct_index)}
>>> + ${screens.render(productsummaryScreen)}
>>> + </td>
>>> + </tr>
>>> + <#if assocProduct_has_next>
>>> + <tr><td><hr/></td></tr>
>>> + </#if>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> + </div>
>>> +</#if>
>>>
>>>
>>>
>>>
>
>
Re: svn commit: r1736868 [1/20] - in
/ofbiz/trunk/applications/order: template/ template/entry/
template/entry/cart/ template/entry/catalog/ template/entry/order/
template/order/ template/product/ template/quote/ template/reports/
template/request/ templat...
Posted by Jacques Le Roux <ja...@les7arts.com>.
And to complete what you said at OFBIZ-6822 "You can add patch for screen files where we need to update path. "
This is indeed were not privileged contributors can help. Of course it has to be synchronised with moving files in committer working copy before
committing
Jacques
Le 02/04/2016 12:40, Jacques Le Roux a écrit :
> You are right Deepak!
>
> We not only lose history when doing so but we also lose annotation which is even more annoying.
>
> I will revert all the recent changes I committed and we (committers) need to do the job directly in our working copies.
>
> So I'm happy from help from other committers to do so. I think it's even easier for us than applying patches, etc.
>
> Note: patches should never be used to move files, we all (committers at least) need to remember that, my bad sorry :/
>
> Thanks
>
> Jacques
>
> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>> Hi Jacques,
>>
>> I think we need to use svn mv command to move files to new location else we
>> will lose the svn history of all files.
>>
>> Thanks & Regards
>> --
>> Deepak Dixit
>> www.hotwaxsystems.com
>>
>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>
>>> Author: jleroux
>>> Date: Mon Mar 28 11:14:22 2016
>>> New Revision: 1736868
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>> Log:
>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/
>>> ofbiz/trunk/applications/order/template/entry/
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with props)
>>> ofbiz/trunk/applications/order/template/order/
>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/transitions.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/product/
>>>
>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/
>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/reports/
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/request/
>>>
>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/
>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnList.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/setup/
>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/task/
>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl (with
>>> props)
>>> Modified:
>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,40 @@
>>> +<#--
>>> +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="screenlet">
>>> +<div class="screenlet-title-bar">
>>> + <ul>
>>> + <#if orderHeader?has_content>
>>> + <li class="h3">
>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>> + </li>
>>> + <#else>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>> + </#if>
>>> + </ul>
>>> +</div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,52 @@
>>> +<#--
>>> +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 stepTitleId??>
>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>> +</#if>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + : ${stepTitle!}
>>> + </li>
>>> +
>>> + <#if isLastStep == "N">
>>> + <li><a
>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>> + </#if>
>>> +
>>> + <#list checkoutSteps?reverse as checkoutStep>
>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>> + <#if checkoutStep.enabled == "N">
>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>> + </#if>
>>> + </#list>
>>> + </ul>
>>> + <br class="clear" />
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Mon
>>> Mar 28 11:14:22 2016
>>> @@ -0,0 +1,60 @@
>>> +<#--
>>> +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="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>> (shoppingCart.size() = 0)>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>
>>> + </#if>
>>> + <#else>
>>> + <#if shoppingCart.size() = 0>
>>> + <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>> + <li
>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>> + </#if>
>>> + </#if>
>>> +
>>> + <#if (shoppingCart.size() > 0)>
>>> + <li><a
>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>> + <li><a
>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>> + <#else>
>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>> + </#if>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>> + </ul>
>>> + <br class="clear">
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,112 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="removeEmptyShipGroups"/>
>>> +</form>
>>> +
>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>> class='boxoutside'>
>>> +<tr>
>>> + <td width='100%'>
>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr>
>>> + <td>
>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>> + <#assign shipGroupIndex = currIndex - 1>
>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>> + <table width="100%" cellpadding="1" border="0"
>>> cellpadding="0" cellspacing="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <h1>${uiLabelMap.OrderShipGroup}
>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>> ${uiLabelMap.OrderDropShipped} -
>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td>
>>> + <div>${uiLabelMap.ProductProduct}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>> + </td>
>>> + </tr>
>>> +
>>> + <#assign shipGroupItems =
>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>> + <#assign shoppingCartItems =
>>> shipGroupItems.keySet().iterator()>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>> + <#assign rowCount = 0>
>>> + <#list shoppingCartItems as shoppingCartItem>
>>> + <#assign cartLineIndex =
>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>> + <#assign shipGroupItemQuantity =
>>> shipGroupItems.get(shoppingCartItem)>
>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>> value="${cartLineIndex}"/>
>>> + <input type="hidden"
>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>> value="${shipGroupIndex}"/>
>>> + <tr>
>>> + <td>
>>> + <div>[${shoppingCartItem.getProductId()}]
>>> ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div>
>>> + </td>
>>> + <td>
>>> + <div>${shipGroupItemQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div><input type="text" name="quantity_o_${rowCount}"
>>> value="${shipGroupItemQuantity}"/></div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="toGroupIndex_o_${rowCount}">
>>> + <option value="${shipGroupIndex}">---</option>
>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>> groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>> ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <#assign rowCount = rowCount + 1>
>>> + </#list>
>>> + <#if (rowCount > 0)>
>>> + <tr>
>>> + <td colspan="3"> </td>
>>> + <td>
>>> + <input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> + </table>
>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>> + </form>
>>> + </#list>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </td>
>>> + </tr>
>>> +</table>
>>> +
>>> +<br />
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar 28
>>> 11:14:22 2016
>>> @@ -0,0 +1,263 @@
>>> +<#--
>>> +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">
>>> +//<![CDATA[
>>> +function submitForm(form, mode, value) {
>>> + if (mode == "DN") {
>>> + // done action; payment info
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "CS") {
>>> + // continue shopping
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "NA") {
>>> + // new address
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>>
>>> + form.submit();
>>> + } else if (mode == "SV") {
>>> + // save option; return to current screen
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "SA") {
>>> + // selected shipping address
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + }
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <#assign shipGroups = cart.getShipGroups()>
>>> + <#if (shipGroups.size() > 0)>
>>> + <#assign groupIdx = 0>
>>> + <#list shipGroups as group>
>>> + <#assign shipEstimateWrapper =
>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>> cart, groupIdx)>
>>> + <#assign carrierShipmentMethods =
>>> shipEstimateWrapper.getShippingMethods()>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <form method="post" action="#"
>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>> + <input type="hidden" name="groupIndex"
>>> value="${groupIdx}"/>
>>> + <tr>
>>> + <td>
>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>> ${groupNumber}:</b></div>
>>> + <#list group.getShipItems() as item>
>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>> + <div
>>> class="tabletext"> ${item.getName()} -
>>> (${groupItem.getItemQuantity()})</div>
>>> + </#list>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <span
>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>> + <a
>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');"
>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>> + </div>
>>> + <div>
>>> + <#assign selectedContactMechId =
>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>> + <select name="shippingContactMechId"
>>> class="selectBox"
>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>> null);">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>> + <#list shippingContactMechList as
>>> shippingContactMech>
>>> + <#assign shippingAddress =
>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>> + <option
>>> value="${shippingAddress.contactMechId}" <#if
>>> (shippingAddress.contactMechId ==
>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>> + <#assign selectedShippingMethod =
>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>> cart.getCarrierPartyId(groupIdx)>
>>> + <#else>
>>> + <#assign selectedShippingMethod = "">
>>> + </#if>
>>> + <select name="shipmentMethodString" class="selectBox">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>> + <#list carrierShipmentMethods as
>>> carrierShipmentMethod>
>>> + <#assign shippingEst =
>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>> + <#assign shippingMethod =
>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>> carrierShipmentMethod.partyId>
>>> + <option value="${shippingMethod}" <#if
>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>> + ${carrierShipmentMethod.partyId!}
>>> + </#if>
>>> + ${carrierShipmentMethod.description!}
>>> + <#if shippingEst?has_content>
>>> + -
>>> + <#if (shippingEst > -1)>
>>> + <@ofbizCurrency amount=shippingEst
>>> isoCode=cart.getCurrency()/>
>>> + <#else>
>>> + ${uiLabelMap.OrderCalculatedOffline}
>>> + </#if>
>>> + </#if>
>>> + </option>
>>> + </#list>
>>> + </select>
>>> +
>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>> wrap="hard"
>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="maySplit" class="selectBox">
>>> + <#assign maySplitStr =
>>> cart.getMaySplit(groupIdx)?default("")>
>>> + <option
>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>> + <option value="false" <#if maySplitStr ==
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>> + <option value="true" <#if maySplitStr ==
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>> + </select>
>>> + </div>
>>> + <div>
>>> + <select name="isGift" class="selectBox">
>>> + <#assign isGiftStr =
>>> cart.getIsGift(groupIdx)?default("")>
>>> + <option value="">${uiLabelMap.OrderIsGift}
>>> ?</option>
>>> + <option value="false" <#if isGiftStr ==
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>> + <option value="true" <#if isGiftStr ==
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>> + </select>
>>> + </div>
>>> +
>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>> wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>> + </td>
>>> + <td><input type="button" class="smallSubmit"
>>> value="${uiLabelMap.CommonSave}"
>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>> null);"/></td>
>>> + </tr>
>>> + <#assign groupIdx = groupIdx + 1>
>>> + <#if group_has_next>
>>> + <tr>
>>> + <td colspan="6"><hr /></td>
>>> + </tr>
>>> + </#if>
>>> + </form>
>>> + </#list>
>>> + <#else>
>>> + <div
>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>> + </#if>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <tr>
>>> + <td><div
>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>> + <td> </td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>> + <td> </td>
>>> + <td> </td>
>>> + </tr>
>>> +
>>> + <#list cart.items() as cartLine>
>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>> + <tr>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>> style="margin: 0;">
>>> + <input type="hidden" name="itemIndex"
>>> value="${cartLineIndex}"/>
>>> + <td>
>>> + <div class="tabletext">
>>> + <#if cartLine.getProductId()??>
>>> + <#-- product item -->
>>> + <#-- start code to display a small image of the
>>> product -->
>>> + <#assign smallImageUrl =
>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>> + <#if !smallImageUrl?string?has_content><#assign
>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>> + <#if smallImageUrl?string?has_content>
>>> + <a
>>> href="<@o...@ofbizUrl>">
>>> + <img
>>> src="<@o...@ofbizContentUrl>"
>>> class="cssImgSmall" alt="" />
>>> + </a>
>>> + </#if>
>>> + <#-- end code to display a small image of the
>>> product -->
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${cartLine.getProductId()} -
>>> + ${cartLine.getName()!}</a> :
>>> ${cartLine.getDescription()!}
>>> +
>>> + <#-- display the registered ship groups and
>>> quantity -->
>>> + <#assign itemShipGroups =
>>> cart.getShipGroups(cartLine)>
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <div class="tabletext">
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <b>Group - </b>${groupNumber} /
>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>> + </div>
>>> + </#list>
>>> +
>>> + <#-- if inventory is not required check to see if
>>> it is out of stock and needs to have a message shown about that... -->
>>> + <#assign itemProduct = cartLine.getProduct()>
>>> + <#assign isStoreInventoryNotRequiredAndNotAvailable
>>> =
>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>> itemProduct, cartLine.getQuantity(), false, false)>
>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>> itemProduct.inventoryMessage?has_content>
>>> + <b>(${itemProduct.inventoryMessage})</b>
>>> + </#if>
>>> +
>>> + <#else>
>>> + <#-- this is a non-product item -->
>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>> ${cartLine.getName()!}
>>> + </#if>
>>> + </div>
>>> +
>>> + </td>
>>> + <td align="right">
>>> + <div
>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td align="center">
>>> + <input size="6" class="inputBox" type="text"
>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>> + <select name="fromGroupIndex" class="selectBox">
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <option
>>> value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>> + <select name="toGroupIndex" class="selectBox">
>>> + <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>> + </#list>
>>> + <option value="-1">${uiLabelMap.CommonNew}
>>> ${uiLabelMap.CommonGroup}</option>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td><input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>> + </form>
>>> + </tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<table>
>>> + <tr valign="top">
>>> + <td>
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>> + </td>
>>> + <td align="right">
>>> + <a href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>> + </td>
>>> + </tr>
>>> +</table>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,64 @@
>>> +<#--
>>> +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.
>>> +-->
>>> +
>>> +<#-- ==================== Party Listing dialog box
>>> ========================= -->
>>> +<#if additionalPartyRoleMap?has_content>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table border="0" width="100%" cellpadding="0">
>>> + <#list roleList as role>
>>> + <tr>
>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>> locale)}</div></td>
>>> + </tr>
>>> + <tr>
>>> + <td colspan="4"><hr /></td>
>>> + </tr>
>>> + <#list additionalPartyRoleMap[role] as party>
>>> + <tr>
>>> + <td><div>${party}</div></td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].firstName!}
>>> + <#else>
>>> + ${partyData[party].groupName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].lastName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td align="right">
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>> + </td>
>>> + </tr>
>>> + </#list>
>>> + <tr><td> </td></tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,80 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>> cellpadding='0' class='boxoutside'>
>>> + <tr><td>
>>> +
>>> + <#-- header table -->
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxtop'>
>>> + <tr>
>>> + <td valign="middle">
>>> + <div
>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> +
>>> + <#-- postal addresses for chosen id -->
>>> +
>>> + <#if partyContactMechPurposes??>
>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>> + <#assign shippingAddress =
>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>> +
>>> + <#-- skip non-postal addresses -->
>>> +
>>> + <#if shippingAddress.toName??>
>>> + <tr>
>>> + <td valign="top" nowrap="nowrap">
>>> + <input type="radio" name="shipping_contact_mech_id"
>>> value="${partyContactMechPurpose.contactMechId}" />
>>> + </td>
>>> + <td nowrap="nowrap"> </td>
>>> + <td width="100%">
>>> + <div>
>>> + <#if
>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
>>> + <#if
>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
>>> + <#if
>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>> + <#if
>>> shippingAddress.stateProvinceGeoId?has_content><br
>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>> + <#if shippingAddress.postalCode?has_content><br
>>> />${shippingAddress.postalCode}</#if>
>>> + <#if shippingAddress.countryGeoId?has_content><br
>>> />${shippingAddress.countryGeoId}</#if>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + </#list>
>>> + </#if>
>>> +
>>> + </table>
>>> +
>>> + </td></tr>
>>> + </table>
>>> +</form>
>>> +
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,516 @@
>>> +<#--
>>> +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 type="text/javascript">
>>> +//<![CDATA[
>>> +function shipBillAddr() {
>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>> + window.location =
>>> "<@o...@ofbizUrl>";
>>> + } else {
>>> + window.location =
>>> "<@o...@ofbizUrl>";
>>> + }
>>> +}
>>> +
>>> +function makeExpDate() {
>>> + document.checkoutsetupform.expireDate.value =
>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>> + "/" +
>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<div class="screenlet">
>>> + <div class="screenlet-body">
>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>> !requestParameters.createNew??)>
>>> + <#-- initial screen when we have a associated party -->
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>> border="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <a href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <#if billingAccountList?has_content>
>>> + <tr>
>>> + <td width="1%">
>>> + <select name="billingAccountId">
>>> + <option value=""></option>
>>> + <#list billingAccountList as billingAccount>
>>> + <#assign availableAmount =
>>> billingAccount.accountBalance?double>
>>> + <#if (billingAccount.accountLimit)??>
>>> + <#assign accountLimit =
>>> billingAccount.accountLimit?double />
>>> + <#else>
>>> + <#assign accountLimit = 0.00 />
>>> + </#if>
>>> + <option
>>> value="${billingAccount.billingAccountId}" <#if
>>> billingAccount.billingAccountId ==
>>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit:
>>> <@ofbizCurrency amount=accountLimit
>>> isoCode=billingAccount.accountCurrencyUomId/></option>
>>> + </#list>
>>> + </select>
>>> + </td>
>>> + <td width="50%">
>>> +
>>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>>> + </td>
>>> + <td> </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="1%" align="right">
>>> + <input type="text" size="5"
>>> name="billingAccountAmount" value=""/>
>>> + </td>
>>> + <td width="50%">
>>> + ${uiLabelMap.OrderBillUpTo}
>>> + </td>
>>> + <td> </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio" id="checkOutPaymentId_EXT_OFFLINE"
>>> name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? &&
>>> checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
>>> + </td>
>>> + <td colspan="2" width="50%">
>>> + <label
>>> for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio" id="checkOutPaymentId_EXT_COD"
>>> name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? &&
>>> checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
>>> + </td>
>>> + <td colspan="2" width="50%">
>>> + <label
>>> for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <#if paymentMethodList?has_content>
>>> + <#list paymentMethodList as paymentMethod>
>>> + <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
>>> + <#assign creditCard =
>>> paymentMethod.getRelatedOne("CreditCard", false)>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio"
>>> id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}"
>>> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
>>> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
>>> checkOutPaymentId>checked="checked"</#if>/>
>>> + </td>
>>> + <td width="50%">
>>> + <label
>>> for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}">
>>> +
>>> CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
>>> + <#if
>>> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
>>> + </label>
>>> + <span>
>>> + ${uiLabelMap.OrderCardSecurityCode} <input
>>> type="text" size="5" maxlength="10"
>>> name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
>>> + </span>
>>> + </td>
>>> + <td align="right"><a
>>> href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
>>> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
>>> + </tr>
>>> + <#elseif paymentMethod.paymentMethodTypeId ==
>>> "EFT_ACCOUNT">
>>> + <#assign eftAccount =
>>> paymentMethod.getRelatedOne("EftAccount", false)>
>>> + <tr>
>>> + <td width="1%">
>>> + <input type="radio"
>>> id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}"
>>> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
>>> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
>>> checkOutPaymentId>checked="checked"</#if>/>
>>> + </td>
>>> + <td width="50%">
>>> + <label
>>> for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}">
>>> + EFT: ${eftAccount.bankName!}:
>>> ${eftAccount.accountNumber!}
>>> + <#if
>>> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
>>> + </label>
>>> + </td>
>>> + <td align="right"><a
>>> href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
>>> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + </#if>
>>> + </#list>
>>> + <#else>
>>> + <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
>>> + </#if>
>>> + </table>
>>> + </form>
>>> + <#elseif paymentMethodType?? || finalizeMode?default("") ==
>>> "payment">
>>> + <#-- after initial screen; show detailed screens for selected
>>> type -->
>>> + <#if paymentMethodType == "CC">
>>> + <#if postalAddress?has_content>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="paymentMethodId"
>>> value="${creditCard.paymentMethodId!}"/>
>>> + <input type="hidden" name="contactMechId"
>>> value="${postalAddress.contactMechId!}"/>
>>> + <#elseif requestParameters.useShipAddr??>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <#else>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + </#if>
>>> + </#if>
>>> + <#if paymentMethodType == "EFT">
>>> + <#if postalAddress?has_content>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="paymentMethodId"
>>> value="${eftAccount.paymentMethodId!}"/>
>>> + <input type="hidden" name="contactMechId"
>>> value="${postalAddress.contactMechId!}"/>
>>> + <#elseif requestParameters.useShipAddr??>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>> + <#else>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + </#if>
>>> + </#if>
>>> +
>>> + <input type="hidden" name="contactMechTypeId"
>>> value="POSTAL_ADDRESS"/>
>>> + <input type="hidden" name="partyId"
>>> value="${cart.getPartyId()}"/>
>>> + <input type="hidden" name="paymentMethodType"
>>> value="${paymentMethodType}"/>
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <input type="hidden" name="createNew" value="Y"/>
>>> + <#if requestParameters.useShipAddr??>
>>> + <input type="hidden" name="contactMechId"
>>> value="${postalFields.contactMechId}"/>
>>> + </#if>
>>> +
>>> + <table width="100%" border="0" cellpadding="1" cellspacing="0">
>>> + <#if cart.getShippingContactMechId()??>
>>> + <tr>
>>> + <td width="26%" align="right"= valign="top">
>>> + <input type="checkbox" name="useShipAddr" value="Y"
>>> onclick="javascript:shipBillAddr();" <#if
>>> requestParameters.useShipAddr??>checked="checked"</#if>/>
>>> + </td>
>>> + <td colspan="2" valign="center">
>>> +
>>> <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td colspan="3"><hr /></td>
>>> + </tr>
>>> + </#if>
>>> +
>>> + <#if orderPerson?has_content>
>>> + <#assign toName = "">
>>> + <#if orderPerson.personalTitle?has_content><#assign toName
>>> = orderPerson.personalTitle + " "></#if>
>>> + <#assign toName = toName + orderPerson.firstName + " ">
>>> + <#if orderPerson.middleName?has_content><#assign toName =
>>> toName + orderPerson.middleName + " "></#if>
>>> + <#assign toName = toName + orderPerson.lastName>
>>> + <#if orderPerson.suffix?has_content><#assign toName =
>>> toName + " " + orderPerson.suffix></#if>
>>> + <#else>
>>> + <#assign toName = postalFields.toName?default("")>
>>> + </#if>
>>> +
>>> + <#-- generic address information -->
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonToName}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60" name="toName"
>>> value="${toName}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="attnName" value="${postalFields.attnName!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="30"
>>> name="address1" value="${postalFields.address1!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="30"
>>> name="address2" value="${postalFields.address2!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonCity}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="30" name="city"
>>> value="${postalFields.city!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="stateProvinceGeoId" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>>
>>> + <#if postalFields.stateProvinceGeoId??>
>>> + <option>${postalFields.stateProvinceGeoId}</option>
>>> + <option
>>> value="${postalFields.stateProvinceGeoId}">---</option>
>>> + </#if>
>>> + <option value=""></option>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#states")}
>>> + </select>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="12" maxlength="10"
>>> name="postalCode" value="${postalFields.postalCode!}" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="countryGeoId" <#if
>>> requestParameters.useShipAddr??>disabled="disabled"</#if>>
>>> + <#if postalFields.countryGeoId??>
>>> + <option>${postalFields.countryGeoId}</option>
>>> + <option
>>> value="${postalFields.countryGeoId}">---</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#countries")}
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> +
>>> + <#-- credit card fields -->
>>> + <#if paymentMethodType == "CC">
>>> + <#if !creditCard?has_content>
>>> + <#assign creditCard = requestParameters>
>>> + </#if>
>>> + <input type="hidden" name="expireDate"
>>> value="${creditCard.expireDate!}"/>
>>> + <tr>
>>> + <td colspan="3"><hr /></td>
>>> + </tr>
>>> +
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" class='inputBox' size="30"
>>> maxlength="60" name="companyNameOnCard"
>>> value="${creditCard.companyNameOnCard!}"/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingPrefixCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="titleOnCard">
>>> + <option
>>> value="">${uiLabelMap.CommonSelectOne}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
>>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>>> "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
>>> + </select>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="60"
>>> name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="15" maxlength="60"
>>> name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="60"
>>> name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="middle"><div>${uiLabelMap.AccountingSuffixCard}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="suffixOnCard">
>>> + <option
>>> value="">${uiLabelMap.CommonSelectOne}</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "Jr.")> checked="checked"</#if>>Jr.</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "Sr.")> checked="checked"</#if>>Sr.</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "I")> checked="checked"</#if>>I</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "II")> checked="checked"</#if>>II</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "III")> checked="checked"</#if>>III</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "IV")> checked="checked"</#if>>IV</option>
>>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>>> "V")> checked="checked"</#if>>V</option>
>>> + </select>
>>> + </td>
>>> + </tr>
>>> +
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingCardType}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="cardType">
>>> + <#if creditCard.cartType??>
>>> + <option>${creditCard.cardType}</option>
>>> + <option value="${creditCard.cardType}">---</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="30"
>>> name="cardNumber" value="${creditCard.cardNumber!}"/>
>>> + *</td>
>>> + </tr>
>>> + <#--<tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.OrderCardSecurityCode}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="5" maxlength="10"
>>> name="cardSecurityCode" value=""/>
>>> + </td>
>>> + </tr>-->
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <#assign expMonth = "">
>>> + <#assign expYear = "">
>>> + <#if creditCard?? && creditCard.expDate??>
>>> + <#assign expDate = creditCard.expireDate>
>>> + <#if (expDate?? && expDate.indexOf("/") > 0)>
>>> + <#assign expMonth =
>>> expDate.substring(0,expDate.indexOf("/"))>
>>> + <#assign expYear =
>>> expDate.substring(expDate.indexOf("/")+1)>
>>> + </#if>
>>> + </#if>
>>> + <select name="expMonth"
>>> onchange="javascript:makeExpDate();">
>>> + <#if creditCard?has_content &&
>>> expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign
>>> ccExprMonth = requestParameters.expMonth!></#if>
>>> + <#if ccExprMonth?has_content>
>>> + <option
>>> value="${ccExprMonth!}">${ccExprMonth!}</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
>>> + </select>
>>> + <select name="expYear"
>>> onchange="javascript:makeExpDate();">
>>> + <#if creditCard?has_content &&
>>> expYear?has_content><#assign ccExprYear = expYear><#else><#assign
>>> ccExprYear = requestParameters.expYear!></#if>
>>> + <#if ccExprYear?has_content>
>>> + <option
>>> value="${ccExprYear!}">${ccExprYear!}</option>
>>> + </#if>
>>> +
>>> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="30"
>>> name="description" value="${creditCard.description!}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> +
>>> + <#-- eft fields -->
>>> + <#if paymentMethodType =="EFT">
>>> + <#if !eftAccount?has_content>
>>> + <#assign eftAccount = requestParameters>
>>> + </#if>
>>> + <tr>
>>> + <td colspan="3"><hr /></td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="bankName" value="${eftAccount.bankName!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="10" maxlength="30"
>>> name="routingNumber" value="${eftAccount.routingNumber!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <select name="accountType">
>>> + <option>${eftAccount.accountType!}</option>
>>> + <option></option>
>>> + <option>Checking</option>
>>> + <option>Savings</option>
>>> + </select>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="20" maxlength="40"
>>> name="accountNumber" value="${eftAccount.accountNumber!}"/>
>>> + *</td>
>>> + </tr>
>>> + <tr>
>>> + <td width="26%" align="right"
>>> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
>>> + <td width="5"> </td>
>>> + <td width="74%">
>>> + <input type="text" size="30" maxlength="60"
>>> name="description" value="${eftAccount.description!}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> + </table>
>>> + <#else>
>>> + <#-- initial screen show a list of options -->
>>> +
>>> + <script type="text/javascript">
>>> +
>>> + function setCheckoutPaymentId( selectedValue ) {
>>> + checkoutForm =
>>> document.getElementById('checkoutsetupform');
>>> + if( selectedValue.match('^EXT_.*') ) {
>>> + checkoutForm.action =
>>> '<@o...@ofbizUrl>?checkOutPaymentId=' + selectedValue ;
>>> + } else {
>>> + checkoutForm.action =
>>> '<@o...@ofbizUrl>?paymentMethodType=' + selectedValue ;
>>> + }
>>> + }
>>> + </script>
>>> +
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform"
>>> id="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <input type="hidden" name="createNew"
>>> value="${(requestParameters.createNew)!}"/>
>>> + <table width="100%" border="0" cellpadding="1"
>>> cellspacing="0">
>>> + <#if "Y" != requestParameters.createNew?default("")>
>>> + <tr>
>>> + <td width='1%' nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId??
>>> && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/></td>
>>> + <td width='50%'
>>> nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + <tr>
>>> + <td width="1%" nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? &&
>>> checkOutPaymentId == "EXT_COD">checked="checked"</#if>
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/></td>
>>> + <td width="50%"
>>> nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + </#if>
>>> + <tr>
>>> + <td width='1%' nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="CC"
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/>
>>> + <td width='50%'
>>> nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
>>> + </tr>
>>> + <tr><td colspan="2"><hr /></td></tr>
>>> + <tr>
>>> + <td width='1%' nowrap="nowrap"><input type="radio"
>>> name="paymentMethodTypeAndId" value="EFT"
>>> onchange="setCheckoutPaymentId(this.value)"
>>> onclick="setCheckoutPaymentId(this.value)"/>
>>> + <td width='50%'
>>> nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
>>> + </tr>
>>> + </table>
>>> + </form>
>>> + </#if>
>>> + </div>
>>> +</div>
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,61 @@
>>> +<#--
>>> +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.
>>> +-->
>>> +
>>> +<!-- Screenlet to add cart to shopping list. The shopping lists are
>>> presented in a dropdown box. -->
>>> +
>>> +<#if (shoppingLists??) && (shoppingCartSize > 0)>
>>> + <div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table border="0" cellspacing="0" cellpadding="0">
>>> + <tr>
>>> + <td>
>>> + <form method="post" name="addBulkToShoppingList"
>>> action="<@o...@ofbizUrl>" style='margin: 0;'>
>>> + <#assign index = 0/>
>>> + <#list shoppingCart.items() as cartLine>
>>> + <#if (cartLine.getProductId()??) &&
>>> !cartLine.getIsPromo()>
>>> + <input type="hidden" name="selectedItem"
>>> value="${index}"/>
>>> + </#if>
>>> + <#assign index = index + 1/>
>>> + </#list>
>>> + <table border="0">
>>> + <tr>
>>> + <td>
>>> + <div>
>>> + <select name='shoppingListId'>
>>> + <#list shoppingLists as shoppingList>
>>> + <option
>>> value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
>>> + </#list>
>>> + <option value="">---</option>
>>> + <option
>>> value="">${uiLabelMap.OrderNewShoppingList}</option>
>>> + </select>
>>> + <input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.OrderAddToShoppingList}"/>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </form>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </div>
>>> + </div>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl?rev=1736868&view=auto
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,47 @@
>>> +<#--
>>> +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 (shoppingCart.getOrderType() == "SALES_ORDER")>
>>> + <#assign associatedProducts =
>>> Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request,
>>> true)!>
>>> +</#if>
>>> +
>>> +<#if associatedProducts?has_content>
>>> + <div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderHelpAlsoInterestedIn}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table cellspacing="0" cellpadding="1" border="0">
>>> + <#-- random complementary products -->
>>> + <#list associatedProducts as assocProduct>
>>> + <tr>
>>> + <td>
>>> + ${setRequestAttribute("optProduct", assocProduct)}
>>> + ${setRequestAttribute("listIndex", assocProduct_index)}
>>> + ${screens.render(productsummaryScreen)}
>>> + </td>
>>> + </tr>
>>> + <#if assocProduct_has_next>
>>> + <tr><td><hr/></td></tr>
>>> + </#if>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> + </div>
>>> +</#if>
>>>
>>>
>>>
>>>
>
>
Re: svn commit: r1736868 [1/20] - in
/ofbiz/trunk/applications/order: template/ template/entry/
template/entry/cart/ template/entry/catalog/ template/entry/order/
template/order/ template/product/ template/quote/ template/reports/
template/request/ templat...
Posted by Jacques Le Roux <ja...@les7arts.com>.
Done
Jacques
Le 03/04/2016 11:30, Jacques Le Roux a écrit :
> I had a doubt, but I confirm we can't use patches when moving files (else we lose history and annotations). I will document that (not so obvious) as
> said below
>
> Jacques
>
> Le 02/04/2016 13:59, Jacques Le Roux a écrit :
>> Yes I'll in
>> https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Contributors+Best+Practices
>> and
>> https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities
>> pages indeed
>>
>> Jacques
>>
>> Le 02/04/2016 12:49, Pierre Smits a écrit :
>>> Maybe you should consider placing this kind of wisdom in a page.
>>>
>>> Best regards,
>>>
>>> Pierre Smits
>>>
>>> ORRTIZ.COM <http://www.orrtiz.com>
>>> OFBiz based solutions & services
>>>
>>> OFBiz Extensions Marketplace
>>> http://oem.ofbizci.net/oci-2/
>>>
>>> On Sat, Apr 2, 2016 at 12:40 PM, Jacques Le Roux <
>>> jacques.le.roux@les7arts.com> wrote:
>>>
>>>> You are right Deepak!
>>>>
>>>> We not only lose history when doing so but we also lose annotation which
>>>> is even more annoying.
>>>>
>>>> I will revert all the recent changes I committed and we (committers) need
>>>> to do the job directly in our working copies.
>>>>
>>>> So I'm happy from help from other committers to do so. I think it's even
>>>> easier for us than applying patches, etc.
>>>>
>>>> Note: patches should never be used to move files, we all (committers at
>>>> least) need to remember that, my bad sorry :/
>>>>
>>>> Thanks
>>>>
>>>> Jacques
>>>>
>>>> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>>>>
>>>>> Hi Jacques,
>>>>>
>>>>> I think we need to use svn mv command to move files to new location else
>>>>> we
>>>>> will lose the svn history of all files.
>>>>>
>>>>> Thanks & Regards
>>>>> --
>>>>> Deepak Dixit
>>>>> www.hotwaxsystems.com
>>>>>
>>>>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>>>>
>>>>> Author: jleroux
>>>>>> Date: Mon Mar 28 11:14:22 2016
>>>>>> New Revision: 1736868
>>>>>>
>>>>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>>>>> Log:
>>>>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>>>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>>>>
>>>>>> Added:
>>>>>> ofbiz/trunk/applications/order/template/
>>>>>> ofbiz/trunk/applications/order/template/entry/
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>>>>> props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/order/
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/
>>>>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/order/transitions.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/product/
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/quote/
>>>>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/reports/
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/request/
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
>>>>>> (with
>>>>>> props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>>>>> (with props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/return/
>>>>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/return/returnList.ftl
>>>>>> (with
>>>>>> props)
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>>>>> (with props)
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>>>>> (with props)
>>>>>> ofbiz/trunk/applications/order/template/setup/
>>>>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
>>>>>> (with
>>>>>> props)
>>>>>> ofbiz/trunk/applications/order/template/task/
>>>>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
>>>>>> (with
>>>>>> props)
>>>>>> Modified:
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>>>>
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>>>>>
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>>>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>>>>
>>>>>> Added:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> ---
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>> (added)
>>>>>> +++
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>> Mon Mar 28 11:14:22 2016
>>>>>> @@ -0,0 +1,40 @@
>>>>>> +<#--
>>>>>> +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="screenlet">
>>>>>> +<div class="screenlet-title-bar">
>>>>>> + <ul>
>>>>>> + <#if orderHeader?has_content>
>>>>>> + <li class="h3">
>>>>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>>>>> + </li>
>>>>>> + <#else>
>>>>>> + <li class="h3">
>>>>>> + ${uiLabelMap.CommonCreate}
>>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>>>> + <#else>
>>>>>> + ${uiLabelMap.OrderSalesOrder}
>>>>>> + </#if>
>>>>>> + </li>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>>>>> + </#if>
>>>>>> + </ul>
>>>>>> +</div>
>>>>>> +</div>
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added:
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> ---
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>> (added)
>>>>>> +++
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>> Mon Mar 28 11:14:22 2016
>>>>>> @@ -0,0 +1,52 @@
>>>>>> +<#--
>>>>>> +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 stepTitleId??>
>>>>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>>>>> +</#if>
>>>>>> +<div class="screenlet">
>>>>>> + <div class="screenlet-title-bar">
>>>>>> + <ul>
>>>>>> + <li class="h3">
>>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>>>> + <#else>
>>>>>> + ${uiLabelMap.OrderSalesOrder}
>>>>>> + </#if>
>>>>>> + : ${stepTitle!}
>>>>>> + </li>
>>>>>> +
>>>>>> + <#if isLastStep == "N">
>>>>>> + <li><a
>>>>>>
>>>>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>>>>> + <#else>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>>>>> + </#if>
>>>>>> +
>>>>>> + <#list checkoutSteps?reverse as checkoutStep>
>>>>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>>>>> + <#if checkoutStep.enabled == "N">
>>>>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>>>>> + <#else>
>>>>>> + <li><a
>>>>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>>>>> + </#if>
>>>>>> + </#list>
>>>>>> + </ul>
>>>>>> + <br class="clear" />
>>>>>> + </div>
>>>>>> +</div>
>>>>>>
>>>>>> Propchange:
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange:
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange:
>>>>>>
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>> (added)
>>>>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>> Mon
>>>>>> Mar 28 11:14:22 2016
>>>>>> @@ -0,0 +1,60 @@
>>>>>> +<#--
>>>>>> +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="screenlet">
>>>>>> + <div class="screenlet-title-bar">
>>>>>> + <ul>
>>>>>> + <li class="h3">
>>>>>> + ${uiLabelMap.CommonCreate}
>>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>>>> + <#else>
>>>>>> + ${uiLabelMap.OrderSalesOrder}
>>>>>> + </#if>
>>>>>> + </li>
>>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>>>>> (shoppingCart.size() = 0)>
>>>>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>>>>> + <#else>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>>>>
>>>>>> + </#if>
>>>>>> + <#else>
>>>>>> + <#if shoppingCart.size() = 0>
>>>>>> + <li
>>>>>> class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>>>>> + <li
>>>>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>>>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>>>>> + <#else>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>>>> + </#if>
>>>>>> + </#if>
>>>>>> +
>>>>>> + <#if (shoppingCart.size() > 0)>
>>>>>> + <li><a
>>>>>>
>>>>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>>>>> + <li><a
>>>>>>
>>>>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>>>>> + <#else>
>>>>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>>>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>>>>> + </#if>
>>>>>> + <li><a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>>>>> + </ul>
>>>>>> + <br class="clear">
>>>>>> + </div>
>>>>>> +</div>
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added:
>>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>> (added)
>>>>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>> Mon Mar 28 11:14:22 2016
>>>>>> @@ -0,0 +1,112 @@
>>>>>> +<#--
>>>>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>>>> +<form method="post" action="<@o...@ofbizUrl>"
>>>>>> name="checkoutsetupform">
>>>>>> + <input type="hidden" name="finalizeMode"
>>>>>> value="removeEmptyShipGroups"/>
>>>>>> +</form>
>>>>>> +
>>>>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>>>>> class='boxoutside'>
>>>>>> +<tr>
>>>>>> + <td width='100%'>
>>>>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>>>>> class='boxbottom'>
>>>>>> + <tr>
>>>>>> + <td>
>>>>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>>>>> + <#assign shipGroupIndex = currIndex - 1>
>>>>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>>>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>>>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>>>>> + <table width="100%" cellpadding="1" border="0"
>>>>>> cellpadding="0" cellspacing="0">
>>>>>> + <tr>
>>>>>> + <td colspan="2">
>>>>>> + <h1>${uiLabelMap.OrderShipGroup}
>>>>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>>>>> ${uiLabelMap.OrderDropShipped} -
>>>>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + <tr>
>>>>>> + <td>
>>>>>> + <div>${uiLabelMap.ProductProduct}</div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> +
>>>>>> + <#assign shipGroupItems =
>>>>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>>>>> + <#assign shoppingCartItems =
>>>>>> shipGroupItems.keySet().iterator()>
>>>>>> + <form method="post"
>>>>>> action="<@o...@ofbizUrl>"
>>>>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>>>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>>>>> + <#assign rowCount = 0>
>>>>>> + <#list shoppingCartItems as shoppingCartItem>
>>>>>> + <#assign cartLineIndex =
>>>>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>>>>> + <#assign shipGroupItemQuantity =
>>>>>> shipGroupItems.get(shoppingCartItem)>
>>>>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>>>>> value="${cartLineIndex}"/>
>>>>>> + <input type="hidden"
>>>>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>>>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>>>>> value="${shipGroupIndex}"/>
>>>>>> + <tr>
>>>>>> + <td>
>>>>>> + <div>[${shoppingCartItem.getProductId()}]
>>>>>> ${shoppingCartItem.getName()!}:
>>>>>> ${shoppingCartItem.getDescription()!}</div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>${shipGroupItemQuantity}</div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div><input type="text"
>>>>>> name="quantity_o_${rowCount}"
>>>>>> value="${shipGroupItemQuantity}"/></div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>
>>>>>> + <select name="toGroupIndex_o_${rowCount}">
>>>>>> + <option value="${shipGroupIndex}">---</option>
>>>>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>>>>> groupIdx>
>>>>>> + <#assign groupNumber = groupIdx + 1>
>>>>>> + <option
>>>>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>>>>> ${groupNumber}</option>
>>>>>> + </#list>
>>>>>> + </select>
>>>>>> + </div>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + <#assign rowCount = rowCount + 1>
>>>>>> + </#list>
>>>>>> + <#if (rowCount > 0)>
>>>>>> + <tr>
>>>>>> + <td colspan="3"> </td>
>>>>>> + <td>
>>>>>> + <input type="submit" class="smallSubmit"
>>>>>> value="${uiLabelMap.CommonSubmit}"/>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + </#if>
>>>>>> + </table>
>>>>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>>>>> + </form>
>>>>>> + </#list>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + </table>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> +</table>
>>>>>> +
>>>>>> +<br />
>>>>>> +<#else>
>>>>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>>>>> +</#if>
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>>>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar
>>>>>> 28
>>>>>> 11:14:22 2016
>>>>>> @@ -0,0 +1,263 @@
>>>>>> +<#--
>>>>>> +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">
>>>>>> +//<![CDATA[
>>>>>> +function submitForm(form, mode, value) {
>>>>>> + if (mode == "DN") {
>>>>>> + // done action; payment info
>>>>>> +
>>>>>>
>>>>>> form.action="<@o...@ofbizUrl>";
>>>>>> + form.submit();
>>>>>> + } else if (mode == "CS") {
>>>>>> + // continue shopping
>>>>>> +
>>>>>> form.action="<@o...@ofbizUrl>";
>>>>>> + form.submit();
>>>>>> + } else if (mode == "NA") {
>>>>>> + // new address
>>>>>> +
>>>>>>
>>>>>> form.action="<@o...@ofbizUrl>";
>>>>>>
>>>>>> + form.submit();
>>>>>> + } else if (mode == "SV") {
>>>>>> + // save option; return to current screen
>>>>>> +
>>>>>> form.action="<@o...@ofbizUrl>";
>>>>>> + form.submit();
>>>>>> + } else if (mode == "SA") {
>>>>>> + // selected shipping address
>>>>>> +
>>>>>> form.action="<@o...@ofbizUrl>";
>>>>>> + form.submit();
>>>>>> + }
>>>>>> +}
>>>>>> +//]]>
>>>>>> +</script>
>>>>>> +
>>>>>> +<div class="screenlet">
>>>>>> + <div class="screenlet-title-bar">
>>>>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>>>>> + </div>
>>>>>> + <div class="screenlet-body">
>>>>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>>>>> + <#assign shipGroups = cart.getShipGroups()>
>>>>>> + <#if (shipGroups.size() > 0)>
>>>>>> + <#assign groupIdx = 0>
>>>>>> + <#list shipGroups as group>
>>>>>> + <#assign shipEstimateWrapper =
>>>>>>
>>>>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>>>>> cart, groupIdx)>
>>>>>> + <#assign carrierShipmentMethods =
>>>>>> shipEstimateWrapper.getShippingMethods()>
>>>>>> + <#assign groupNumber = groupIdx + 1>
>>>>>> + <form method="post" action="#"
>>>>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>>>>> + <input type="hidden" name="groupIndex"
>>>>>> value="${groupIdx}"/>
>>>>>> + <tr>
>>>>>> + <td>
>>>>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>>>>> ${groupNumber}:</b></div>
>>>>>> + <#list group.getShipItems() as item>
>>>>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>>>>> + <div
>>>>>> class="tabletext"> ${item.getName()} -
>>>>>> (${groupItem.getItemQuantity()})</div>
>>>>>> + </#list>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>
>>>>>> + <span
>>>>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>>>>> + <a
>>>>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA',
>>>>>> '');"
>>>>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>>>>> + </div>
>>>>>> + <div>
>>>>>> + <#assign selectedContactMechId =
>>>>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>>>>> + <select name="shippingContactMechId"
>>>>>> class="selectBox"
>>>>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>>>>> null);">
>>>>>> + <option
>>>>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>>>>> + <#list shippingContactMechList as
>>>>>> shippingContactMech>
>>>>>> + <#assign shippingAddress =
>>>>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>>>>> + <option
>>>>>> value="${shippingAddress.contactMechId}" <#if
>>>>>> (shippingAddress.contactMechId ==
>>>>>>
>>>>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>>>>> + </#list>
>>>>>> + </select>
>>>>>> + </div>
>>>>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>>>>> + <#assign selectedShippingMethod =
>>>>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>>>>> cart.getCarrierPartyId(groupIdx)>
>>>>>> + <#else>
>>>>>> + <#assign selectedShippingMethod = "">
>>>>>> + </#if>
>>>>>> + <select name="shipmentMethodString"
>>>>>> class="selectBox">
>>>>>> + <option
>>>>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>>>>> + <#list carrierShipmentMethods as
>>>>>> carrierShipmentMethod>
>>>>>> + <#assign shippingEst =
>>>>>>
>>>>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>>>>> + <#assign shippingMethod =
>>>>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>>>>> carrierShipmentMethod.partyId>
>>>>>> + <option value="${shippingMethod}" <#if
>>>>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>>>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>>>>> + ${carrierShipmentMethod.partyId!}
>>>>>> + </#if>
>>>>>> + ${carrierShipmentMethod.description!}
>>>>>> + <#if shippingEst?has_content>
>>>>>> + -
>>>>>> + <#if (shippingEst > -1)>
>>>>>> + <@ofbizCurrency amount=shippingEst
>>>>>> isoCode=cart.getCurrency()/>
>>>>>> + <#else>
>>>>>> + ${uiLabelMap.OrderCalculatedOffline}
>>>>>> + </#if>
>>>>>> + </#if>
>>>>>> + </option>
>>>>>> + </#list>
>>>>>> + </select>
>>>>>> +
>>>>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>>>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>>>>> wrap="hard"
>>>>>>
>>>>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>
>>>>>> + <select name="maySplit" class="selectBox">
>>>>>> + <#assign maySplitStr =
>>>>>> cart.getMaySplit(groupIdx)?default("")>
>>>>>> + <option
>>>>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>>>>> + <option value="false" <#if maySplitStr ==
>>>>>>
>>>>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>>>>> + <option value="true" <#if maySplitStr ==
>>>>>>
>>>>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>>>>> + </select>
>>>>>> + </div>
>>>>>> + <div>
>>>>>> + <select name="isGift" class="selectBox">
>>>>>> + <#assign isGiftStr =
>>>>>> cart.getIsGift(groupIdx)?default("")>
>>>>>> + <option value="">${uiLabelMap.OrderIsGift}
>>>>>> ?</option>
>>>>>> + <option value="false" <#if isGiftStr ==
>>>>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>>>>> + <option value="true" <#if isGiftStr ==
>>>>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>>>>> + </select>
>>>>>> + </div>
>>>>>> +
>>>>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>>>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>>>>> wrap="hard"
>>>>>> name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>>>>> + </td>
>>>>>> + <td><input type="button" class="smallSubmit"
>>>>>> value="${uiLabelMap.CommonSave}"
>>>>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>>>>> null);"/></td>
>>>>>> + </tr>
>>>>>> + <#assign groupIdx = groupIdx + 1>
>>>>>> + <#if group_has_next>
>>>>>> + <tr>
>>>>>> + <td colspan="6"><hr /></td>
>>>>>> + </tr>
>>>>>> + </#if>
>>>>>> + </form>
>>>>>> + </#list>
>>>>>> + <#else>
>>>>>> + <div
>>>>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>>>>> + </#if>
>>>>>> + </table>
>>>>>> + </div>
>>>>>> +</div>
>>>>>> +
>>>>>> +<div class="screenlet">
>>>>>> + <div class="screenlet-title-bar">
>>>>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>>>>> + </div>
>>>>>> + <div class="screenlet-body">
>>>>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>>>>> + <tr>
>>>>>> + <td><div
>>>>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>>>>> + <td align="center"><div
>>>>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>>>>> + <td> </td>
>>>>>> + <td align="center"><div
>>>>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>>>>> + <td> </td>
>>>>>> + <td> </td>
>>>>>> + </tr>
>>>>>> +
>>>>>> + <#list cart.items() as cartLine>
>>>>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>>>>> + <tr>
>>>>>> + <form method="post"
>>>>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>>>>> style="margin: 0;">
>>>>>> + <input type="hidden" name="itemIndex"
>>>>>> value="${cartLineIndex}"/>
>>>>>> + <td>
>>>>>> + <div class="tabletext">
>>>>>> + <#if cartLine.getProductId()??>
>>>>>> + <#-- product item -->
>>>>>> + <#-- start code to display a small image of the
>>>>>> product -->
>>>>>> + <#assign smallImageUrl =
>>>>>>
>>>>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>>>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>>>>> + <#if !smallImageUrl?string?has_content><#assign
>>>>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>>>>> + <#if smallImageUrl?string?has_content>
>>>>>> + <a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>">
>>>>>> + <img
>>>>>>
>>>>>> src="<@o...@ofbizContentUrl>"
>>>>>> class="cssImgSmall" alt="" />
>>>>>> + </a>
>>>>>> + </#if>
>>>>>> + <#-- end code to display a small image of the
>>>>>> product -->
>>>>>> + <a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>"
>>>>>> class="buttontext">${cartLine.getProductId()} -
>>>>>> + ${cartLine.getName()!}</a> :
>>>>>> ${cartLine.getDescription()!}
>>>>>> +
>>>>>> + <#-- display the registered ship groups and
>>>>>> quantity -->
>>>>>> + <#assign itemShipGroups =
>>>>>> cart.getShipGroups(cartLine)>
>>>>>> + <#list itemShipGroups.entrySet() as group>
>>>>>> + <div class="tabletext">
>>>>>> + <#assign groupNumber = group.getKey() + 1>
>>>>>> + <b>Group - </b>${groupNumber} /
>>>>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>>>>> + </div>
>>>>>> + </#list>
>>>>>> +
>>>>>> + <#-- if inventory is not required check to see if
>>>>>> it is out of stock and needs to have a message shown about that... -->
>>>>>> + <#assign itemProduct = cartLine.getProduct()>
>>>>>> + <#assign
>>>>>> isStoreInventoryNotRequiredAndNotAvailable
>>>>>> =
>>>>>>
>>>>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>>>>> itemProduct, cartLine.getQuantity(), false, false)>
>>>>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>>>>> itemProduct.inventoryMessage?has_content>
>>>>>> + <b>(${itemProduct.inventoryMessage})</b>
>>>>>> + </#if>
>>>>>> +
>>>>>> + <#else>
>>>>>> + <#-- this is a non-product item -->
>>>>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>>>>> ${cartLine.getName()!}
>>>>>> + </#if>
>>>>>> + </div>
>>>>>> +
>>>>>> + </td>
>>>>>> + <td align="right">
>>>>>> + <div
>>>>>>
>>>>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div> </div>
>>>>>> + </td>
>>>>>> + <td align="center">
>>>>>> + <input size="6" class="inputBox" type="text"
>>>>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div> </div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>>>>> + <select name="fromGroupIndex" class="selectBox">
>>>>>> + <#list itemShipGroups.entrySet() as group>
>>>>>> + <#assign groupNumber = group.getKey() + 1>
>>>>>> + <option
>>>>>> value="${group.getKey()}">${uiLabelMap.CommonGroup}
>>>>>> ${groupNumber}</option>
>>>>>> + </#list>
>>>>>> + </select>
>>>>>> + </div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>>>>> + <select name="toGroupIndex" class="selectBox">
>>>>>> + <#list 0..(cart.getShipGroupSize() - 1) as
>>>>>> groupIdx>
>>>>>> + <#assign groupNumber = groupIdx + 1>
>>>>>> + <option
>>>>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>>>>> + </#list>
>>>>>> + <option value="-1">${uiLabelMap.CommonNew}
>>>>>> ${uiLabelMap.CommonGroup}</option>
>>>>>> + </select>
>>>>>> + </div>
>>>>>> + </td>
>>>>>> + <td><input type="submit" class="smallSubmit"
>>>>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>>>>> + </form>
>>>>>> + </tr>
>>>>>> + </#list>
>>>>>> + </table>
>>>>>> + </div>
>>>>>> +</div>
>>>>>> +
>>>>>> +<table>
>>>>>> + <tr valign="top">
>>>>>> + <td>
>>>>>> + <a
>>>>>> href="<@o...@ofbizUrl>"
>>>>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>>>>> + </td>
>>>>>> + <td align="right">
>>>>>> + <a href="<@o...@ofbizUrl>"
>>>>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> +</table>
>>>>>>
>>>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added:
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> ---
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>> (added)
>>>>>> +++
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>> Mon Mar 28 11:14:22 2016
>>>>>> @@ -0,0 +1,64 @@
>>>>>> +<#--
>>>>>> +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.
>>>>>> +-->
>>>>>> +
>>>>>> +<#-- ==================== Party Listing dialog box
>>>>>> ========================= -->
>>>>>> +<#if additionalPartyRoleMap?has_content>
>>>>>> +<div class="screenlet">
>>>>>> + <div class="screenlet-title-bar">
>>>>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>>>>> + </div>
>>>>>> + <div class="screenlet-body">
>>>>>> + <table border="0" width="100%" cellpadding="0">
>>>>>> + <#list roleList as role>
>>>>>> + <tr>
>>>>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>>>>> locale)}</div></td>
>>>>>> + </tr>
>>>>>> + <tr>
>>>>>> + <td colspan="4"><hr /></td>
>>>>>> + </tr>
>>>>>> + <#list additionalPartyRoleMap[role] as party>
>>>>>> + <tr>
>>>>>> + <td><div>${party}</div></td>
>>>>>> + <td>
>>>>>> + <div>
>>>>>> + <#if partyData[party].type == "person">
>>>>>> + ${partyData[party].firstName!}
>>>>>> + <#else>
>>>>>> + ${partyData[party].groupName!}
>>>>>> + </#if>
>>>>>> + </div>
>>>>>> + </td>
>>>>>> + <td>
>>>>>> + <div>
>>>>>> + <#if partyData[party].type == "person">
>>>>>> + ${partyData[party].lastName!}
>>>>>> + </#if>
>>>>>> + </div>
>>>>>> + </td>
>>>>>> + <td align="right">
>>>>>> + <a
>>>>>>
>>>>>> href="<@o...@ofbizUrl>"
>>>>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + </#list>
>>>>>> + <tr><td> </td></tr>
>>>>>> + </#list>
>>>>>> + </table>
>>>>>> + </div>
>>>>>> +</div>
>>>>>> +</#if>
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>> (added)
>>>>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon
>>>>>> Mar
>>>>>> 28 11:14:22 2016
>>>>>> @@ -0,0 +1,80 @@
>>>>>> +<#--
>>>>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>>>> +
>>>>>> +<form method="post" action="<@o...@ofbizUrl>"
>>>>>> name="checkoutsetupform">
>>>>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>>>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>>>>> cellpadding='0' class='boxoutside'>
>>>>>> + <tr><td>
>>>>>> +
>>>>>> + <#-- header table -->
>>>>>> +
>>>>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>>>>> class='boxtop'>
>>>>>> + <tr>
>>>>>> + <td valign="middle">
>>>>>> + <div
>>>>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + </table>
>>>>>> +
>>>>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>>>>> class='boxbottom'>
>>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>>> +
>>>>>> + <#-- postal addresses for chosen id -->
>>>>>> +
>>>>>> + <#if partyContactMechPurposes??>
>>>>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>>>>> + <#assign shippingAddress =
>>>>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>>>>> +
>>>>>> + <#-- skip non-postal addresses -->
>>>>>> +
>>>>>> + <#if shippingAddress.toName??>
>>>>>> + <tr>
>>>>>> + <td valign="top" nowrap="nowrap">
>>>>>> + <input type="radio" name="shipping_contact_mech_id"
>>>>>> value="${partyContactMechPurpose.contactMechId}" />
>>>>>> + </td>
>>>>>> + <td nowrap="nowrap"> </td>
>>>>>> + <td width="100%">
>>>>>> + <div>
>>>>>> + <#if
>>>>>>
>>>>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>>>>> /></#if>
>>>>>> + <#if
>>>>>>
>>>>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>>>>> /></#if>
>>>>>> + <#if
>>>>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br
>>>>>> /></#if>
>>>>>> + <#if
>>>>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br
>>>>>> /></#if>
>>>>>> + <#if
>>>>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>>>>> + <#if
>>>>>> shippingAddress.stateProvinceGeoId?has_content><br
>>>>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>>>>> + <#if shippingAddress.postalCode?has_content><br
>>>>>> />${shippingAddress.postalCode}</#if>
>>>>>> + <#if shippingAddress.countryGeoId?has_content><br
>>>>>> />${shippingAddress.countryGeoId}</#if>
>>>>>> + </div>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>>> + </#if>
>>>>>> + </#list>
>>>>>> + </#if>
>>>>>> +
>>>>>> + </table>
>>>>>> +
>>>>>> + </td></tr>
>>>>>> + </table>
>>>>>> +</form>
>>>>>> +
>>>>>> +<#else>
>>>>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>>>>> +</#if>
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:eol-style = native
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:keywords = Date Rev Author URL Id
>>>>>>
>>>>>> Propchange:
>>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> svn:mime-type = text/plain
>>>>>>
>>>>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>>>> URL:
>>>>>>
>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>>>> (added)
>>>>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon
>>>>>> Mar
>>>>>> 28 11:14:22 2016
>>>>>> @@ -0,0 +1,516 @@
>>>>>> +<#--
>>>>>> +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 type="text/javascript">
>>>>>> +//<![CDATA[
>>>>>> +function shipBillAddr() {
>>>>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>>>>> + window.location =
>>>>>>
>>>>>> "<@o...@ofbizUrl>";
>>>>>> + } else {
>>>>>> + window.location =
>>>>>>
>>>>>> "<@o...@ofbizUrl>";
>>>>>> + }
>>>>>> +}
>>>>>> +
>>>>>> +function makeExpDate() {
>>>>>> + document.checkoutsetupform.expireDate.value =
>>>>>>
>>>>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>>>>> + "/" +
>>>>>>
>>>>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>>>>> +}
>>>>>> +//]]>
>>>>>> +</script>
>>>>>> +
>>>>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>>>> +<div class="screenlet">
>>>>>> + <div class="screenlet-body">
>>>>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>>>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>>>>> !requestParameters.createNew??)>
>>>>>> + <#-- initial screen when we have a associated party -->
>>>>>> + <form method="post"
>>>>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>>>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>>>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>>>>> border="0">
>>>>>> + <tr>
>>>>>> + <td colspan="2">
>>>>>> + <a
>>>>>> href="<@o...@ofbizUrl>"
>>>>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>>>>> + </td>
>>>>>> + </tr>
>>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>>> + <#if billingAccountList?has_content>
>>>>>> + <tr>
>>>>>> + <td width="1%">
>>>>>> + <select name="billingAccountId">
>>>>>> + <option value=""></option>
>>>>>> + <#list billingAccountList as billingAccount>
>>>>>> + <#assign availableAmount =
>>>>>> billingAccount.accountBalance?double>
>>>>>> + <#if (billingAccount.accountLimit)??>
>>>>>> + <#assign accountLimit =
>>>>>> billingAccount.accountLimit?double />
>>>>>> + <#else>
>>>>>> + <#assign accountLimit = 0.00 />
>>>>>> + </#if>
>>>>>> + <option
>>>>>> value="${billingAccount.billingAccountId}" <#if
>>>>>> billingAccount.billingAccountId ==
>>>>>>
>>>>>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>>>>>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>>>>>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/>
>>>>>> Limit:
>>>>>> <@ofbizCurrency amount=accountLimit
>>>>>> isoCode=billingAccount.accountCurrencyUomId/></option>
>>>>>> + </#list>
>>>>>> + </select>
>>>>>> + </td>
>>>>>> + <td width="50%">
>>>>>> +
>>>>>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>>>>>> + </td>
>>>>>> + <td> </td>
>>>>>> + </tr>
>>>>>> + <tr>
>>>>>> + <td width="1%" align="right">
>>>>>> + <input type="text" size="5"
>>>>>> name="billingAccountAmount" value=""/>
>>>>>> + </td>
>>>>>> + <td width="50%">
>>>>>> + ${uiLabelMap.OrderBillUpTo}
>>>>>> + </td>
>>>>>> + <td> </td>
>>>>>> + </tr>
>>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>>> + </#if>
>>>>>> + <tr>
>>>>>
>>
>>
>
Re: svn commit: r1736868 [1/20] - in
/ofbiz/trunk/applications/order: template/ template/entry/
template/entry/cart/ template/entry/catalog/ template/entry/order/
template/order/ template/product/ template/quote/ template/reports/
template/request/ templat...
Posted by Jacques Le Roux <ja...@les7arts.com>.
I had a doubt, but I confirm we can't use patches when moving files (else we lose history and annotations). I will document that (not so obvious) as
said below
Jacques
Le 02/04/2016 13:59, Jacques Le Roux a écrit :
> Yes I'll in
> https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Contributors+Best+Practices
> and
> https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities
> pages indeed
>
> Jacques
>
> Le 02/04/2016 12:49, Pierre Smits a écrit :
>> Maybe you should consider placing this kind of wisdom in a page.
>>
>> Best regards,
>>
>> Pierre Smits
>>
>> ORRTIZ.COM <http://www.orrtiz.com>
>> OFBiz based solutions & services
>>
>> OFBiz Extensions Marketplace
>> http://oem.ofbizci.net/oci-2/
>>
>> On Sat, Apr 2, 2016 at 12:40 PM, Jacques Le Roux <
>> jacques.le.roux@les7arts.com> wrote:
>>
>>> You are right Deepak!
>>>
>>> We not only lose history when doing so but we also lose annotation which
>>> is even more annoying.
>>>
>>> I will revert all the recent changes I committed and we (committers) need
>>> to do the job directly in our working copies.
>>>
>>> So I'm happy from help from other committers to do so. I think it's even
>>> easier for us than applying patches, etc.
>>>
>>> Note: patches should never be used to move files, we all (committers at
>>> least) need to remember that, my bad sorry :/
>>>
>>> Thanks
>>>
>>> Jacques
>>>
>>> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>>>
>>>> Hi Jacques,
>>>>
>>>> I think we need to use svn mv command to move files to new location else
>>>> we
>>>> will lose the svn history of all files.
>>>>
>>>> Thanks & Regards
>>>> --
>>>> Deepak Dixit
>>>> www.hotwaxsystems.com
>>>>
>>>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>>>
>>>> Author: jleroux
>>>>> Date: Mon Mar 28 11:14:22 2016
>>>>> New Revision: 1736868
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>>>> Log:
>>>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>>>
>>>>> Added:
>>>>> ofbiz/trunk/applications/order/template/
>>>>> ofbiz/trunk/applications/order/template/entry/
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>>>> props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/order/
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/
>>>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/order/transitions.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/product/
>>>>>
>>>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/quote/
>>>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/reports/
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/request/
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
>>>>> (with
>>>>> props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>>>> (with props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/return/
>>>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/return/returnList.ftl
>>>>> (with
>>>>> props)
>>>>>
>>>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>>>> (with props)
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>>>> (with props)
>>>>> ofbiz/trunk/applications/order/template/setup/
>>>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
>>>>> (with
>>>>> props)
>>>>> ofbiz/trunk/applications/order/template/task/
>>>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
>>>>> (with
>>>>> props)
>>>>> Modified:
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>>>
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>>>>
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>>>
>>>>> Added:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> ---
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>> (added)
>>>>> +++
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>> Mon Mar 28 11:14:22 2016
>>>>> @@ -0,0 +1,40 @@
>>>>> +<#--
>>>>> +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="screenlet">
>>>>> +<div class="screenlet-title-bar">
>>>>> + <ul>
>>>>> + <#if orderHeader?has_content>
>>>>> + <li class="h3">
>>>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>>>> + </li>
>>>>> + <#else>
>>>>> + <li class="h3">
>>>>> + ${uiLabelMap.CommonCreate}
>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>>> + <#else>
>>>>> + ${uiLabelMap.OrderSalesOrder}
>>>>> + </#if>
>>>>> + </li>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>>>> + </#if>
>>>>> + </ul>
>>>>> +</div>
>>>>> +</div>
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added:
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> ---
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>> (added)
>>>>> +++
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>> Mon Mar 28 11:14:22 2016
>>>>> @@ -0,0 +1,52 @@
>>>>> +<#--
>>>>> +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 stepTitleId??>
>>>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>>>> +</#if>
>>>>> +<div class="screenlet">
>>>>> + <div class="screenlet-title-bar">
>>>>> + <ul>
>>>>> + <li class="h3">
>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>>> + <#else>
>>>>> + ${uiLabelMap.OrderSalesOrder}
>>>>> + </#if>
>>>>> + : ${stepTitle!}
>>>>> + </li>
>>>>> +
>>>>> + <#if isLastStep == "N">
>>>>> + <li><a
>>>>>
>>>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>>>> + <#else>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>>>> + </#if>
>>>>> +
>>>>> + <#list checkoutSteps?reverse as checkoutStep>
>>>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>>>> + <#if checkoutStep.enabled == "N">
>>>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>>>> + <#else>
>>>>> + <li><a
>>>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>>>> + </#if>
>>>>> + </#list>
>>>>> + </ul>
>>>>> + <br class="clear" />
>>>>> + </div>
>>>>> +</div>
>>>>>
>>>>> Propchange:
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange:
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange:
>>>>>
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>> (added)
>>>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>> Mon
>>>>> Mar 28 11:14:22 2016
>>>>> @@ -0,0 +1,60 @@
>>>>> +<#--
>>>>> +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="screenlet">
>>>>> + <div class="screenlet-title-bar">
>>>>> + <ul>
>>>>> + <li class="h3">
>>>>> + ${uiLabelMap.CommonCreate}
>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>>> + <#else>
>>>>> + ${uiLabelMap.OrderSalesOrder}
>>>>> + </#if>
>>>>> + </li>
>>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>>>> (shoppingCart.size() = 0)>
>>>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>>>> + <#else>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>>>
>>>>> + </#if>
>>>>> + <#else>
>>>>> + <#if shoppingCart.size() = 0>
>>>>> + <li
>>>>> class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>>>> + <li
>>>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>>>> + <#else>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>>> + </#if>
>>>>> + </#if>
>>>>> +
>>>>> + <#if (shoppingCart.size() > 0)>
>>>>> + <li><a
>>>>>
>>>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>>>> + <li><a
>>>>>
>>>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>>>> + <#else>
>>>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>>>> + </#if>
>>>>> + <li><a
>>>>>
>>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>>>> + </ul>
>>>>> + <br class="clear">
>>>>> + </div>
>>>>> +</div>
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added:
>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>> (added)
>>>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>> Mon Mar 28 11:14:22 2016
>>>>> @@ -0,0 +1,112 @@
>>>>> +<#--
>>>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>>> +<form method="post" action="<@o...@ofbizUrl>"
>>>>> name="checkoutsetupform">
>>>>> + <input type="hidden" name="finalizeMode"
>>>>> value="removeEmptyShipGroups"/>
>>>>> +</form>
>>>>> +
>>>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>>>> class='boxoutside'>
>>>>> +<tr>
>>>>> + <td width='100%'>
>>>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>>>> class='boxbottom'>
>>>>> + <tr>
>>>>> + <td>
>>>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>>>> + <#assign shipGroupIndex = currIndex - 1>
>>>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>>>> + <table width="100%" cellpadding="1" border="0"
>>>>> cellpadding="0" cellspacing="0">
>>>>> + <tr>
>>>>> + <td colspan="2">
>>>>> + <h1>${uiLabelMap.OrderShipGroup}
>>>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>>>> ${uiLabelMap.OrderDropShipped} -
>>>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>>>> + </td>
>>>>> + </tr>
>>>>> + <tr>
>>>>> + <td>
>>>>> + <div>${uiLabelMap.ProductProduct}</div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>>>> + </td>
>>>>> + </tr>
>>>>> +
>>>>> + <#assign shipGroupItems =
>>>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>>>> + <#assign shoppingCartItems =
>>>>> shipGroupItems.keySet().iterator()>
>>>>> + <form method="post"
>>>>> action="<@o...@ofbizUrl>"
>>>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>>>> + <#assign rowCount = 0>
>>>>> + <#list shoppingCartItems as shoppingCartItem>
>>>>> + <#assign cartLineIndex =
>>>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>>>> + <#assign shipGroupItemQuantity =
>>>>> shipGroupItems.get(shoppingCartItem)>
>>>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>>>> value="${cartLineIndex}"/>
>>>>> + <input type="hidden"
>>>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>>>> value="${shipGroupIndex}"/>
>>>>> + <tr>
>>>>> + <td>
>>>>> + <div>[${shoppingCartItem.getProductId()}]
>>>>> ${shoppingCartItem.getName()!}:
>>>>> ${shoppingCartItem.getDescription()!}</div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>${shipGroupItemQuantity}</div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div><input type="text"
>>>>> name="quantity_o_${rowCount}"
>>>>> value="${shipGroupItemQuantity}"/></div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>
>>>>> + <select name="toGroupIndex_o_${rowCount}">
>>>>> + <option value="${shipGroupIndex}">---</option>
>>>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>>>> groupIdx>
>>>>> + <#assign groupNumber = groupIdx + 1>
>>>>> + <option
>>>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>>>> ${groupNumber}</option>
>>>>> + </#list>
>>>>> + </select>
>>>>> + </div>
>>>>> + </td>
>>>>> + </tr>
>>>>> + <#assign rowCount = rowCount + 1>
>>>>> + </#list>
>>>>> + <#if (rowCount > 0)>
>>>>> + <tr>
>>>>> + <td colspan="3"> </td>
>>>>> + <td>
>>>>> + <input type="submit" class="smallSubmit"
>>>>> value="${uiLabelMap.CommonSubmit}"/>
>>>>> + </td>
>>>>> + </tr>
>>>>> + </#if>
>>>>> + </table>
>>>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>>>> + </form>
>>>>> + </#list>
>>>>> + </td>
>>>>> + </tr>
>>>>> + </table>
>>>>> + </td>
>>>>> + </tr>
>>>>> +</table>
>>>>> +
>>>>> +<br />
>>>>> +<#else>
>>>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>>>> +</#if>
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar
>>>>> 28
>>>>> 11:14:22 2016
>>>>> @@ -0,0 +1,263 @@
>>>>> +<#--
>>>>> +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">
>>>>> +//<![CDATA[
>>>>> +function submitForm(form, mode, value) {
>>>>> + if (mode == "DN") {
>>>>> + // done action; payment info
>>>>> +
>>>>>
>>>>> form.action="<@o...@ofbizUrl>";
>>>>> + form.submit();
>>>>> + } else if (mode == "CS") {
>>>>> + // continue shopping
>>>>> +
>>>>> form.action="<@o...@ofbizUrl>";
>>>>> + form.submit();
>>>>> + } else if (mode == "NA") {
>>>>> + // new address
>>>>> +
>>>>>
>>>>> form.action="<@o...@ofbizUrl>";
>>>>>
>>>>> + form.submit();
>>>>> + } else if (mode == "SV") {
>>>>> + // save option; return to current screen
>>>>> +
>>>>> form.action="<@o...@ofbizUrl>";
>>>>> + form.submit();
>>>>> + } else if (mode == "SA") {
>>>>> + // selected shipping address
>>>>> +
>>>>> form.action="<@o...@ofbizUrl>";
>>>>> + form.submit();
>>>>> + }
>>>>> +}
>>>>> +//]]>
>>>>> +</script>
>>>>> +
>>>>> +<div class="screenlet">
>>>>> + <div class="screenlet-title-bar">
>>>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>>>> + </div>
>>>>> + <div class="screenlet-body">
>>>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>>>> + <#assign shipGroups = cart.getShipGroups()>
>>>>> + <#if (shipGroups.size() > 0)>
>>>>> + <#assign groupIdx = 0>
>>>>> + <#list shipGroups as group>
>>>>> + <#assign shipEstimateWrapper =
>>>>>
>>>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>>>> cart, groupIdx)>
>>>>> + <#assign carrierShipmentMethods =
>>>>> shipEstimateWrapper.getShippingMethods()>
>>>>> + <#assign groupNumber = groupIdx + 1>
>>>>> + <form method="post" action="#"
>>>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>>>> + <input type="hidden" name="groupIndex"
>>>>> value="${groupIdx}"/>
>>>>> + <tr>
>>>>> + <td>
>>>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>>>> ${groupNumber}:</b></div>
>>>>> + <#list group.getShipItems() as item>
>>>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>>>> + <div
>>>>> class="tabletext"> ${item.getName()} -
>>>>> (${groupItem.getItemQuantity()})</div>
>>>>> + </#list>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>
>>>>> + <span
>>>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>>>> + <a
>>>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA',
>>>>> '');"
>>>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>>>> + </div>
>>>>> + <div>
>>>>> + <#assign selectedContactMechId =
>>>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>>>> + <select name="shippingContactMechId"
>>>>> class="selectBox"
>>>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>>>> null);">
>>>>> + <option
>>>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>>>> + <#list shippingContactMechList as
>>>>> shippingContactMech>
>>>>> + <#assign shippingAddress =
>>>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>>>> + <option
>>>>> value="${shippingAddress.contactMechId}" <#if
>>>>> (shippingAddress.contactMechId ==
>>>>>
>>>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>>>> + </#list>
>>>>> + </select>
>>>>> + </div>
>>>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>>>> + <#assign selectedShippingMethod =
>>>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>>>> cart.getCarrierPartyId(groupIdx)>
>>>>> + <#else>
>>>>> + <#assign selectedShippingMethod = "">
>>>>> + </#if>
>>>>> + <select name="shipmentMethodString"
>>>>> class="selectBox">
>>>>> + <option
>>>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>>>> + <#list carrierShipmentMethods as
>>>>> carrierShipmentMethod>
>>>>> + <#assign shippingEst =
>>>>>
>>>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>>>> + <#assign shippingMethod =
>>>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>>>> carrierShipmentMethod.partyId>
>>>>> + <option value="${shippingMethod}" <#if
>>>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>>>> + ${carrierShipmentMethod.partyId!}
>>>>> + </#if>
>>>>> + ${carrierShipmentMethod.description!}
>>>>> + <#if shippingEst?has_content>
>>>>> + -
>>>>> + <#if (shippingEst > -1)>
>>>>> + <@ofbizCurrency amount=shippingEst
>>>>> isoCode=cart.getCurrency()/>
>>>>> + <#else>
>>>>> + ${uiLabelMap.OrderCalculatedOffline}
>>>>> + </#if>
>>>>> + </#if>
>>>>> + </option>
>>>>> + </#list>
>>>>> + </select>
>>>>> +
>>>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>>>> wrap="hard"
>>>>>
>>>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>
>>>>> + <select name="maySplit" class="selectBox">
>>>>> + <#assign maySplitStr =
>>>>> cart.getMaySplit(groupIdx)?default("")>
>>>>> + <option
>>>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>>>> + <option value="false" <#if maySplitStr ==
>>>>>
>>>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>>>> + <option value="true" <#if maySplitStr ==
>>>>>
>>>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>>>> + </select>
>>>>> + </div>
>>>>> + <div>
>>>>> + <select name="isGift" class="selectBox">
>>>>> + <#assign isGiftStr =
>>>>> cart.getIsGift(groupIdx)?default("")>
>>>>> + <option value="">${uiLabelMap.OrderIsGift}
>>>>> ?</option>
>>>>> + <option value="false" <#if isGiftStr ==
>>>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>>>> + <option value="true" <#if isGiftStr ==
>>>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>>>> + </select>
>>>>> + </div>
>>>>> +
>>>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>>>> wrap="hard"
>>>>> name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>>>> + </td>
>>>>> + <td><input type="button" class="smallSubmit"
>>>>> value="${uiLabelMap.CommonSave}"
>>>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>>>> null);"/></td>
>>>>> + </tr>
>>>>> + <#assign groupIdx = groupIdx + 1>
>>>>> + <#if group_has_next>
>>>>> + <tr>
>>>>> + <td colspan="6"><hr /></td>
>>>>> + </tr>
>>>>> + </#if>
>>>>> + </form>
>>>>> + </#list>
>>>>> + <#else>
>>>>> + <div
>>>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>>>> + </#if>
>>>>> + </table>
>>>>> + </div>
>>>>> +</div>
>>>>> +
>>>>> +<div class="screenlet">
>>>>> + <div class="screenlet-title-bar">
>>>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>>>> + </div>
>>>>> + <div class="screenlet-body">
>>>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>>>> + <tr>
>>>>> + <td><div
>>>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>>>> + <td align="center"><div
>>>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>>>> + <td> </td>
>>>>> + <td align="center"><div
>>>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>>>> + <td> </td>
>>>>> + <td> </td>
>>>>> + </tr>
>>>>> +
>>>>> + <#list cart.items() as cartLine>
>>>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>>>> + <tr>
>>>>> + <form method="post"
>>>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>>>> style="margin: 0;">
>>>>> + <input type="hidden" name="itemIndex"
>>>>> value="${cartLineIndex}"/>
>>>>> + <td>
>>>>> + <div class="tabletext">
>>>>> + <#if cartLine.getProductId()??>
>>>>> + <#-- product item -->
>>>>> + <#-- start code to display a small image of the
>>>>> product -->
>>>>> + <#assign smallImageUrl =
>>>>>
>>>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>>>> + <#if !smallImageUrl?string?has_content><#assign
>>>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>>>> + <#if smallImageUrl?string?has_content>
>>>>> + <a
>>>>>
>>>>> href="<@o...@ofbizUrl>">
>>>>> + <img
>>>>>
>>>>> src="<@o...@ofbizContentUrl>"
>>>>> class="cssImgSmall" alt="" />
>>>>> + </a>
>>>>> + </#if>
>>>>> + <#-- end code to display a small image of the
>>>>> product -->
>>>>> + <a
>>>>>
>>>>> href="<@o...@ofbizUrl>"
>>>>> class="buttontext">${cartLine.getProductId()} -
>>>>> + ${cartLine.getName()!}</a> :
>>>>> ${cartLine.getDescription()!}
>>>>> +
>>>>> + <#-- display the registered ship groups and
>>>>> quantity -->
>>>>> + <#assign itemShipGroups =
>>>>> cart.getShipGroups(cartLine)>
>>>>> + <#list itemShipGroups.entrySet() as group>
>>>>> + <div class="tabletext">
>>>>> + <#assign groupNumber = group.getKey() + 1>
>>>>> + <b>Group - </b>${groupNumber} /
>>>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>>>> + </div>
>>>>> + </#list>
>>>>> +
>>>>> + <#-- if inventory is not required check to see if
>>>>> it is out of stock and needs to have a message shown about that... -->
>>>>> + <#assign itemProduct = cartLine.getProduct()>
>>>>> + <#assign
>>>>> isStoreInventoryNotRequiredAndNotAvailable
>>>>> =
>>>>>
>>>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>>>> itemProduct, cartLine.getQuantity(), false, false)>
>>>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>>>> itemProduct.inventoryMessage?has_content>
>>>>> + <b>(${itemProduct.inventoryMessage})</b>
>>>>> + </#if>
>>>>> +
>>>>> + <#else>
>>>>> + <#-- this is a non-product item -->
>>>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>>>> ${cartLine.getName()!}
>>>>> + </#if>
>>>>> + </div>
>>>>> +
>>>>> + </td>
>>>>> + <td align="right">
>>>>> + <div
>>>>>
>>>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div> </div>
>>>>> + </td>
>>>>> + <td align="center">
>>>>> + <input size="6" class="inputBox" type="text"
>>>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div> </div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>>>> + <select name="fromGroupIndex" class="selectBox">
>>>>> + <#list itemShipGroups.entrySet() as group>
>>>>> + <#assign groupNumber = group.getKey() + 1>
>>>>> + <option
>>>>> value="${group.getKey()}">${uiLabelMap.CommonGroup}
>>>>> ${groupNumber}</option>
>>>>> + </#list>
>>>>> + </select>
>>>>> + </div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>>>> + <select name="toGroupIndex" class="selectBox">
>>>>> + <#list 0..(cart.getShipGroupSize() - 1) as
>>>>> groupIdx>
>>>>> + <#assign groupNumber = groupIdx + 1>
>>>>> + <option
>>>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>>>> + </#list>
>>>>> + <option value="-1">${uiLabelMap.CommonNew}
>>>>> ${uiLabelMap.CommonGroup}</option>
>>>>> + </select>
>>>>> + </div>
>>>>> + </td>
>>>>> + <td><input type="submit" class="smallSubmit"
>>>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>>>> + </form>
>>>>> + </tr>
>>>>> + </#list>
>>>>> + </table>
>>>>> + </div>
>>>>> +</div>
>>>>> +
>>>>> +<table>
>>>>> + <tr valign="top">
>>>>> + <td>
>>>>> + <a
>>>>> href="<@o...@ofbizUrl>"
>>>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>>>> + </td>
>>>>> + <td align="right">
>>>>> + <a href="<@o...@ofbizUrl>"
>>>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>>>> + </td>
>>>>> + </tr>
>>>>> +</table>
>>>>>
>>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added:
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> ---
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>> (added)
>>>>> +++
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>> Mon Mar 28 11:14:22 2016
>>>>> @@ -0,0 +1,64 @@
>>>>> +<#--
>>>>> +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.
>>>>> +-->
>>>>> +
>>>>> +<#-- ==================== Party Listing dialog box
>>>>> ========================= -->
>>>>> +<#if additionalPartyRoleMap?has_content>
>>>>> +<div class="screenlet">
>>>>> + <div class="screenlet-title-bar">
>>>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>>>> + </div>
>>>>> + <div class="screenlet-body">
>>>>> + <table border="0" width="100%" cellpadding="0">
>>>>> + <#list roleList as role>
>>>>> + <tr>
>>>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>>>> locale)}</div></td>
>>>>> + </tr>
>>>>> + <tr>
>>>>> + <td colspan="4"><hr /></td>
>>>>> + </tr>
>>>>> + <#list additionalPartyRoleMap[role] as party>
>>>>> + <tr>
>>>>> + <td><div>${party}</div></td>
>>>>> + <td>
>>>>> + <div>
>>>>> + <#if partyData[party].type == "person">
>>>>> + ${partyData[party].firstName!}
>>>>> + <#else>
>>>>> + ${partyData[party].groupName!}
>>>>> + </#if>
>>>>> + </div>
>>>>> + </td>
>>>>> + <td>
>>>>> + <div>
>>>>> + <#if partyData[party].type == "person">
>>>>> + ${partyData[party].lastName!}
>>>>> + </#if>
>>>>> + </div>
>>>>> + </td>
>>>>> + <td align="right">
>>>>> + <a
>>>>>
>>>>> href="<@o...@ofbizUrl>"
>>>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>>>> + </td>
>>>>> + </tr>
>>>>> + </#list>
>>>>> + <tr><td> </td></tr>
>>>>> + </#list>
>>>>> + </table>
>>>>> + </div>
>>>>> +</div>
>>>>> +</#if>
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>> (added)
>>>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon
>>>>> Mar
>>>>> 28 11:14:22 2016
>>>>> @@ -0,0 +1,80 @@
>>>>> +<#--
>>>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>>> +
>>>>> +<form method="post" action="<@o...@ofbizUrl>"
>>>>> name="checkoutsetupform">
>>>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>>>> cellpadding='0' class='boxoutside'>
>>>>> + <tr><td>
>>>>> +
>>>>> + <#-- header table -->
>>>>> +
>>>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>>>> class='boxtop'>
>>>>> + <tr>
>>>>> + <td valign="middle">
>>>>> + <div
>>>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>>>> + </td>
>>>>> + </tr>
>>>>> + </table>
>>>>> +
>>>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>>>> class='boxbottom'>
>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>> +
>>>>> + <#-- postal addresses for chosen id -->
>>>>> +
>>>>> + <#if partyContactMechPurposes??>
>>>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>>>> + <#assign shippingAddress =
>>>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>>>> +
>>>>> + <#-- skip non-postal addresses -->
>>>>> +
>>>>> + <#if shippingAddress.toName??>
>>>>> + <tr>
>>>>> + <td valign="top" nowrap="nowrap">
>>>>> + <input type="radio" name="shipping_contact_mech_id"
>>>>> value="${partyContactMechPurpose.contactMechId}" />
>>>>> + </td>
>>>>> + <td nowrap="nowrap"> </td>
>>>>> + <td width="100%">
>>>>> + <div>
>>>>> + <#if
>>>>>
>>>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>>>> /></#if>
>>>>> + <#if
>>>>>
>>>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>>>> /></#if>
>>>>> + <#if
>>>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br
>>>>> /></#if>
>>>>> + <#if
>>>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br
>>>>> /></#if>
>>>>> + <#if
>>>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>>>> + <#if
>>>>> shippingAddress.stateProvinceGeoId?has_content><br
>>>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>>>> + <#if shippingAddress.postalCode?has_content><br
>>>>> />${shippingAddress.postalCode}</#if>
>>>>> + <#if shippingAddress.countryGeoId?has_content><br
>>>>> />${shippingAddress.countryGeoId}</#if>
>>>>> + </div>
>>>>> + </td>
>>>>> + </tr>
>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>> + </#if>
>>>>> + </#list>
>>>>> + </#if>
>>>>> +
>>>>> + </table>
>>>>> +
>>>>> + </td></tr>
>>>>> + </table>
>>>>> +</form>
>>>>> +
>>>>> +<#else>
>>>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>>>> +</#if>
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:eol-style = native
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:keywords = Date Rev Author URL Id
>>>>>
>>>>> Propchange:
>>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> svn:mime-type = text/plain
>>>>>
>>>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>>> URL:
>>>>>
>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>>> (added)
>>>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon
>>>>> Mar
>>>>> 28 11:14:22 2016
>>>>> @@ -0,0 +1,516 @@
>>>>> +<#--
>>>>> +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 type="text/javascript">
>>>>> +//<![CDATA[
>>>>> +function shipBillAddr() {
>>>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>>>> + window.location =
>>>>>
>>>>> "<@o...@ofbizUrl>";
>>>>> + } else {
>>>>> + window.location =
>>>>>
>>>>> "<@o...@ofbizUrl>";
>>>>> + }
>>>>> +}
>>>>> +
>>>>> +function makeExpDate() {
>>>>> + document.checkoutsetupform.expireDate.value =
>>>>>
>>>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>>>> + "/" +
>>>>>
>>>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>>>> +}
>>>>> +//]]>
>>>>> +</script>
>>>>> +
>>>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>>> +<div class="screenlet">
>>>>> + <div class="screenlet-body">
>>>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>>>> !requestParameters.createNew??)>
>>>>> + <#-- initial screen when we have a associated party -->
>>>>> + <form method="post"
>>>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>>>> border="0">
>>>>> + <tr>
>>>>> + <td colspan="2">
>>>>> + <a
>>>>> href="<@o...@ofbizUrl>"
>>>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>>>> + </td>
>>>>> + </tr>
>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>> + <#if billingAccountList?has_content>
>>>>> + <tr>
>>>>> + <td width="1%">
>>>>> + <select name="billingAccountId">
>>>>> + <option value=""></option>
>>>>> + <#list billingAccountList as billingAccount>
>>>>> + <#assign availableAmount =
>>>>> billingAccount.accountBalance?double>
>>>>> + <#if (billingAccount.accountLimit)??>
>>>>> + <#assign accountLimit =
>>>>> billingAccount.accountLimit?double />
>>>>> + <#else>
>>>>> + <#assign accountLimit = 0.00 />
>>>>> + </#if>
>>>>> + <option
>>>>> value="${billingAccount.billingAccountId}" <#if
>>>>> billingAccount.billingAccountId ==
>>>>>
>>>>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>>>>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>>>>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/>
>>>>> Limit:
>>>>> <@ofbizCurrency amount=accountLimit
>>>>> isoCode=billingAccount.accountCurrencyUomId/></option>
>>>>> + </#list>
>>>>> + </select>
>>>>> + </td>
>>>>> + <td width="50%">
>>>>> +
>>>>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>>>>> + </td>
>>>>> + <td> </td>
>>>>> + </tr>
>>>>> + <tr>
>>>>> + <td width="1%" align="right">
>>>>> + <input type="text" size="5"
>>>>> name="billingAccountAmount" value=""/>
>>>>> + </td>
>>>>> + <td width="50%">
>>>>> + ${uiLabelMap.OrderBillUpTo}
>>>>> + </td>
>>>>> + <td> </td>
>>>>> + </tr>
>>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>>> + </#if>
>>>>> + <tr>
>>>>
>
>
Re: svn commit: r1736868 [1/20] - in
/ofbiz/trunk/applications/order: template/ template/entry/
template/entry/cart/ template/entry/catalog/ template/entry/order/
template/order/ template/product/ template/quote/ template/reports/
template/request/ templat...
Posted by Jacques Le Roux <ja...@les7arts.com>.
Yes I'll in
https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Contributors+Best+Practices
and
https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities
pages indeed
Jacques
Le 02/04/2016 12:49, Pierre Smits a écrit :
> Maybe you should consider placing this kind of wisdom in a page.
>
> Best regards,
>
> Pierre Smits
>
> ORRTIZ.COM <http://www.orrtiz.com>
> OFBiz based solutions & services
>
> OFBiz Extensions Marketplace
> http://oem.ofbizci.net/oci-2/
>
> On Sat, Apr 2, 2016 at 12:40 PM, Jacques Le Roux <
> jacques.le.roux@les7arts.com> wrote:
>
>> You are right Deepak!
>>
>> We not only lose history when doing so but we also lose annotation which
>> is even more annoying.
>>
>> I will revert all the recent changes I committed and we (committers) need
>> to do the job directly in our working copies.
>>
>> So I'm happy from help from other committers to do so. I think it's even
>> easier for us than applying patches, etc.
>>
>> Note: patches should never be used to move files, we all (committers at
>> least) need to remember that, my bad sorry :/
>>
>> Thanks
>>
>> Jacques
>>
>> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>>
>>> Hi Jacques,
>>>
>>> I think we need to use svn mv command to move files to new location else
>>> we
>>> will lose the svn history of all files.
>>>
>>> Thanks & Regards
>>> --
>>> Deepak Dixit
>>> www.hotwaxsystems.com
>>>
>>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>>
>>> Author: jleroux
>>>> Date: Mon Mar 28 11:14:22 2016
>>>> New Revision: 1736868
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>>> Log:
>>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>>
>>>> Added:
>>>> ofbiz/trunk/applications/order/template/
>>>> ofbiz/trunk/applications/order/template/entry/
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>>> props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/order/
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/
>>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/order/transitions.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/product/
>>>>
>>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/quote/
>>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/reports/
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/request/
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
>>>> (with
>>>> props)
>>>>
>>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>>> (with props)
>>>>
>>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/return/
>>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/return/returnList.ftl
>>>> (with
>>>> props)
>>>>
>>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>>> (with props)
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>>> (with props)
>>>> ofbiz/trunk/applications/order/template/setup/
>>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
>>>> (with
>>>> props)
>>>> ofbiz/trunk/applications/order/template/task/
>>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
>>>> (with
>>>> props)
>>>> Modified:
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>>
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>>>
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>>
>>>> Added:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> ---
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>> (added)
>>>> +++
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>> Mon Mar 28 11:14:22 2016
>>>> @@ -0,0 +1,40 @@
>>>> +<#--
>>>> +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="screenlet">
>>>> +<div class="screenlet-title-bar">
>>>> + <ul>
>>>> + <#if orderHeader?has_content>
>>>> + <li class="h3">
>>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>>> + </li>
>>>> + <#else>
>>>> + <li class="h3">
>>>> + ${uiLabelMap.CommonCreate}
>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>> + <#else>
>>>> + ${uiLabelMap.OrderSalesOrder}
>>>> + </#if>
>>>> + </li>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>>> + </#if>
>>>> + </ul>
>>>> +</div>
>>>> +</div>
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added:
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> ---
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>> (added)
>>>> +++
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>> Mon Mar 28 11:14:22 2016
>>>> @@ -0,0 +1,52 @@
>>>> +<#--
>>>> +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 stepTitleId??>
>>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>>> +</#if>
>>>> +<div class="screenlet">
>>>> + <div class="screenlet-title-bar">
>>>> + <ul>
>>>> + <li class="h3">
>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>> + <#else>
>>>> + ${uiLabelMap.OrderSalesOrder}
>>>> + </#if>
>>>> + : ${stepTitle!}
>>>> + </li>
>>>> +
>>>> + <#if isLastStep == "N">
>>>> + <li><a
>>>>
>>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>>> + <#else>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>>> + </#if>
>>>> +
>>>> + <#list checkoutSteps?reverse as checkoutStep>
>>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>>> + <#if checkoutStep.enabled == "N">
>>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>>> + <#else>
>>>> + <li><a
>>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>>> + </#if>
>>>> + </#list>
>>>> + </ul>
>>>> + <br class="clear" />
>>>> + </div>
>>>> +</div>
>>>>
>>>> Propchange:
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange:
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange:
>>>>
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>> (added)
>>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>> Mon
>>>> Mar 28 11:14:22 2016
>>>> @@ -0,0 +1,60 @@
>>>> +<#--
>>>> +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="screenlet">
>>>> + <div class="screenlet-title-bar">
>>>> + <ul>
>>>> + <li class="h3">
>>>> + ${uiLabelMap.CommonCreate}
>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>> + ${uiLabelMap.OrderPurchaseOrder}
>>>> + <#else>
>>>> + ${uiLabelMap.OrderSalesOrder}
>>>> + </#if>
>>>> + </li>
>>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>>> (shoppingCart.size() = 0)>
>>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>>> + <#else>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>> + </#if>
>>>> + <#else>
>>>> + <#if shoppingCart.size() = 0>
>>>> + <li
>>>> class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>>> + <li
>>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>>> + <#else>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>>> + </#if>
>>>> + </#if>
>>>> +
>>>> + <#if (shoppingCart.size() > 0)>
>>>> + <li><a
>>>>
>>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>>> + <li><a
>>>>
>>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>>> + <#else>
>>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>>> + </#if>
>>>> + <li><a
>>>>
>>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>>> + </ul>
>>>> + <br class="clear">
>>>> + </div>
>>>> +</div>
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added:
>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>> (added)
>>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>> Mon Mar 28 11:14:22 2016
>>>> @@ -0,0 +1,112 @@
>>>> +<#--
>>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>> +<form method="post" action="<@o...@ofbizUrl>"
>>>> name="checkoutsetupform">
>>>> + <input type="hidden" name="finalizeMode"
>>>> value="removeEmptyShipGroups"/>
>>>> +</form>
>>>> +
>>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>>> class='boxoutside'>
>>>> +<tr>
>>>> + <td width='100%'>
>>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>>> class='boxbottom'>
>>>> + <tr>
>>>> + <td>
>>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>>> + <#assign shipGroupIndex = currIndex - 1>
>>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>>> + <table width="100%" cellpadding="1" border="0"
>>>> cellpadding="0" cellspacing="0">
>>>> + <tr>
>>>> + <td colspan="2">
>>>> + <h1>${uiLabelMap.OrderShipGroup}
>>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>>> ${uiLabelMap.OrderDropShipped} -
>>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>>> + </td>
>>>> + </tr>
>>>> + <tr>
>>>> + <td>
>>>> + <div>${uiLabelMap.ProductProduct}</div>
>>>> + </td>
>>>> + <td>
>>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>>> + </td>
>>>> + <td>
>>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>>> + </td>
>>>> + <td>
>>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>>> + </td>
>>>> + </tr>
>>>> +
>>>> + <#assign shipGroupItems =
>>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>>> + <#assign shoppingCartItems =
>>>> shipGroupItems.keySet().iterator()>
>>>> + <form method="post"
>>>> action="<@o...@ofbizUrl>"
>>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>>> + <#assign rowCount = 0>
>>>> + <#list shoppingCartItems as shoppingCartItem>
>>>> + <#assign cartLineIndex =
>>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>>> + <#assign shipGroupItemQuantity =
>>>> shipGroupItems.get(shoppingCartItem)>
>>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>>> value="${cartLineIndex}"/>
>>>> + <input type="hidden"
>>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>>> value="${shipGroupIndex}"/>
>>>> + <tr>
>>>> + <td>
>>>> + <div>[${shoppingCartItem.getProductId()}]
>>>> ${shoppingCartItem.getName()!}:
>>>> ${shoppingCartItem.getDescription()!}</div>
>>>> + </td>
>>>> + <td>
>>>> + <div>${shipGroupItemQuantity}</div>
>>>> + </td>
>>>> + <td>
>>>> + <div><input type="text"
>>>> name="quantity_o_${rowCount}"
>>>> value="${shipGroupItemQuantity}"/></div>
>>>> + </td>
>>>> + <td>
>>>> + <div>
>>>> + <select name="toGroupIndex_o_${rowCount}">
>>>> + <option value="${shipGroupIndex}">---</option>
>>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>>> groupIdx>
>>>> + <#assign groupNumber = groupIdx + 1>
>>>> + <option
>>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>>> ${groupNumber}</option>
>>>> + </#list>
>>>> + </select>
>>>> + </div>
>>>> + </td>
>>>> + </tr>
>>>> + <#assign rowCount = rowCount + 1>
>>>> + </#list>
>>>> + <#if (rowCount > 0)>
>>>> + <tr>
>>>> + <td colspan="3"> </td>
>>>> + <td>
>>>> + <input type="submit" class="smallSubmit"
>>>> value="${uiLabelMap.CommonSubmit}"/>
>>>> + </td>
>>>> + </tr>
>>>> + </#if>
>>>> + </table>
>>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>>> + </form>
>>>> + </#list>
>>>> + </td>
>>>> + </tr>
>>>> + </table>
>>>> + </td>
>>>> + </tr>
>>>> +</table>
>>>> +
>>>> +<br />
>>>> +<#else>
>>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>>> +</#if>
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar
>>>> 28
>>>> 11:14:22 2016
>>>> @@ -0,0 +1,263 @@
>>>> +<#--
>>>> +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">
>>>> +//<![CDATA[
>>>> +function submitForm(form, mode, value) {
>>>> + if (mode == "DN") {
>>>> + // done action; payment info
>>>> +
>>>>
>>>> form.action="<@o...@ofbizUrl>";
>>>> + form.submit();
>>>> + } else if (mode == "CS") {
>>>> + // continue shopping
>>>> +
>>>> form.action="<@o...@ofbizUrl>";
>>>> + form.submit();
>>>> + } else if (mode == "NA") {
>>>> + // new address
>>>> +
>>>>
>>>> form.action="<@o...@ofbizUrl>";
>>>> + form.submit();
>>>> + } else if (mode == "SV") {
>>>> + // save option; return to current screen
>>>> +
>>>> form.action="<@o...@ofbizUrl>";
>>>> + form.submit();
>>>> + } else if (mode == "SA") {
>>>> + // selected shipping address
>>>> +
>>>> form.action="<@o...@ofbizUrl>";
>>>> + form.submit();
>>>> + }
>>>> +}
>>>> +//]]>
>>>> +</script>
>>>> +
>>>> +<div class="screenlet">
>>>> + <div class="screenlet-title-bar">
>>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>>> + </div>
>>>> + <div class="screenlet-body">
>>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>>> + <#assign shipGroups = cart.getShipGroups()>
>>>> + <#if (shipGroups.size() > 0)>
>>>> + <#assign groupIdx = 0>
>>>> + <#list shipGroups as group>
>>>> + <#assign shipEstimateWrapper =
>>>>
>>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>>> cart, groupIdx)>
>>>> + <#assign carrierShipmentMethods =
>>>> shipEstimateWrapper.getShippingMethods()>
>>>> + <#assign groupNumber = groupIdx + 1>
>>>> + <form method="post" action="#"
>>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>>> + <input type="hidden" name="groupIndex"
>>>> value="${groupIdx}"/>
>>>> + <tr>
>>>> + <td>
>>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>>> ${groupNumber}:</b></div>
>>>> + <#list group.getShipItems() as item>
>>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>>> + <div
>>>> class="tabletext"> ${item.getName()} -
>>>> (${groupItem.getItemQuantity()})</div>
>>>> + </#list>
>>>> + </td>
>>>> + <td>
>>>> + <div>
>>>> + <span
>>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>>> + <a
>>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA',
>>>> '');"
>>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>>> + </div>
>>>> + <div>
>>>> + <#assign selectedContactMechId =
>>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>>> + <select name="shippingContactMechId"
>>>> class="selectBox"
>>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>>> null);">
>>>> + <option
>>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>>> + <#list shippingContactMechList as
>>>> shippingContactMech>
>>>> + <#assign shippingAddress =
>>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>>> + <option
>>>> value="${shippingAddress.contactMechId}" <#if
>>>> (shippingAddress.contactMechId ==
>>>>
>>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>>> + </#list>
>>>> + </select>
>>>> + </div>
>>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>>> + <#assign selectedShippingMethod =
>>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>>> cart.getCarrierPartyId(groupIdx)>
>>>> + <#else>
>>>> + <#assign selectedShippingMethod = "">
>>>> + </#if>
>>>> + <select name="shipmentMethodString"
>>>> class="selectBox">
>>>> + <option
>>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>>> + <#list carrierShipmentMethods as
>>>> carrierShipmentMethod>
>>>> + <#assign shippingEst =
>>>>
>>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>>> + <#assign shippingMethod =
>>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>>> carrierShipmentMethod.partyId>
>>>> + <option value="${shippingMethod}" <#if
>>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>>> + ${carrierShipmentMethod.partyId!}
>>>> + </#if>
>>>> + ${carrierShipmentMethod.description!}
>>>> + <#if shippingEst?has_content>
>>>> + -
>>>> + <#if (shippingEst > -1)>
>>>> + <@ofbizCurrency amount=shippingEst
>>>> isoCode=cart.getCurrency()/>
>>>> + <#else>
>>>> + ${uiLabelMap.OrderCalculatedOffline}
>>>> + </#if>
>>>> + </#if>
>>>> + </option>
>>>> + </#list>
>>>> + </select>
>>>> +
>>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>>> wrap="hard"
>>>>
>>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>>> + </td>
>>>> + <td>
>>>> + <div>
>>>> + <select name="maySplit" class="selectBox">
>>>> + <#assign maySplitStr =
>>>> cart.getMaySplit(groupIdx)?default("")>
>>>> + <option
>>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>>> + <option value="false" <#if maySplitStr ==
>>>>
>>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>>> + <option value="true" <#if maySplitStr ==
>>>>
>>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>>> + </select>
>>>> + </div>
>>>> + <div>
>>>> + <select name="isGift" class="selectBox">
>>>> + <#assign isGiftStr =
>>>> cart.getIsGift(groupIdx)?default("")>
>>>> + <option value="">${uiLabelMap.OrderIsGift}
>>>> ?</option>
>>>> + <option value="false" <#if isGiftStr ==
>>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>>> + <option value="true" <#if isGiftStr ==
>>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>>> + </select>
>>>> + </div>
>>>> +
>>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>>> wrap="hard"
>>>> name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>>> + </td>
>>>> + <td><input type="button" class="smallSubmit"
>>>> value="${uiLabelMap.CommonSave}"
>>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>>> null);"/></td>
>>>> + </tr>
>>>> + <#assign groupIdx = groupIdx + 1>
>>>> + <#if group_has_next>
>>>> + <tr>
>>>> + <td colspan="6"><hr /></td>
>>>> + </tr>
>>>> + </#if>
>>>> + </form>
>>>> + </#list>
>>>> + <#else>
>>>> + <div
>>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>>> + </#if>
>>>> + </table>
>>>> + </div>
>>>> +</div>
>>>> +
>>>> +<div class="screenlet">
>>>> + <div class="screenlet-title-bar">
>>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>>> + </div>
>>>> + <div class="screenlet-body">
>>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>>> + <tr>
>>>> + <td><div
>>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>>> + <td align="center"><div
>>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>>> + <td> </td>
>>>> + <td align="center"><div
>>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>>> + <td> </td>
>>>> + <td> </td>
>>>> + </tr>
>>>> +
>>>> + <#list cart.items() as cartLine>
>>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>>> + <tr>
>>>> + <form method="post"
>>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>>> style="margin: 0;">
>>>> + <input type="hidden" name="itemIndex"
>>>> value="${cartLineIndex}"/>
>>>> + <td>
>>>> + <div class="tabletext">
>>>> + <#if cartLine.getProductId()??>
>>>> + <#-- product item -->
>>>> + <#-- start code to display a small image of the
>>>> product -->
>>>> + <#assign smallImageUrl =
>>>>
>>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>>> + <#if !smallImageUrl?string?has_content><#assign
>>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>>> + <#if smallImageUrl?string?has_content>
>>>> + <a
>>>>
>>>> href="<@o...@ofbizUrl>">
>>>> + <img
>>>>
>>>> src="<@o...@ofbizContentUrl>"
>>>> class="cssImgSmall" alt="" />
>>>> + </a>
>>>> + </#if>
>>>> + <#-- end code to display a small image of the
>>>> product -->
>>>> + <a
>>>>
>>>> href="<@o...@ofbizUrl>"
>>>> class="buttontext">${cartLine.getProductId()} -
>>>> + ${cartLine.getName()!}</a> :
>>>> ${cartLine.getDescription()!}
>>>> +
>>>> + <#-- display the registered ship groups and
>>>> quantity -->
>>>> + <#assign itemShipGroups =
>>>> cart.getShipGroups(cartLine)>
>>>> + <#list itemShipGroups.entrySet() as group>
>>>> + <div class="tabletext">
>>>> + <#assign groupNumber = group.getKey() + 1>
>>>> + <b>Group - </b>${groupNumber} /
>>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>>> + </div>
>>>> + </#list>
>>>> +
>>>> + <#-- if inventory is not required check to see if
>>>> it is out of stock and needs to have a message shown about that... -->
>>>> + <#assign itemProduct = cartLine.getProduct()>
>>>> + <#assign
>>>> isStoreInventoryNotRequiredAndNotAvailable
>>>> =
>>>>
>>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>>> itemProduct, cartLine.getQuantity(), false, false)>
>>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>>> itemProduct.inventoryMessage?has_content>
>>>> + <b>(${itemProduct.inventoryMessage})</b>
>>>> + </#if>
>>>> +
>>>> + <#else>
>>>> + <#-- this is a non-product item -->
>>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>>> ${cartLine.getName()!}
>>>> + </#if>
>>>> + </div>
>>>> +
>>>> + </td>
>>>> + <td align="right">
>>>> + <div
>>>>
>>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>>> + </td>
>>>> + <td>
>>>> + <div> </div>
>>>> + </td>
>>>> + <td align="center">
>>>> + <input size="6" class="inputBox" type="text"
>>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>>> + </td>
>>>> + <td>
>>>> + <div> </div>
>>>> + </td>
>>>> + <td>
>>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>>> + <select name="fromGroupIndex" class="selectBox">
>>>> + <#list itemShipGroups.entrySet() as group>
>>>> + <#assign groupNumber = group.getKey() + 1>
>>>> + <option
>>>> value="${group.getKey()}">${uiLabelMap.CommonGroup}
>>>> ${groupNumber}</option>
>>>> + </#list>
>>>> + </select>
>>>> + </div>
>>>> + </td>
>>>> + <td>
>>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>>> + <select name="toGroupIndex" class="selectBox">
>>>> + <#list 0..(cart.getShipGroupSize() - 1) as
>>>> groupIdx>
>>>> + <#assign groupNumber = groupIdx + 1>
>>>> + <option
>>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>>> + </#list>
>>>> + <option value="-1">${uiLabelMap.CommonNew}
>>>> ${uiLabelMap.CommonGroup}</option>
>>>> + </select>
>>>> + </div>
>>>> + </td>
>>>> + <td><input type="submit" class="smallSubmit"
>>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>>> + </form>
>>>> + </tr>
>>>> + </#list>
>>>> + </table>
>>>> + </div>
>>>> +</div>
>>>> +
>>>> +<table>
>>>> + <tr valign="top">
>>>> + <td>
>>>> + <a
>>>> href="<@o...@ofbizUrl>"
>>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>>> + </td>
>>>> + <td align="right">
>>>> + <a href="<@o...@ofbizUrl>"
>>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>>> + </td>
>>>> + </tr>
>>>> +</table>
>>>>
>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added:
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> ---
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>> (added)
>>>> +++
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>> Mon Mar 28 11:14:22 2016
>>>> @@ -0,0 +1,64 @@
>>>> +<#--
>>>> +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.
>>>> +-->
>>>> +
>>>> +<#-- ==================== Party Listing dialog box
>>>> ========================= -->
>>>> +<#if additionalPartyRoleMap?has_content>
>>>> +<div class="screenlet">
>>>> + <div class="screenlet-title-bar">
>>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>>> + </div>
>>>> + <div class="screenlet-body">
>>>> + <table border="0" width="100%" cellpadding="0">
>>>> + <#list roleList as role>
>>>> + <tr>
>>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>>> locale)}</div></td>
>>>> + </tr>
>>>> + <tr>
>>>> + <td colspan="4"><hr /></td>
>>>> + </tr>
>>>> + <#list additionalPartyRoleMap[role] as party>
>>>> + <tr>
>>>> + <td><div>${party}</div></td>
>>>> + <td>
>>>> + <div>
>>>> + <#if partyData[party].type == "person">
>>>> + ${partyData[party].firstName!}
>>>> + <#else>
>>>> + ${partyData[party].groupName!}
>>>> + </#if>
>>>> + </div>
>>>> + </td>
>>>> + <td>
>>>> + <div>
>>>> + <#if partyData[party].type == "person">
>>>> + ${partyData[party].lastName!}
>>>> + </#if>
>>>> + </div>
>>>> + </td>
>>>> + <td align="right">
>>>> + <a
>>>>
>>>> href="<@o...@ofbizUrl>"
>>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>>> + </td>
>>>> + </tr>
>>>> + </#list>
>>>> + <tr><td> </td></tr>
>>>> + </#list>
>>>> + </table>
>>>> + </div>
>>>> +</div>
>>>> +</#if>
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>> (added)
>>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon
>>>> Mar
>>>> 28 11:14:22 2016
>>>> @@ -0,0 +1,80 @@
>>>> +<#--
>>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>> +
>>>> +<form method="post" action="<@o...@ofbizUrl>"
>>>> name="checkoutsetupform">
>>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>>> cellpadding='0' class='boxoutside'>
>>>> + <tr><td>
>>>> +
>>>> + <#-- header table -->
>>>> +
>>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>>> class='boxtop'>
>>>> + <tr>
>>>> + <td valign="middle">
>>>> + <div
>>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>>> + </td>
>>>> + </tr>
>>>> + </table>
>>>> +
>>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>>> class='boxbottom'>
>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>> +
>>>> + <#-- postal addresses for chosen id -->
>>>> +
>>>> + <#if partyContactMechPurposes??>
>>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>>> + <#assign shippingAddress =
>>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>>> +
>>>> + <#-- skip non-postal addresses -->
>>>> +
>>>> + <#if shippingAddress.toName??>
>>>> + <tr>
>>>> + <td valign="top" nowrap="nowrap">
>>>> + <input type="radio" name="shipping_contact_mech_id"
>>>> value="${partyContactMechPurpose.contactMechId}" />
>>>> + </td>
>>>> + <td nowrap="nowrap"> </td>
>>>> + <td width="100%">
>>>> + <div>
>>>> + <#if
>>>>
>>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>>> /></#if>
>>>> + <#if
>>>>
>>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>>> /></#if>
>>>> + <#if
>>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br
>>>> /></#if>
>>>> + <#if
>>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br
>>>> /></#if>
>>>> + <#if
>>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>>> + <#if
>>>> shippingAddress.stateProvinceGeoId?has_content><br
>>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>>> + <#if shippingAddress.postalCode?has_content><br
>>>> />${shippingAddress.postalCode}</#if>
>>>> + <#if shippingAddress.countryGeoId?has_content><br
>>>> />${shippingAddress.countryGeoId}</#if>
>>>> + </div>
>>>> + </td>
>>>> + </tr>
>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>> + </#if>
>>>> + </#list>
>>>> + </#if>
>>>> +
>>>> + </table>
>>>> +
>>>> + </td></tr>
>>>> + </table>
>>>> +</form>
>>>> +
>>>> +<#else>
>>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>>> +</#if>
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:eol-style = native
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:keywords = Date Rev Author URL Id
>>>>
>>>> Propchange:
>>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> svn:mime-type = text/plain
>>>>
>>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>> URL:
>>>>
>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>>
>>>>
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>>> (added)
>>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon
>>>> Mar
>>>> 28 11:14:22 2016
>>>> @@ -0,0 +1,516 @@
>>>> +<#--
>>>> +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 type="text/javascript">
>>>> +//<![CDATA[
>>>> +function shipBillAddr() {
>>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>>> + window.location =
>>>>
>>>> "<@o...@ofbizUrl>";
>>>> + } else {
>>>> + window.location =
>>>>
>>>> "<@o...@ofbizUrl>";
>>>> + }
>>>> +}
>>>> +
>>>> +function makeExpDate() {
>>>> + document.checkoutsetupform.expireDate.value =
>>>>
>>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>>> + "/" +
>>>>
>>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>>> +}
>>>> +//]]>
>>>> +</script>
>>>> +
>>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>>> +<div class="screenlet">
>>>> + <div class="screenlet-body">
>>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>>> !requestParameters.createNew??)>
>>>> + <#-- initial screen when we have a associated party -->
>>>> + <form method="post"
>>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>>> border="0">
>>>> + <tr>
>>>> + <td colspan="2">
>>>> + <a
>>>> href="<@o...@ofbizUrl>"
>>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>>> + </td>
>>>> + </tr>
>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>> + <#if billingAccountList?has_content>
>>>> + <tr>
>>>> + <td width="1%">
>>>> + <select name="billingAccountId">
>>>> + <option value=""></option>
>>>> + <#list billingAccountList as billingAccount>
>>>> + <#assign availableAmount =
>>>> billingAccount.accountBalance?double>
>>>> + <#if (billingAccount.accountLimit)??>
>>>> + <#assign accountLimit =
>>>> billingAccount.accountLimit?double />
>>>> + <#else>
>>>> + <#assign accountLimit = 0.00 />
>>>> + </#if>
>>>> + <option
>>>> value="${billingAccount.billingAccountId}" <#if
>>>> billingAccount.billingAccountId ==
>>>>
>>>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>>>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>>>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/>
>>>> Limit:
>>>> <@ofbizCurrency amount=accountLimit
>>>> isoCode=billingAccount.accountCurrencyUomId/></option>
>>>> + </#list>
>>>> + </select>
>>>> + </td>
>>>> + <td width="50%">
>>>> +
>>>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>>>> + </td>
>>>> + <td> </td>
>>>> + </tr>
>>>> + <tr>
>>>> + <td width="1%" align="right">
>>>> + <input type="text" size="5"
>>>> name="billingAccountAmount" value=""/>
>>>> + </td>
>>>> + <td width="50%">
>>>> + ${uiLabelMap.OrderBillUpTo}
>>>> + </td>
>>>> + <td> </td>
>>>> + </tr>
>>>> + <tr><td colspan="3"><hr /></td></tr>
>>>> + </#if>
>>>> + <tr>
>>>
Re: svn commit: r1736868 [1/20] - in /ofbiz/trunk/applications/order:
template/ template/entry/ template/entry/cart/ template/entry/catalog/
template/entry/order/ template/order/ template/product/ template/quote/
template/reports/ template/request/ templat...
Posted by Pierre Smits <pi...@gmail.com>.
Maybe you should consider placing this kind of wisdom in a page.
Best regards,
Pierre Smits
ORRTIZ.COM <http://www.orrtiz.com>
OFBiz based solutions & services
OFBiz Extensions Marketplace
http://oem.ofbizci.net/oci-2/
On Sat, Apr 2, 2016 at 12:40 PM, Jacques Le Roux <
jacques.le.roux@les7arts.com> wrote:
> You are right Deepak!
>
> We not only lose history when doing so but we also lose annotation which
> is even more annoying.
>
> I will revert all the recent changes I committed and we (committers) need
> to do the job directly in our working copies.
>
> So I'm happy from help from other committers to do so. I think it's even
> easier for us than applying patches, etc.
>
> Note: patches should never be used to move files, we all (committers at
> least) need to remember that, my bad sorry :/
>
> Thanks
>
> Jacques
>
> Le 02/04/2016 12:12, Deepak Dixit a écrit :
>
>> Hi Jacques,
>>
>> I think we need to use svn mv command to move files to new location else
>> we
>> will lose the svn history of all files.
>>
>> Thanks & Regards
>> --
>> Deepak Dixit
>> www.hotwaxsystems.com
>>
>> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>>
>> Author: jleroux
>>> Date: Mon Mar 28 11:14:22 2016
>>> New Revision: 1736868
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>>> Log:
>>> A patch from Pierre Smits for <<relocate .ftl files in the order
>>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/
>>> ofbiz/trunk/applications/order/template/entry/
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/cart/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/
>>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/order/transitions.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/product/
>>>
>>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/
>>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>>> props)
>>> ofbiz/trunk/applications/order/template/reports/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>>> (with props)
>>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/request/
>>>
>>>
>>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
>>> (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>>> (with props)
>>>
>>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/
>>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/return/returnItems.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/return/returnList.ftl
>>> (with
>>> props)
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>>> (with props)
>>>
>>>
>>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>>> (with props)
>>> ofbiz/trunk/applications/order/template/setup/
>>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
>>> (with
>>> props)
>>> ofbiz/trunk/applications/order/template/task/
>>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
>>> (with
>>> props)
>>> Modified:
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>>
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>>
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>>>
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,40 @@
>>> +<#--
>>> +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="screenlet">
>>> +<div class="screenlet-title-bar">
>>> + <ul>
>>> + <#if orderHeader?has_content>
>>> + <li class="h3">
>>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>>> + </li>
>>> + <#else>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>>> + </#if>
>>> + </ul>
>>> +</div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> (added)
>>> +++
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,52 @@
>>> +<#--
>>> +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 stepTitleId??>
>>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>>> +</#if>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + : ${stepTitle!}
>>> + </li>
>>> +
>>> + <#if isLastStep == "N">
>>> + <li><a
>>>
>>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>>> + <#else>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>>> + </#if>
>>> +
>>> + <#list checkoutSteps?reverse as checkoutStep>
>>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>>> + <#if checkoutStep.enabled == "N">
>>> + <li><span class="disabled">${stepUiLabel}</span></li>
>>> + <#else>
>>> + <li><a
>>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>>> + </#if>
>>> + </#list>
>>> + </ul>
>>> + <br class="clear" />
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>>
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>> Mon
>>> Mar 28 11:14:22 2016
>>> @@ -0,0 +1,60 @@
>>> +<#--
>>> +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="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <ul>
>>> + <li class="h3">
>>> + ${uiLabelMap.CommonCreate}
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + ${uiLabelMap.OrderPurchaseOrder}
>>> + <#else>
>>> + ${uiLabelMap.OrderSalesOrder}
>>> + </#if>
>>> + </li>
>>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>>> (shoppingCart.size() = 0)>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>> + </#if>
>>> + <#else>
>>> + <#if shoppingCart.size() = 0>
>>> + <li
>>> class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>>> + <li
>>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>>> + <#else>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>>> + </#if>
>>> + </#if>
>>> +
>>> + <#if (shoppingCart.size() > 0)>
>>> + <li><a
>>>
>>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>>> + <li><a
>>>
>>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>>> + <#else>
>>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>>> + </#if>
>>> + <li><a
>>>
>>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>>> + </ul>
>>> + <br class="clear">
>>> + </div>
>>> +</div>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,112 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode"
>>> value="removeEmptyShipGroups"/>
>>> +</form>
>>> +
>>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>>> class='boxoutside'>
>>> +<tr>
>>> + <td width='100%'>
>>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr>
>>> + <td>
>>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>>> + <#assign shipGroupIndex = currIndex - 1>
>>> + <#assign supplier = delegator.findOne("PartyGroup",
>>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>>> + <table width="100%" cellpadding="1" border="0"
>>> cellpadding="0" cellspacing="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <h1>${uiLabelMap.OrderShipGroup}
>>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>>> ${uiLabelMap.OrderDropShipped} -
>>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>>> + </td>
>>> + </tr>
>>> + <tr>
>>> + <td>
>>> + <div>${uiLabelMap.ProductProduct}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.CommonQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>>> + </td>
>>> + </tr>
>>> +
>>> + <#assign shipGroupItems =
>>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>>> + <#assign shoppingCartItems =
>>> shipGroupItems.keySet().iterator()>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>"
>>> name="assignitemtoshipgroup${shipGroupIndex}">
>>> + <input type="hidden" name="_useRowSubmit" value="N" />
>>> + <#assign rowCount = 0>
>>> + <#list shoppingCartItems as shoppingCartItem>
>>> + <#assign cartLineIndex =
>>> shoppingCart.getItemIndex(shoppingCartItem)>
>>> + <#assign shipGroupItemQuantity =
>>> shipGroupItems.get(shoppingCartItem)>
>>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>>> value="${cartLineIndex}"/>
>>> + <input type="hidden"
>>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>>> value="${shipGroupIndex}"/>
>>> + <tr>
>>> + <td>
>>> + <div>[${shoppingCartItem.getProductId()}]
>>> ${shoppingCartItem.getName()!}:
>>> ${shoppingCartItem.getDescription()!}</div>
>>> + </td>
>>> + <td>
>>> + <div>${shipGroupItemQuantity}</div>
>>> + </td>
>>> + <td>
>>> + <div><input type="text"
>>> name="quantity_o_${rowCount}"
>>> value="${shipGroupItemQuantity}"/></div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="toGroupIndex_o_${rowCount}">
>>> + <option value="${shipGroupIndex}">---</option>
>>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>>> groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>>> ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <#assign rowCount = rowCount + 1>
>>> + </#list>
>>> + <#if (rowCount > 0)>
>>> + <tr>
>>> + <td colspan="3"> </td>
>>> + <td>
>>> + <input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/>
>>> + </td>
>>> + </tr>
>>> + </#if>
>>> + </table>
>>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>>> + </form>
>>> + </#list>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> + </td>
>>> + </tr>
>>> +</table>
>>> +
>>> +<br />
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar
>>> 28
>>> 11:14:22 2016
>>> @@ -0,0 +1,263 @@
>>> +<#--
>>> +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">
>>> +//<![CDATA[
>>> +function submitForm(form, mode, value) {
>>> + if (mode == "DN") {
>>> + // done action; payment info
>>> +
>>>
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "CS") {
>>> + // continue shopping
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "NA") {
>>> + // new address
>>> +
>>>
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "SV") {
>>> + // save option; return to current screen
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + } else if (mode == "SA") {
>>> + // selected shipping address
>>> +
>>> form.action="<@o...@ofbizUrl>";
>>> + form.submit();
>>> + }
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <#assign shipGroups = cart.getShipGroups()>
>>> + <#if (shipGroups.size() > 0)>
>>> + <#assign groupIdx = 0>
>>> + <#list shipGroups as group>
>>> + <#assign shipEstimateWrapper =
>>>
>>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>>> cart, groupIdx)>
>>> + <#assign carrierShipmentMethods =
>>> shipEstimateWrapper.getShippingMethods()>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <form method="post" action="#"
>>> name="editgroupform${groupIdx}" style="margin: 0;">
>>> + <input type="hidden" name="groupIndex"
>>> value="${groupIdx}"/>
>>> + <tr>
>>> + <td>
>>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>>> ${groupNumber}:</b></div>
>>> + <#list group.getShipItems() as item>
>>> + <#assign groupItem = group.getShipItemInfo(item)>
>>> + <div
>>> class="tabletext"> ${item.getName()} -
>>> (${groupItem.getItemQuantity()})</div>
>>> + </#list>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <span
>>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>>> + <a
>>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA',
>>> '');"
>>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>>> + </div>
>>> + <div>
>>> + <#assign selectedContactMechId =
>>> cart.getShippingContactMechId(groupIdx)?default("")>
>>> + <select name="shippingContactMechId"
>>> class="selectBox"
>>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>>> null);">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>>> + <#list shippingContactMechList as
>>> shippingContactMech>
>>> + <#assign shippingAddress =
>>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>>> + <option
>>> value="${shippingAddress.contactMechId}" <#if
>>> (shippingAddress.contactMechId ==
>>>
>>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>>> + <#assign selectedShippingMethod =
>>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>>> cart.getCarrierPartyId(groupIdx)>
>>> + <#else>
>>> + <#assign selectedShippingMethod = "">
>>> + </#if>
>>> + <select name="shipmentMethodString"
>>> class="selectBox">
>>> + <option
>>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>>> + <#list carrierShipmentMethods as
>>> carrierShipmentMethod>
>>> + <#assign shippingEst =
>>>
>>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>>> + <#assign shippingMethod =
>>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>>> carrierShipmentMethod.partyId>
>>> + <option value="${shippingMethod}" <#if
>>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>>> + <#if carrierShipmentMethod.partyId != "_NA_">
>>> + ${carrierShipmentMethod.partyId!}
>>> + </#if>
>>> + ${carrierShipmentMethod.description!}
>>> + <#if shippingEst?has_content>
>>> + -
>>> + <#if (shippingEst > -1)>
>>> + <@ofbizCurrency amount=shippingEst
>>> isoCode=cart.getCurrency()/>
>>> + <#else>
>>> + ${uiLabelMap.OrderCalculatedOffline}
>>> + </#if>
>>> + </#if>
>>> + </option>
>>> + </#list>
>>> + </select>
>>> +
>>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>>> + <textarea class='textAreaBox' cols="35" rows="3"
>>> wrap="hard"
>>>
>>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <select name="maySplit" class="selectBox">
>>> + <#assign maySplitStr =
>>> cart.getMaySplit(groupIdx)?default("")>
>>> + <option
>>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>>> + <option value="false" <#if maySplitStr ==
>>>
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>>> + <option value="true" <#if maySplitStr ==
>>>
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>>> + </select>
>>> + </div>
>>> + <div>
>>> + <select name="isGift" class="selectBox">
>>> + <#assign isGiftStr =
>>> cart.getIsGift(groupIdx)?default("")>
>>> + <option value="">${uiLabelMap.OrderIsGift}
>>> ?</option>
>>> + <option value="false" <#if isGiftStr ==
>>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>>> + <option value="true" <#if isGiftStr ==
>>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>>> + </select>
>>> + </div>
>>> +
>>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>>> + <textarea class='textAreaBox' cols="30" rows="3"
>>> wrap="hard"
>>> name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>>> + </td>
>>> + <td><input type="button" class="smallSubmit"
>>> value="${uiLabelMap.CommonSave}"
>>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>>> null);"/></td>
>>> + </tr>
>>> + <#assign groupIdx = groupIdx + 1>
>>> + <#if group_has_next>
>>> + <tr>
>>> + <td colspan="6"><hr /></td>
>>> + </tr>
>>> + </#if>
>>> + </form>
>>> + </#list>
>>> + <#else>
>>> + <div
>>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>>> + </#if>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>>> + <tr>
>>> + <td><div
>>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>>> + <td> </td>
>>> + <td align="center"><div
>>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>>> + <td> </td>
>>> + <td> </td>
>>> + </tr>
>>> +
>>> + <#list cart.items() as cartLine>
>>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>>> + <tr>
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="editgroupform"
>>> style="margin: 0;">
>>> + <input type="hidden" name="itemIndex"
>>> value="${cartLineIndex}"/>
>>> + <td>
>>> + <div class="tabletext">
>>> + <#if cartLine.getProductId()??>
>>> + <#-- product item -->
>>> + <#-- start code to display a small image of the
>>> product -->
>>> + <#assign smallImageUrl =
>>>
>>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>>> + <#if !smallImageUrl?string?has_content><#assign
>>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>>> + <#if smallImageUrl?string?has_content>
>>> + <a
>>>
>>> href="<@o...@ofbizUrl>">
>>> + <img
>>>
>>> src="<@o...@ofbizContentUrl>"
>>> class="cssImgSmall" alt="" />
>>> + </a>
>>> + </#if>
>>> + <#-- end code to display a small image of the
>>> product -->
>>> + <a
>>>
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${cartLine.getProductId()} -
>>> + ${cartLine.getName()!}</a> :
>>> ${cartLine.getDescription()!}
>>> +
>>> + <#-- display the registered ship groups and
>>> quantity -->
>>> + <#assign itemShipGroups =
>>> cart.getShipGroups(cartLine)>
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <div class="tabletext">
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <b>Group - </b>${groupNumber} /
>>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>>> + </div>
>>> + </#list>
>>> +
>>> + <#-- if inventory is not required check to see if
>>> it is out of stock and needs to have a message shown about that... -->
>>> + <#assign itemProduct = cartLine.getProduct()>
>>> + <#assign
>>> isStoreInventoryNotRequiredAndNotAvailable
>>> =
>>>
>>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>>> itemProduct, cartLine.getQuantity(), false, false)>
>>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>>> itemProduct.inventoryMessage?has_content>
>>> + <b>(${itemProduct.inventoryMessage})</b>
>>> + </#if>
>>> +
>>> + <#else>
>>> + <#-- this is a non-product item -->
>>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>>> ${cartLine.getName()!}
>>> + </#if>
>>> + </div>
>>> +
>>> + </td>
>>> + <td align="right">
>>> + <div
>>>
>>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td align="center">
>>> + <input size="6" class="inputBox" type="text"
>>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>>> + </td>
>>> + <td>
>>> + <div> </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>>> + <select name="fromGroupIndex" class="selectBox">
>>> + <#list itemShipGroups.entrySet() as group>
>>> + <#assign groupNumber = group.getKey() + 1>
>>> + <option
>>> value="${group.getKey()}">${uiLabelMap.CommonGroup}
>>> ${groupNumber}</option>
>>> + </#list>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>>> + <select name="toGroupIndex" class="selectBox">
>>> + <#list 0..(cart.getShipGroupSize() - 1) as
>>> groupIdx>
>>> + <#assign groupNumber = groupIdx + 1>
>>> + <option
>>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>>> + </#list>
>>> + <option value="-1">${uiLabelMap.CommonNew}
>>> ${uiLabelMap.CommonGroup}</option>
>>> + </select>
>>> + </div>
>>> + </td>
>>> + <td><input type="submit" class="smallSubmit"
>>> value="${uiLabelMap.CommonSubmit}"/></td>
>>> + </form>
>>> + </tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +
>>> +<table>
>>> + <tr valign="top">
>>> + <td>
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>>> + </td>
>>> + <td align="right">
>>> + <a href="<@o...@ofbizUrl>"
>>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>>> + </td>
>>> + </tr>
>>> +</table>
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> (added)
>>> +++
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>> Mon Mar 28 11:14:22 2016
>>> @@ -0,0 +1,64 @@
>>> +<#--
>>> +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.
>>> +-->
>>> +
>>> +<#-- ==================== Party Listing dialog box
>>> ========================= -->
>>> +<#if additionalPartyRoleMap?has_content>
>>> +<div class="screenlet">
>>> + <div class="screenlet-title-bar">
>>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>>> + </div>
>>> + <div class="screenlet-body">
>>> + <table border="0" width="100%" cellpadding="0">
>>> + <#list roleList as role>
>>> + <tr>
>>> + <td valign="bottom"><div>${roleData[role].get("description",
>>> locale)}</div></td>
>>> + </tr>
>>> + <tr>
>>> + <td colspan="4"><hr /></td>
>>> + </tr>
>>> + <#list additionalPartyRoleMap[role] as party>
>>> + <tr>
>>> + <td><div>${party}</div></td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].firstName!}
>>> + <#else>
>>> + ${partyData[party].groupName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td>
>>> + <div>
>>> + <#if partyData[party].type == "person">
>>> + ${partyData[party].lastName!}
>>> + </#if>
>>> + </div>
>>> + </td>
>>> + <td align="right">
>>> + <a
>>>
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>>> + </td>
>>> + </tr>
>>> + </#list>
>>> + <tr><td> </td></tr>
>>> + </#list>
>>> + </table>
>>> + </div>
>>> +</div>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon
>>> Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,80 @@
>>> +<#--
>>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +
>>> +<form method="post" action="<@o...@ofbizUrl>"
>>> name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="ship"/>
>>> + <table width="100%" border="0" align="center" cellspacing='0'
>>> cellpadding='0' class='boxoutside'>
>>> + <tr><td>
>>> +
>>> + <#-- header table -->
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxtop'>
>>> + <tr>
>>> + <td valign="middle">
>>> + <div
>>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>>> + </td>
>>> + </tr>
>>> + </table>
>>> +
>>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>>> class='boxbottom'>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> +
>>> + <#-- postal addresses for chosen id -->
>>> +
>>> + <#if partyContactMechPurposes??>
>>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>>> + <#assign shippingAddress =
>>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>>> +
>>> + <#-- skip non-postal addresses -->
>>> +
>>> + <#if shippingAddress.toName??>
>>> + <tr>
>>> + <td valign="top" nowrap="nowrap">
>>> + <input type="radio" name="shipping_contact_mech_id"
>>> value="${partyContactMechPurpose.contactMechId}" />
>>> + </td>
>>> + <td nowrap="nowrap"> </td>
>>> + <td width="100%">
>>> + <div>
>>> + <#if
>>>
>>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>>> /></#if>
>>> + <#if
>>>
>>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.address1?has_content>${shippingAddress.address1}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.address2?has_content>${shippingAddress.address2}<br
>>> /></#if>
>>> + <#if
>>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>>> + <#if
>>> shippingAddress.stateProvinceGeoId?has_content><br
>>> />${shippingAddress.stateProvinceGeoId}</#if>
>>> + <#if shippingAddress.postalCode?has_content><br
>>> />${shippingAddress.postalCode}</#if>
>>> + <#if shippingAddress.countryGeoId?has_content><br
>>> />${shippingAddress.countryGeoId}</#if>
>>> + </div>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + </#list>
>>> + </#if>
>>> +
>>> + </table>
>>> +
>>> + </td></tr>
>>> + </table>
>>> +</form>
>>> +
>>> +<#else>
>>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>>> +</#if>
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange:
>>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/plain
>>>
>>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>> (added)
>>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon
>>> Mar
>>> 28 11:14:22 2016
>>> @@ -0,0 +1,516 @@
>>> +<#--
>>> +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 type="text/javascript">
>>> +//<![CDATA[
>>> +function shipBillAddr() {
>>> + if (document.checkoutsetupform.useShipAddr.checked) {
>>> + window.location =
>>>
>>> "<@o...@ofbizUrl>";
>>> + } else {
>>> + window.location =
>>>
>>> "<@o...@ofbizUrl>";
>>> + }
>>> +}
>>> +
>>> +function makeExpDate() {
>>> + document.checkoutsetupform.expireDate.value =
>>>
>>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>>> + "/" +
>>>
>>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>>> +}
>>> +//]]>
>>> +</script>
>>> +
>>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>>> +<div class="screenlet">
>>> + <div class="screenlet-body">
>>> + <#if request.getAttribute("paymentMethodId")?? || (
>>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>>> !requestParameters.createNew??)>
>>> + <#-- initial screen when we have a associated party -->
>>> + <form method="post"
>>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>>> + <input type="hidden" name="finalizeMode" value="payment"/>
>>> + <table width="100%" cellpadding="1" cellspacing="0"
>>> border="0">
>>> + <tr>
>>> + <td colspan="2">
>>> + <a
>>> href="<@o...@ofbizUrl>"
>>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>>> + </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + <#if billingAccountList?has_content>
>>> + <tr>
>>> + <td width="1%">
>>> + <select name="billingAccountId">
>>> + <option value=""></option>
>>> + <#list billingAccountList as billingAccount>
>>> + <#assign availableAmount =
>>> billingAccount.accountBalance?double>
>>> + <#if (billingAccount.accountLimit)??>
>>> + <#assign accountLimit =
>>> billingAccount.accountLimit?double />
>>> + <#else>
>>> + <#assign accountLimit = 0.00 />
>>> + </#if>
>>> + <option
>>> value="${billingAccount.billingAccountId}" <#if
>>> billingAccount.billingAccountId ==
>>>
>>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/>
>>> Limit:
>>> <@ofbizCurrency amount=accountLimit
>>> isoCode=billingAccount.accountCurrencyUomId/></option>
>>> + </#list>
>>> + </select>
>>> + </td>
>>> + <td width="50%">
>>> +
>>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>>> + </td>
>>> + <td> </td>
>>> + </tr>
>>> + <tr>
>>> + <td width="1%" align="right">
>>> + <input type="text" size="5"
>>> name="billingAccountAmount" value=""/>
>>> + </td>
>>> + <td width="50%">
>>> + ${uiLabelMap.OrderBillUpTo}
>>> + </td>
>>> + <td> </td>
>>> + </tr>
>>> + <tr><td colspan="3"><hr /></td></tr>
>>> + </#if>
>>> + <tr>
>>
>>
Re: svn commit: r1736868 [1/20] - in
/ofbiz/trunk/applications/order: template/ template/entry/
template/entry/cart/ template/entry/catalog/ template/entry/order/
template/order/ template/product/ template/quote/ template/reports/
template/request/ templat...
Posted by Jacques Le Roux <ja...@les7arts.com>.
You are right Deepak!
We not only lose history when doing so but we also lose annotation which is even more annoying.
I will revert all the recent changes I committed and we (committers) need to do the job directly in our working copies.
So I'm happy from help from other committers to do so. I think it's even easier for us than applying patches, etc.
Note: patches should never be used to move files, we all (committers at least) need to remember that, my bad sorry :/
Thanks
Jacques
Le 02/04/2016 12:12, Deepak Dixit a écrit :
> Hi Jacques,
>
> I think we need to use svn mv command to move files to new location else we
> will lose the svn history of all files.
>
> Thanks & Regards
> --
> Deepak Dixit
> www.hotwaxsystems.com
>
> On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
>
>> Author: jleroux
>> Date: Mon Mar 28 11:14:22 2016
>> New Revision: 1736868
>>
>> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
>> Log:
>> A patch from Pierre Smits for <<relocate .ftl files in the order
>> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>>
>> Added:
>> ofbiz/trunk/applications/order/template/
>> ofbiz/trunk/applications/order/template/entry/
>>
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
>> props)
>>
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/billsettings.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/cart/
>>
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/custsettings.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/order/
>>
>> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/entry/survey.ftl (with props)
>> ofbiz/trunk/applications/order/template/order/
>> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/order/transitions.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/product/
>>
>> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/product/productdetail.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/quote/
>> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/reports/
>>
>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
>> (with props)
>> ofbiz/trunk/applications/order/template/reports/orderreport.xml
>> (with props)
>> ofbiz/trunk/applications/order/template/reports/reportlist.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/request/
>>
>> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl (with
>> props)
>>
>> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/request/requestDate.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/return/
>> ofbiz/trunk/applications/order/template/return/quickReturn.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/return/returnItems.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/return/returnLinks.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/return/returnList.ftl (with
>> props)
>>
>> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
>> (with props)
>>
>> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
>> (with props)
>> ofbiz/trunk/applications/order/template/setup/
>> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl (with
>> props)
>> ofbiz/trunk/applications/order/template/task/
>> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl (with
>> props)
>> Modified:
>> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>>
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>>
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>>
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>>
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
>> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>>
>> Added:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> ---
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>> (added)
>> +++
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>> Mon Mar 28 11:14:22 2016
>> @@ -0,0 +1,40 @@
>> +<#--
>> +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="screenlet">
>> +<div class="screenlet-title-bar">
>> + <ul>
>> + <#if orderHeader?has_content>
>> + <li class="h3">
>> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
>> + </li>
>> + <#else>
>> + <li class="h3">
>> + ${uiLabelMap.CommonCreate}
>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>> + ${uiLabelMap.OrderPurchaseOrder}
>> + <#else>
>> + ${uiLabelMap.OrderSalesOrder}
>> + </#if>
>> + </li>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
>> + </#if>
>> + </ul>
>> +</div>
>> +</div>
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> ---
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>> (added)
>> +++
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>> Mon Mar 28 11:14:22 2016
>> @@ -0,0 +1,52 @@
>> +<#--
>> +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 stepTitleId??>
>> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
>> +</#if>
>> +<div class="screenlet">
>> + <div class="screenlet-title-bar">
>> + <ul>
>> + <li class="h3">
>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>> + ${uiLabelMap.OrderPurchaseOrder}
>> + <#else>
>> + ${uiLabelMap.OrderSalesOrder}
>> + </#if>
>> + : ${stepTitle!}
>> + </li>
>> +
>> + <#if isLastStep == "N">
>> + <li><a
>> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
>> + <#else>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
>> + </#if>
>> +
>> + <#list checkoutSteps?reverse as checkoutStep>
>> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
>> + <#if checkoutStep.enabled == "N">
>> + <li><span class="disabled">${stepUiLabel}</span></li>
>> + <#else>
>> + <li><a
>> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
>> + </#if>
>> + </#list>
>> + </ul>
>> + <br class="clear" />
>> + </div>
>> +</div>
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>> (added)
>> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Mon
>> Mar 28 11:14:22 2016
>> @@ -0,0 +1,60 @@
>> +<#--
>> +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="screenlet">
>> + <div class="screenlet-title-bar">
>> + <ul>
>> + <li class="h3">
>> + ${uiLabelMap.CommonCreate}
>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>> + ${uiLabelMap.OrderPurchaseOrder}
>> + <#else>
>> + ${uiLabelMap.OrderSalesOrder}
>> + </#if>
>> + </li>
>> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
>> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
>> (shoppingCart.size() = 0)>
>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>> + <#else>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>> + </#if>
>> + <#else>
>> + <#if shoppingCart.size() = 0>
>> + <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
>> + <li
>> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
>> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
>> + <#else>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
>> + </#if>
>> + </#if>
>> +
>> + <#if (shoppingCart.size() > 0)>
>> + <li><a
>> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
>> + <li><a
>> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
>> + <#else>
>> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
>> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
>> + </#if>
>> + <li><a
>> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
>> + </ul>
>> + <br class="clear">
>> + </div>
>> +</div>
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>> (added)
>> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>> Mon Mar 28 11:14:22 2016
>> @@ -0,0 +1,112 @@
>> +<#--
>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>> +<form method="post" action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + <input type="hidden" name="finalizeMode" value="removeEmptyShipGroups"/>
>> +</form>
>> +
>> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
>> class='boxoutside'>
>> +<tr>
>> + <td width='100%'>
>> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
>> class='boxbottom'>
>> + <tr>
>> + <td>
>> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
>> + <#assign shipGroupIndex = currIndex - 1>
>> + <#assign supplier = delegator.findOne("PartyGroup",
>> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
>> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
>> + <table width="100%" cellpadding="1" border="0"
>> cellpadding="0" cellspacing="0">
>> + <tr>
>> + <td colspan="2">
>> + <h1>${uiLabelMap.OrderShipGroup}
>> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
>> ${uiLabelMap.OrderDropShipped} -
>> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td>
>> + <div>${uiLabelMap.ProductProduct}</div>
>> + </td>
>> + <td>
>> + <div>${uiLabelMap.CommonQuantity}</div>
>> + </td>
>> + <td>
>> + <div>${uiLabelMap.ProductMoveQuantity}</div>
>> + </td>
>> + <td>
>> + <div>${uiLabelMap.OrderShipGroupTo}</div>
>> + </td>
>> + </tr>
>> +
>> + <#assign shipGroupItems =
>> shoppingCart.getShipGroupItems(shipGroupIndex)>
>> + <#assign shoppingCartItems =
>> shipGroupItems.keySet().iterator()>
>> + <form method="post"
>> action="<@o...@ofbizUrl>"
>> name="assignitemtoshipgroup${shipGroupIndex}">
>> + <input type="hidden" name="_useRowSubmit" value="N" />
>> + <#assign rowCount = 0>
>> + <#list shoppingCartItems as shoppingCartItem>
>> + <#assign cartLineIndex =
>> shoppingCart.getItemIndex(shoppingCartItem)>
>> + <#assign shipGroupItemQuantity =
>> shipGroupItems.get(shoppingCartItem)>
>> + <input type="hidden" name="itemIndex_o_${rowCount}"
>> value="${cartLineIndex}"/>
>> + <input type="hidden"
>> name="clearEmptyGroups_o_${rowCount}" value="false"/>
>> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
>> value="${shipGroupIndex}"/>
>> + <tr>
>> + <td>
>> + <div>[${shoppingCartItem.getProductId()}]
>> ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div>
>> + </td>
>> + <td>
>> + <div>${shipGroupItemQuantity}</div>
>> + </td>
>> + <td>
>> + <div><input type="text" name="quantity_o_${rowCount}"
>> value="${shipGroupItemQuantity}"/></div>
>> + </td>
>> + <td>
>> + <div>
>> + <select name="toGroupIndex_o_${rowCount}">
>> + <option value="${shipGroupIndex}">---</option>
>> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
>> groupIdx>
>> + <#assign groupNumber = groupIdx + 1>
>> + <option
>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
>> ${groupNumber}</option>
>> + </#list>
>> + </select>
>> + </div>
>> + </td>
>> + </tr>
>> + <#assign rowCount = rowCount + 1>
>> + </#list>
>> + <#if (rowCount > 0)>
>> + <tr>
>> + <td colspan="3"> </td>
>> + <td>
>> + <input type="submit" class="smallSubmit"
>> value="${uiLabelMap.CommonSubmit}"/>
>> + </td>
>> + </tr>
>> + </#if>
>> + </table>
>> + <input type="hidden" name="_rowCount" value="${rowCount}" />
>> + </form>
>> + </#list>
>> + </td>
>> + </tr>
>> + </table>
>> + </td>
>> + </tr>
>> +</table>
>> +
>> +<br />
>> +<#else>
>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>> +</#if>
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
>> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar 28
>> 11:14:22 2016
>> @@ -0,0 +1,263 @@
>> +<#--
>> +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">
>> +//<![CDATA[
>> +function submitForm(form, mode, value) {
>> + if (mode == "DN") {
>> + // done action; payment info
>> +
>> form.action="<@o...@ofbizUrl>";
>> + form.submit();
>> + } else if (mode == "CS") {
>> + // continue shopping
>> +
>> form.action="<@o...@ofbizUrl>";
>> + form.submit();
>> + } else if (mode == "NA") {
>> + // new address
>> +
>> form.action="<@o...@ofbizUrl>";
>> + form.submit();
>> + } else if (mode == "SV") {
>> + // save option; return to current screen
>> +
>> form.action="<@o...@ofbizUrl>";
>> + form.submit();
>> + } else if (mode == "SA") {
>> + // selected shipping address
>> +
>> form.action="<@o...@ofbizUrl>";
>> + form.submit();
>> + }
>> +}
>> +//]]>
>> +</script>
>> +
>> +<div class="screenlet">
>> + <div class="screenlet-title-bar">
>> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
>> + </div>
>> + <div class="screenlet-body">
>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>> + <#assign shipGroups = cart.getShipGroups()>
>> + <#if (shipGroups.size() > 0)>
>> + <#assign groupIdx = 0>
>> + <#list shipGroups as group>
>> + <#assign shipEstimateWrapper =
>> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
>> cart, groupIdx)>
>> + <#assign carrierShipmentMethods =
>> shipEstimateWrapper.getShippingMethods()>
>> + <#assign groupNumber = groupIdx + 1>
>> + <form method="post" action="#"
>> name="editgroupform${groupIdx}" style="margin: 0;">
>> + <input type="hidden" name="groupIndex"
>> value="${groupIdx}"/>
>> + <tr>
>> + <td>
>> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
>> ${groupNumber}:</b></div>
>> + <#list group.getShipItems() as item>
>> + <#assign groupItem = group.getShipItemInfo(item)>
>> + <div
>> class="tabletext"> ${item.getName()} -
>> (${groupItem.getItemQuantity()})</div>
>> + </#list>
>> + </td>
>> + <td>
>> + <div>
>> + <span
>> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
>> + <a
>> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');"
>> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
>> + </div>
>> + <div>
>> + <#assign selectedContactMechId =
>> cart.getShippingContactMechId(groupIdx)?default("")>
>> + <select name="shippingContactMechId"
>> class="selectBox"
>> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
>> null);">
>> + <option
>> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
>> + <#list shippingContactMechList as
>> shippingContactMech>
>> + <#assign shippingAddress =
>> shippingContactMech.getRelatedOne("PostalAddress", false)>
>> + <option
>> value="${shippingAddress.contactMechId}" <#if
>> (shippingAddress.contactMechId ==
>> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
>> + </#list>
>> + </select>
>> + </div>
>> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
>> + <#assign selectedShippingMethod =
>> cart.getShipmentMethodTypeId(groupIdx) + "@" +
>> cart.getCarrierPartyId(groupIdx)>
>> + <#else>
>> + <#assign selectedShippingMethod = "">
>> + </#if>
>> + <select name="shipmentMethodString" class="selectBox">
>> + <option
>> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
>> + <#list carrierShipmentMethods as
>> carrierShipmentMethod>
>> + <#assign shippingEst =
>> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
>> + <#assign shippingMethod =
>> carrierShipmentMethod.shipmentMethodTypeId + "@" +
>> carrierShipmentMethod.partyId>
>> + <option value="${shippingMethod}" <#if
>> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
>> + <#if carrierShipmentMethod.partyId != "_NA_">
>> + ${carrierShipmentMethod.partyId!}
>> + </#if>
>> + ${carrierShipmentMethod.description!}
>> + <#if shippingEst?has_content>
>> + -
>> + <#if (shippingEst > -1)>
>> + <@ofbizCurrency amount=shippingEst
>> isoCode=cart.getCurrency()/>
>> + <#else>
>> + ${uiLabelMap.OrderCalculatedOffline}
>> + </#if>
>> + </#if>
>> + </option>
>> + </#list>
>> + </select>
>> +
>> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
>> + <textarea class='textAreaBox' cols="35" rows="3"
>> wrap="hard"
>> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
>> + </td>
>> + <td>
>> + <div>
>> + <select name="maySplit" class="selectBox">
>> + <#assign maySplitStr =
>> cart.getMaySplit(groupIdx)?default("")>
>> + <option
>> value="">${uiLabelMap.OrderSplittingPreference}</option>
>> + <option value="false" <#if maySplitStr ==
>> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
>> + <option value="true" <#if maySplitStr ==
>> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
>> + </select>
>> + </div>
>> + <div>
>> + <select name="isGift" class="selectBox">
>> + <#assign isGiftStr =
>> cart.getIsGift(groupIdx)?default("")>
>> + <option value="">${uiLabelMap.OrderIsGift}
>> ?</option>
>> + <option value="false" <#if isGiftStr ==
>> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
>> + <option value="true" <#if isGiftStr ==
>> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
>> + </select>
>> + </div>
>> +
>> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
>> + <textarea class='textAreaBox' cols="30" rows="3"
>> wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
>> + </td>
>> + <td><input type="button" class="smallSubmit"
>> value="${uiLabelMap.CommonSave}"
>> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
>> null);"/></td>
>> + </tr>
>> + <#assign groupIdx = groupIdx + 1>
>> + <#if group_has_next>
>> + <tr>
>> + <td colspan="6"><hr /></td>
>> + </tr>
>> + </#if>
>> + </form>
>> + </#list>
>> + <#else>
>> + <div
>> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
>> + </#if>
>> + </table>
>> + </div>
>> +</div>
>> +
>> +<div class="screenlet">
>> + <div class="screenlet-title-bar">
>> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
>> + </div>
>> + <div class="screenlet-body">
>> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
>> + <tr>
>> + <td><div
>> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
>> + <td align="center"><div
>> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
>> + <td> </td>
>> + <td align="center"><div
>> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
>> + <td> </td>
>> + <td> </td>
>> + </tr>
>> +
>> + <#list cart.items() as cartLine>
>> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
>> + <tr>
>> + <form method="post"
>> action="<@o...@ofbizUrl>" name="editgroupform"
>> style="margin: 0;">
>> + <input type="hidden" name="itemIndex"
>> value="${cartLineIndex}"/>
>> + <td>
>> + <div class="tabletext">
>> + <#if cartLine.getProductId()??>
>> + <#-- product item -->
>> + <#-- start code to display a small image of the
>> product -->
>> + <#assign smallImageUrl =
>> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
>> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
>> + <#if !smallImageUrl?string?has_content><#assign
>> smallImageUrl = "/images/defaultImage.jpg"></#if>
>> + <#if smallImageUrl?string?has_content>
>> + <a
>> href="<@o...@ofbizUrl>">
>> + <img
>> src="<@o...@ofbizContentUrl>"
>> class="cssImgSmall" alt="" />
>> + </a>
>> + </#if>
>> + <#-- end code to display a small image of the
>> product -->
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${cartLine.getProductId()} -
>> + ${cartLine.getName()!}</a> :
>> ${cartLine.getDescription()!}
>> +
>> + <#-- display the registered ship groups and
>> quantity -->
>> + <#assign itemShipGroups =
>> cart.getShipGroups(cartLine)>
>> + <#list itemShipGroups.entrySet() as group>
>> + <div class="tabletext">
>> + <#assign groupNumber = group.getKey() + 1>
>> + <b>Group - </b>${groupNumber} /
>> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
>> + </div>
>> + </#list>
>> +
>> + <#-- if inventory is not required check to see if
>> it is out of stock and needs to have a message shown about that... -->
>> + <#assign itemProduct = cartLine.getProduct()>
>> + <#assign isStoreInventoryNotRequiredAndNotAvailable
>> =
>> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
>> itemProduct, cartLine.getQuantity(), false, false)>
>> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
>> itemProduct.inventoryMessage?has_content>
>> + <b>(${itemProduct.inventoryMessage})</b>
>> + </#if>
>> +
>> + <#else>
>> + <#-- this is a non-product item -->
>> + <b>${cartLine.getItemTypeDescription()!}</b> :
>> ${cartLine.getName()!}
>> + </#if>
>> + </div>
>> +
>> + </td>
>> + <td align="right">
>> + <div
>> class="tabletext">${cartLine.getQuantity()?string.number} </div>
>> + </td>
>> + <td>
>> + <div> </div>
>> + </td>
>> + <td align="center">
>> + <input size="6" class="inputBox" type="text"
>> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
>> + </td>
>> + <td>
>> + <div> </div>
>> + </td>
>> + <td>
>> + <div class="tabletext">${uiLabelMap.CommonFrom}:
>> + <select name="fromGroupIndex" class="selectBox">
>> + <#list itemShipGroups.entrySet() as group>
>> + <#assign groupNumber = group.getKey() + 1>
>> + <option
>> value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>> + </#list>
>> + </select>
>> + </div>
>> + </td>
>> + <td>
>> + <div class="tabletext">${uiLabelMap.CommonTo}:
>> + <select name="toGroupIndex" class="selectBox">
>> + <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
>> + <#assign groupNumber = groupIdx + 1>
>> + <option
>> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
>> + </#list>
>> + <option value="-1">${uiLabelMap.CommonNew}
>> ${uiLabelMap.CommonGroup}</option>
>> + </select>
>> + </div>
>> + </td>
>> + <td><input type="submit" class="smallSubmit"
>> value="${uiLabelMap.CommonSubmit}"/></td>
>> + </form>
>> + </tr>
>> + </#list>
>> + </table>
>> + </div>
>> +</div>
>> +
>> +<table>
>> + <tr valign="top">
>> + <td>
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
>> + </td>
>> + <td align="right">
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
>> + </td>
>> + </tr>
>> +</table>
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added:
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> ---
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>> (added)
>> +++
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>> Mon Mar 28 11:14:22 2016
>> @@ -0,0 +1,64 @@
>> +<#--
>> +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.
>> +-->
>> +
>> +<#-- ==================== Party Listing dialog box
>> ========================= -->
>> +<#if additionalPartyRoleMap?has_content>
>> +<div class="screenlet">
>> + <div class="screenlet-title-bar">
>> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
>> + </div>
>> + <div class="screenlet-body">
>> + <table border="0" width="100%" cellpadding="0">
>> + <#list roleList as role>
>> + <tr>
>> + <td valign="bottom"><div>${roleData[role].get("description",
>> locale)}</div></td>
>> + </tr>
>> + <tr>
>> + <td colspan="4"><hr /></td>
>> + </tr>
>> + <#list additionalPartyRoleMap[role] as party>
>> + <tr>
>> + <td><div>${party}</div></td>
>> + <td>
>> + <div>
>> + <#if partyData[party].type == "person">
>> + ${partyData[party].firstName!}
>> + <#else>
>> + ${partyData[party].groupName!}
>> + </#if>
>> + </div>
>> + </td>
>> + <td>
>> + <div>
>> + <#if partyData[party].type == "person">
>> + ${partyData[party].lastName!}
>> + </#if>
>> + </div>
>> + </td>
>> + <td align="right">
>> + <a
>> href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>> + </td>
>> + </tr>
>> + </#list>
>> + <tr><td> </td></tr>
>> + </#list>
>> + </table>
>> + </div>
>> +</div>
>> +</#if>
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (added)
>> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon Mar
>> 28 11:14:22 2016
>> @@ -0,0 +1,80 @@
>> +<#--
>> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>> +
>> +<form method="post" action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + <input type="hidden" name="finalizeMode" value="ship"/>
>> + <table width="100%" border="0" align="center" cellspacing='0'
>> cellpadding='0' class='boxoutside'>
>> + <tr><td>
>> +
>> + <#-- header table -->
>> +
>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>> class='boxtop'>
>> + <tr>
>> + <td valign="middle">
>> + <div
>> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
>> + </td>
>> + </tr>
>> + </table>
>> +
>> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
>> class='boxbottom'>
>> + <tr><td colspan="3"><hr /></td></tr>
>> +
>> + <#-- postal addresses for chosen id -->
>> +
>> + <#if partyContactMechPurposes??>
>> + <#list partyContactMechPurposes as partyContactMechPurpose>
>> + <#assign shippingAddress =
>> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
>> +
>> + <#-- skip non-postal addresses -->
>> +
>> + <#if shippingAddress.toName??>
>> + <tr>
>> + <td valign="top" nowrap="nowrap">
>> + <input type="radio" name="shipping_contact_mech_id"
>> value="${partyContactMechPurpose.contactMechId}" />
>> + </td>
>> + <td nowrap="nowrap"> </td>
>> + <td width="100%">
>> + <div>
>> + <#if
>> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
>> /></#if>
>> + <#if
>> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
>> /></#if>
>> + <#if
>> shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
>> + <#if
>> shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
>> + <#if
>> shippingAddress.city?has_content>${shippingAddress.city}</#if>
>> + <#if
>> shippingAddress.stateProvinceGeoId?has_content><br
>> />${shippingAddress.stateProvinceGeoId}</#if>
>> + <#if shippingAddress.postalCode?has_content><br
>> />${shippingAddress.postalCode}</#if>
>> + <#if shippingAddress.countryGeoId?has_content><br
>> />${shippingAddress.countryGeoId}</#if>
>> + </div>
>> + </td>
>> + </tr>
>> + <tr><td colspan="3"><hr /></td></tr>
>> + </#if>
>> + </#list>
>> + </#if>
>> +
>> + </table>
>> +
>> + </td></tr>
>> + </table>
>> +</form>
>> +
>> +<#else>
>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>> +</#if>
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl (added)
>> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon Mar
>> 28 11:14:22 2016
>> @@ -0,0 +1,516 @@
>> +<#--
>> +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 type="text/javascript">
>> +//<![CDATA[
>> +function shipBillAddr() {
>> + if (document.checkoutsetupform.useShipAddr.checked) {
>> + window.location =
>> "<@o...@ofbizUrl>";
>> + } else {
>> + window.location =
>> "<@o...@ofbizUrl>";
>> + }
>> +}
>> +
>> +function makeExpDate() {
>> + document.checkoutsetupform.expireDate.value =
>> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
>> + "/" +
>> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
>> +}
>> +//]]>
>> +</script>
>> +
>> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
>> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
>> +<div class="screenlet">
>> + <div class="screenlet-body">
>> + <#if request.getAttribute("paymentMethodId")?? || (
>> (paymentMethodList?has_content || billingAccountList?has_content) &&
>> !requestParameters.createNew??)>
>> + <#-- initial screen when we have a associated party -->
>> + <form method="post"
>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>> + <input type="hidden" name="finalizeMode" value="payment"/>
>> + <table width="100%" cellpadding="1" cellspacing="0"
>> border="0">
>> + <tr>
>> + <td colspan="2">
>> + <a href="<@o...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>> + </td>
>> + </tr>
>> + <tr><td colspan="3"><hr /></td></tr>
>> + <#if billingAccountList?has_content>
>> + <tr>
>> + <td width="1%">
>> + <select name="billingAccountId">
>> + <option value=""></option>
>> + <#list billingAccountList as billingAccount>
>> + <#assign availableAmount =
>> billingAccount.accountBalance?double>
>> + <#if (billingAccount.accountLimit)??>
>> + <#assign accountLimit =
>> billingAccount.accountLimit?double />
>> + <#else>
>> + <#assign accountLimit = 0.00 />
>> + </#if>
>> + <option
>> value="${billingAccount.billingAccountId}" <#if
>> billingAccount.billingAccountId ==
>> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
>> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
>> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit:
>> <@ofbizCurrency amount=accountLimit
>> isoCode=billingAccount.accountCurrencyUomId/></option>
>> + </#list>
>> + </select>
>> + </td>
>> + <td width="50%">
>> +
>> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
>> + </td>
>> + <td> </td>
>> + </tr>
>> + <tr>
>> + <td width="1%" align="right">
>> + <input type="text" size="5"
>> name="billingAccountAmount" value=""/>
>> + </td>
>> + <td width="50%">
>> + ${uiLabelMap.OrderBillUpTo}
>> + </td>
>> + <td> </td>
>> + </tr>
>> + <tr><td colspan="3"><hr /></td></tr>
>> + </#if>
>> + <tr>
>> + <td width="1%">
>> + <input type="radio" id="checkOutPaymentId_EXT_OFFLINE"
>> name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? &&
>> checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
>> + </td>
>> + <td colspan="2" width="50%">
>> + <label
>> for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
>> + </td>
>> + </tr>
>> + <tr><td colspan="3"><hr /></td></tr>
>> + <tr>
>> + <td width="1%">
>> + <input type="radio" id="checkOutPaymentId_EXT_COD"
>> name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? &&
>> checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
>> + </td>
>> + <td colspan="2" width="50%">
>> + <label
>> for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label>
>> + </td>
>> + </tr>
>> + <tr><td colspan="3"><hr /></td></tr>
>> + <#if paymentMethodList?has_content>
>> + <#list paymentMethodList as paymentMethod>
>> + <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
>> + <#assign creditCard =
>> paymentMethod.getRelatedOne("CreditCard", false)>
>> + <tr>
>> + <td width="1%">
>> + <input type="radio"
>> id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}"
>> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
>> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
>> checkOutPaymentId>checked="checked"</#if>/>
>> + </td>
>> + <td width="50%">
>> + <label
>> for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}">
>> +
>> CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
>> + <#if
>> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
>> + </label>
>> + <span>
>> + ${uiLabelMap.OrderCardSecurityCode} <input
>> type="text" size="5" maxlength="10"
>> name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
>> + </span>
>> + </td>
>> + <td align="right"><a
>> href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
>> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
>> + </tr>
>> + <#elseif paymentMethod.paymentMethodTypeId ==
>> "EFT_ACCOUNT">
>> + <#assign eftAccount =
>> paymentMethod.getRelatedOne("EftAccount", false)>
>> + <tr>
>> + <td width="1%">
>> + <input type="radio"
>> id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}"
>> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
>> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
>> checkOutPaymentId>checked="checked"</#if>/>
>> + </td>
>> + <td width="50%">
>> + <label
>> for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}">
>> + EFT: ${eftAccount.bankName!}:
>> ${eftAccount.accountNumber!}
>> + <#if
>> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
>> + </label>
>> + </td>
>> + <td align="right"><a
>> href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
>> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
>> + </tr>
>> + <tr><td colspan="2"><hr /></td></tr>
>> + </#if>
>> + </#list>
>> + <#else>
>> + <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
>> + </#if>
>> + </table>
>> + </form>
>> + <#elseif paymentMethodType?? || finalizeMode?default("") ==
>> "payment">
>> + <#-- after initial screen; show detailed screens for selected
>> type -->
>> + <#if paymentMethodType == "CC">
>> + <#if postalAddress?has_content>
>> + <form method="post"
>> action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + <input type="hidden" name="paymentMethodId"
>> value="${creditCard.paymentMethodId!}"/>
>> + <input type="hidden" name="contactMechId"
>> value="${postalAddress.contactMechId!}"/>
>> + <#elseif requestParameters.useShipAddr??>
>> + <form method="post"
>> action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + <#else>
>> + <form method="post"
>> action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + </#if>
>> + </#if>
>> + <#if paymentMethodType == "EFT">
>> + <#if postalAddress?has_content>
>> + <form method="post"
>> action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + <input type="hidden" name="paymentMethodId"
>> value="${eftAccount.paymentMethodId!}"/>
>> + <input type="hidden" name="contactMechId"
>> value="${postalAddress.contactMechId!}"/>
>> + <#elseif requestParameters.useShipAddr??>
>> + <form method="post"
>> action="<@o...@ofbizUrl>" name="checkoutsetupform">
>> + <#else>
>> + <form method="post"
>> action="<@o...@ofbizUrl>"
>> name="checkoutsetupform">
>> + </#if>
>> + </#if>
>> +
>> + <input type="hidden" name="contactMechTypeId"
>> value="POSTAL_ADDRESS"/>
>> + <input type="hidden" name="partyId"
>> value="${cart.getPartyId()}"/>
>> + <input type="hidden" name="paymentMethodType"
>> value="${paymentMethodType}"/>
>> + <input type="hidden" name="finalizeMode" value="payment"/>
>> + <input type="hidden" name="createNew" value="Y"/>
>> + <#if requestParameters.useShipAddr??>
>> + <input type="hidden" name="contactMechId"
>> value="${postalFields.contactMechId}"/>
>> + </#if>
>> +
>> + <table width="100%" border="0" cellpadding="1" cellspacing="0">
>> + <#if cart.getShippingContactMechId()??>
>> + <tr>
>> + <td width="26%" align="right"= valign="top">
>> + <input type="checkbox" name="useShipAddr" value="Y"
>> onclick="javascript:shipBillAddr();" <#if
>> requestParameters.useShipAddr??>checked="checked"</#if>/>
>> + </td>
>> + <td colspan="2" valign="center">
>> +
>> <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td colspan="3"><hr /></td>
>> + </tr>
>> + </#if>
>> +
>> + <#if orderPerson?has_content>
>> + <#assign toName = "">
>> + <#if orderPerson.personalTitle?has_content><#assign toName
>> = orderPerson.personalTitle + " "></#if>
>> + <#assign toName = toName + orderPerson.firstName + " ">
>> + <#if orderPerson.middleName?has_content><#assign toName =
>> toName + orderPerson.middleName + " "></#if>
>> + <#assign toName = toName + orderPerson.lastName>
>> + <#if orderPerson.suffix?has_content><#assign toName =
>> toName + " " + orderPerson.suffix></#if>
>> + <#else>
>> + <#assign toName = postalFields.toName?default("")>
>> + </#if>
>> +
>> + <#-- generic address information -->
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonToName}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="60" name="toName"
>> value="${toName}" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="60"
>> name="attnName" value="${postalFields.attnName!}" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="30"
>> name="address1" value="${postalFields.address1!}" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="30"
>> name="address2" value="${postalFields.address2!}" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonCity}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="30" name="city"
>> value="${postalFields.city!}" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <select name="stateProvinceGeoId" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>>
>> + <#if postalFields.stateProvinceGeoId??>
>> + <option>${postalFields.stateProvinceGeoId}</option>
>> + <option
>> value="${postalFields.stateProvinceGeoId}">---</option>
>> + </#if>
>> + <option value=""></option>
>> +
>> ${screens.render("component://common/widget/CommonScreens.xml#states")}
>> + </select>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="12" maxlength="10"
>> name="postalCode" value="${postalFields.postalCode!}" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <select name="countryGeoId" <#if
>> requestParameters.useShipAddr??>disabled="disabled"</#if>>
>> + <#if postalFields.countryGeoId??>
>> + <option>${postalFields.countryGeoId}</option>
>> + <option
>> value="${postalFields.countryGeoId}">---</option>
>> + </#if>
>> +
>> ${screens.render("component://common/widget/CommonScreens.xml#countries")}
>> + </select>
>> + *</td>
>> + </tr>
>> +
>> + <#-- credit card fields -->
>> + <#if paymentMethodType == "CC">
>> + <#if !creditCard?has_content>
>> + <#assign creditCard = requestParameters>
>> + </#if>
>> + <input type="hidden" name="expireDate"
>> value="${creditCard.expireDate!}"/>
>> + <tr>
>> + <td colspan="3"><hr /></td>
>> + </tr>
>> +
>> + <tr>
>> + <td width="26%" align="right"
>> valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" class='inputBox' size="30"
>> maxlength="60" name="companyNameOnCard"
>> value="${creditCard.companyNameOnCard!}"/>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="middle"><div>${uiLabelMap.AccountingPrefixCard}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <select name="titleOnCard">
>> + <option
>> value="">${uiLabelMap.CommonSelectOne}</option>
>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>> "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>> "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>> "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
>> + <option<#if ((creditCard.titleOnCard)?default("") ==
>> "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
>> + </select>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="20" maxlength="60"
>> name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="15" maxlength="60"
>> name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="20" maxlength="60"
>> name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="middle"><div>${uiLabelMap.AccountingSuffixCard}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <select name="suffixOnCard">
>> + <option
>> value="">${uiLabelMap.CommonSelectOne}</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "Jr.")> checked="checked"</#if>>Jr.</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "Sr.")> checked="checked"</#if>>Sr.</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "I")> checked="checked"</#if>>I</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "II")> checked="checked"</#if>>II</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "III")> checked="checked"</#if>>III</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "IV")> checked="checked"</#if>>IV</option>
>> + <option<#if ((creditCard.suffixOnCard)?default("") ==
>> "V")> checked="checked"</#if>>V</option>
>> + </select>
>> + </td>
>> + </tr>
>> +
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingCardType}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <select name="cardType">
>> + <#if creditCard.cartType??>
>> + <option>${creditCard.cardType}</option>
>> + <option value="${creditCard.cardType}">---</option>
>> + </#if>
>> +
>> ${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
>> + </select>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="20" maxlength="30"
>> name="cardNumber" value="${creditCard.cardNumber!}"/>
>> + *</td>
>> + </tr>
>> + <#--<tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.OrderCardSecurityCode}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="5" maxlength="10"
>> name="cardSecurityCode" value=""/>
>> + </td>
>> + </tr>-->
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <#assign expMonth = "">
>> + <#assign expYear = "">
>> + <#if creditCard?? && creditCard.expDate??>
>> + <#assign expDate = creditCard.expireDate>
>> + <#if (expDate?? && expDate.indexOf("/") > 0)>
>> + <#assign expMonth =
>> expDate.substring(0,expDate.indexOf("/"))>
>> + <#assign expYear =
>> expDate.substring(expDate.indexOf("/")+1)>
>> + </#if>
>> + </#if>
>> + <select name="expMonth"
>> onchange="javascript:makeExpDate();">
>> + <#if creditCard?has_content &&
>> expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign
>> ccExprMonth = requestParameters.expMonth!></#if>
>> + <#if ccExprMonth?has_content>
>> + <option
>> value="${ccExprMonth!}">${ccExprMonth!}</option>
>> + </#if>
>> +
>> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
>> + </select>
>> + <select name="expYear"
>> onchange="javascript:makeExpDate();">
>> + <#if creditCard?has_content &&
>> expYear?has_content><#assign ccExprYear = expYear><#else><#assign
>> ccExprYear = requestParameters.expYear!></#if>
>> + <#if ccExprYear?has_content>
>> + <option
>> value="${ccExprYear!}">${ccExprYear!}</option>
>> + </#if>
>> +
>> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
>> + </select>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="20" maxlength="30"
>> name="description" value="${creditCard.description!}"/>
>> + </td>
>> + </tr>
>> + </#if>
>> +
>> + <#-- eft fields -->
>> + <#if paymentMethodType =="EFT">
>> + <#if !eftAccount?has_content>
>> + <#assign eftAccount = requestParameters>
>> + </#if>
>> + <tr>
>> + <td colspan="3"><hr /></td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="60"
>> name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="60"
>> name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
>> + </td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="60"
>> name="bankName" value="${eftAccount.bankName!}"/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="10" maxlength="30"
>> name="routingNumber" value="${eftAccount.routingNumber!}"/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <select name="accountType">
>> + <option>${eftAccount.accountType!}</option>
>> + <option></option>
>> + <option>Checking</option>
>> + <option>Savings</option>
>> + </select>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="20" maxlength="40"
>> name="accountNumber" value="${eftAccount.accountNumber!}"/>
>> + *</td>
>> + </tr>
>> + <tr>
>> + <td width="26%" align="right"
>> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
>> + <td width="5"> </td>
>> + <td width="74%">
>> + <input type="text" size="30" maxlength="60"
>> name="description" value="${eftAccount.description!}"/>
>> + </td>
>> + </tr>
>> + </#if>
>> + </table>
>> + <#else>
>> + <#-- initial screen show a list of options -->
>> +
>> + <script type="text/javascript">
>> +
>> + function setCheckoutPaymentId( selectedValue ) {
>> + checkoutForm =
>> document.getElementById('checkoutsetupform');
>> + if( selectedValue.match('^EXT_.*') ) {
>> + checkoutForm.action =
>> '<@o...@ofbizUrl>?checkOutPaymentId=' + selectedValue ;
>> + } else {
>> + checkoutForm.action =
>> '<@o...@ofbizUrl>?paymentMethodType=' + selectedValue ;
>> + }
>> + }
>> + </script>
>> +
>> + <form method="post"
>> action="<@o...@ofbizUrl>" name="checkoutsetupform"
>> id="checkoutsetupform">
>> + <input type="hidden" name="finalizeMode" value="payment"/>
>> + <input type="hidden" name="createNew"
>> value="${(requestParameters.createNew)!}"/>
>> + <table width="100%" border="0" cellpadding="1"
>> cellspacing="0">
>> + <#if "Y" != requestParameters.createNew?default("")>
>> + <tr>
>> + <td width='1%' nowrap="nowrap"><input type="radio"
>> name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId??
>> && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>
>> onchange="setCheckoutPaymentId(this.value)"
>> onclick="setCheckoutPaymentId(this.value)"/></td>
>> + <td width='50%'
>> nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
>> + </tr>
>> + <tr><td colspan="2"><hr /></td></tr>
>> + <tr>
>> + <td width="1%" nowrap="nowrap"><input type="radio"
>> name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? &&
>> checkOutPaymentId == "EXT_COD">checked="checked"</#if>
>> onchange="setCheckoutPaymentId(this.value)"
>> onclick="setCheckoutPaymentId(this.value)"/></td>
>> + <td width="50%"
>> nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
>> + </tr>
>> + <tr><td colspan="2"><hr /></td></tr>
>> + </#if>
>> + <tr>
>> + <td width='1%' nowrap="nowrap"><input type="radio"
>> name="paymentMethodTypeAndId" value="CC"
>> onchange="setCheckoutPaymentId(this.value)"
>> onclick="setCheckoutPaymentId(this.value)"/>
>> + <td width='50%'
>> nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
>> + </tr>
>> + <tr><td colspan="2"><hr /></td></tr>
>> + <tr>
>> + <td width='1%' nowrap="nowrap"><input type="radio"
>> name="paymentMethodTypeAndId" value="EFT"
>> onchange="setCheckoutPaymentId(this.value)"
>> onclick="setCheckoutPaymentId(this.value)"/>
>> + <td width='50%'
>> nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
>> + </tr>
>> + </table>
>> + </form>
>> + </#if>
>> + </div>
>> +</div>
>> +<#else>
>> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
>> +</#if>
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added:
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> ---
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>> (added)
>> +++
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>> Mon Mar 28 11:14:22 2016
>> @@ -0,0 +1,61 @@
>> +<#--
>> +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.
>> +-->
>> +
>> +<!-- Screenlet to add cart to shopping list. The shopping lists are
>> presented in a dropdown box. -->
>> +
>> +<#if (shoppingLists??) && (shoppingCartSize > 0)>
>> + <div class="screenlet">
>> + <div class="screenlet-title-bar">
>> + <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
>> + </div>
>> + <div class="screenlet-body">
>> + <table border="0" cellspacing="0" cellpadding="0">
>> + <tr>
>> + <td>
>> + <form method="post" name="addBulkToShoppingList"
>> action="<@o...@ofbizUrl>" style='margin: 0;'>
>> + <#assign index = 0/>
>> + <#list shoppingCart.items() as cartLine>
>> + <#if (cartLine.getProductId()??) &&
>> !cartLine.getIsPromo()>
>> + <input type="hidden" name="selectedItem"
>> value="${index}"/>
>> + </#if>
>> + <#assign index = index + 1/>
>> + </#list>
>> + <table border="0">
>> + <tr>
>> + <td>
>> + <div>
>> + <select name='shoppingListId'>
>> + <#list shoppingLists as shoppingList>
>> + <option
>> value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
>> + </#list>
>> + <option value="">---</option>
>> + <option
>> value="">${uiLabelMap.OrderNewShoppingList}</option>
>> + </select>
>> + <input type="submit" class="smallSubmit"
>> value="${uiLabelMap.OrderAddToShoppingList}"/>
>> + </div>
>> + </td>
>> + </tr>
>> + </table>
>> + </form>
>> + </td>
>> + </tr>
>> + </table>
>> + </div>
>> + </div>
>> +</#if>
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Added:
>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl?rev=1736868&view=auto
>>
>> ==============================================================================
>> ---
>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>> (added)
>> +++
>> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
>> Mon Mar 28 11:14:22 2016
>> @@ -0,0 +1,47 @@
>> +<#--
>> +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 (shoppingCart.getOrderType() == "SALES_ORDER")>
>> + <#assign associatedProducts =
>> Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request,
>> true)!>
>> +</#if>
>> +
>> +<#if associatedProducts?has_content>
>> + <div class="screenlet">
>> + <div class="screenlet-title-bar">
>> + <div class="h3">${uiLabelMap.OrderHelpAlsoInterestedIn}</div>
>> + </div>
>> + <div class="screenlet-body">
>> + <table cellspacing="0" cellpadding="1" border="0">
>> + <#-- random complementary products -->
>> + <#list associatedProducts as assocProduct>
>> + <tr>
>> + <td>
>> + ${setRequestAttribute("optProduct", assocProduct)}
>> + ${setRequestAttribute("listIndex", assocProduct_index)}
>> + ${screens.render(productsummaryScreen)}
>> + </td>
>> + </tr>
>> + <#if assocProduct_has_next>
>> + <tr><td><hr/></td></tr>
>> + </#if>
>> + </#list>
>> + </table>
>> + </div>
>> + </div>
>> +</#if>
>>
>>
>>
>>
Re: svn commit: r1736868 [1/20] - in /ofbiz/trunk/applications/order:
template/ template/entry/ template/entry/cart/ template/entry/catalog/
template/entry/order/ template/order/ template/product/ template/quote/
template/reports/ template/request/ templat...
Posted by Deepak Dixit <de...@hotwaxsystems.com>.
Hi Jacques,
I think we need to use svn mv command to move files to new location else we
will lose the svn history of all files.
Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
On Mon, Mar 28, 2016 at 4:44 PM, <jl...@apache.org> wrote:
> Author: jleroux
> Date: Mon Mar 28 11:14:22 2016
> New Revision: 1736868
>
> URL: http://svn.apache.org/viewvc?rev=1736868&view=rev
> Log:
> A patch from Pierre Smits for <<relocate .ftl files in the order
> component>> https://issues.apache.org/jira/browse/OFBIZ-6819
>
> Added:
> ofbiz/trunk/applications/order/template/
> ofbiz/trunk/applications/order/template/entry/
>
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (with
> props)
>
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/billsettings.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/cart/
>
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/
>
> ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/checkinits.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/custsettings.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/order/
>
> ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/orderparty.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/orderterms.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/poheader.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
> (with props)
> ofbiz/trunk/applications/order/template/entry/shipsettings.ftl (with
> props)
> ofbiz/trunk/applications/order/template/entry/survey.ftl (with props)
> ofbiz/trunk/applications/order/template/order/
> ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/editorderitems.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/findOrders.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/orderinfo.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/orderitems.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/orderlist.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/ordernotes.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/orderstats.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/orderterms.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/receivepayment.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/order/transitions.ftl (with
> props)
> ofbiz/trunk/applications/order/template/order/viewimage.ftl (with
> props)
> ofbiz/trunk/applications/order/template/product/
>
> ofbiz/trunk/applications/order/template/product/configproductdetail.ftl
> (with props)
> ofbiz/trunk/applications/order/template/product/productdetail.ftl
> (with props)
> ofbiz/trunk/applications/order/template/quote/
> ofbiz/trunk/applications/order/template/quote/CopyQuote.ftl (with
> props)
> ofbiz/trunk/applications/order/template/quote/ManageQuotePrices.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/quote/ManageQuotePricesTotals.ftl
> (with props)
> ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/quote/ViewQuoteProfit.ftl
> (with props)
> ofbiz/trunk/applications/order/template/quote/quoteDate.ftl (with
> props)
> ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl (with
> props)
> ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (with
> props)
> ofbiz/trunk/applications/order/template/reports/
>
> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
> (with props)
>
> ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/reports/orderitemreport.xml
> (with props)
> ofbiz/trunk/applications/order/template/reports/orderreport.xml
> (with props)
> ofbiz/trunk/applications/order/template/reports/reportlist.ftl (with
> props)
> ofbiz/trunk/applications/order/template/request/
>
> ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
> (with props)
> ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
> (with props)
> ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl (with
> props)
>
> ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
> (with props)
> ofbiz/trunk/applications/order/template/request/requestDate.ftl
> (with props)
> ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
> (with props)
> ofbiz/trunk/applications/order/template/return/
> ofbiz/trunk/applications/order/template/return/quickReturn.ftl (with
> props)
> ofbiz/trunk/applications/order/template/return/returnHeader.ftl
> (with props)
> ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
> (with props)
> ofbiz/trunk/applications/order/template/return/returnItems.ftl (with
> props)
> ofbiz/trunk/applications/order/template/return/returnLinks.ftl (with
> props)
> ofbiz/trunk/applications/order/template/return/returnList.ftl (with
> props)
>
> ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
> (with props)
>
> ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
> (with props)
> ofbiz/trunk/applications/order/template/setup/
> ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl (with
> props)
> ofbiz/trunk/applications/order/template/task/
> ofbiz/trunk/applications/order/template/task/ordertasklist.ftl (with
> props)
> Modified:
> ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
>
> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
>
> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
>
> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
>
> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
>
> Added:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1736868&view=auto
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
> (added)
> +++
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
> Mon Mar 28 11:14:22 2016
> @@ -0,0 +1,40 @@
> +<#--
> +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="screenlet">
> +<div class="screenlet-title-bar">
> + <ul>
> + <#if orderHeader?has_content>
> + <li class="h3">
> + ${uiLabelMap.PageTitleLookupBulkAddProduct}
> + </li>
> + <#else>
> + <li class="h3">
> + ${uiLabelMap.CommonCreate}
> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
> + ${uiLabelMap.OrderPurchaseOrder}
> + <#else>
> + ${uiLabelMap.OrderSalesOrder}
> + </#if>
> + </li>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
> + </#if>
> + </ul>
> +</div>
> +</div>
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1736868&view=auto
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
> (added)
> +++
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
> Mon Mar 28 11:14:22 2016
> @@ -0,0 +1,52 @@
> +<#--
> +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 stepTitleId??>
> + <#assign stepTitle = uiLabelMap.get(stepTitleId)>
> +</#if>
> +<div class="screenlet">
> + <div class="screenlet-title-bar">
> + <ul>
> + <li class="h3">
> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
> + ${uiLabelMap.OrderPurchaseOrder}
> + <#else>
> + ${uiLabelMap.OrderSalesOrder}
> + </#if>
> + : ${stepTitle!}
> + </li>
> +
> + <#if isLastStep == "N">
> + <li><a
> href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
> + <#else>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
> + </#if>
> +
> + <#list checkoutSteps?reverse as checkoutStep>
> + <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
> + <#if checkoutStep.enabled == "N">
> + <li><span class="disabled">${stepUiLabel}</span></li>
> + <#else>
> + <li><a
> href="<@o...@ofbizUrl>">${stepUiLabel}</a></li>
> + </#if>
> + </#list>
> + </ul>
> + <br class="clear" />
> + </div>
> +</div>
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1736868&view=auto
>
> ==============================================================================
> --- ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
> (added)
> +++ ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Mon
> Mar 28 11:14:22 2016
> @@ -0,0 +1,60 @@
> +<#--
> +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="screenlet">
> + <div class="screenlet-title-bar">
> + <ul>
> + <li class="h3">
> + ${uiLabelMap.CommonCreate}
> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
> + ${uiLabelMap.OrderPurchaseOrder}
> + <#else>
> + ${uiLabelMap.OrderSalesOrder}
> + </#if>
> + </li>
> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
> + <#if shoppingCart.getOrderPartyId() == "_NA_" ||
> (shoppingCart.size() = 0)>
> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
> + <#else>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
> + </#if>
> + <#else>
> + <#if shoppingCart.size() = 0>
> + <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
> + <li
> class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
> + <#else>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
> + </#if>
> + </#if>
> +
> + <#if (shoppingCart.size() > 0)>
> + <li><a
> href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
> + <li><a
> href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
> + <#else>
> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
> + </#if>
> + <li><a
> href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
> + </ul>
> + <br class="clear">
> + </div>
> +</div>
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl?rev=1736868&view=auto
>
> ==============================================================================
> --- ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
> (added)
> +++ ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
> Mon Mar 28 11:14:22 2016
> @@ -0,0 +1,112 @@
> +<#--
> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
> +<form method="post" action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + <input type="hidden" name="finalizeMode" value="removeEmptyShipGroups"/>
> +</form>
> +
> +<table border="0" width='100%' cellspacing='0' cellpadding='0'
> class='boxoutside'>
> +<tr>
> + <td width='100%'>
> + <table width='100%' border='0' cellspacing='0' cellpadding='0'
> class='boxbottom'>
> + <tr>
> + <td>
> + <#list 1..shoppingCart.getShipGroupSize() as currIndex>
> + <#assign shipGroupIndex = currIndex - 1>
> + <#assign supplier = delegator.findOne("PartyGroup",
> Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
> shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
> + <table width="100%" cellpadding="1" border="0"
> cellpadding="0" cellspacing="0">
> + <tr>
> + <td colspan="2">
> + <h1>${uiLabelMap.OrderShipGroup}
> ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> -
> ${uiLabelMap.OrderDropShipped} -
> ${supplier.groupName?default(supplier.partyId)}</#if></h1>
> + </td>
> + </tr>
> + <tr>
> + <td>
> + <div>${uiLabelMap.ProductProduct}</div>
> + </td>
> + <td>
> + <div>${uiLabelMap.CommonQuantity}</div>
> + </td>
> + <td>
> + <div>${uiLabelMap.ProductMoveQuantity}</div>
> + </td>
> + <td>
> + <div>${uiLabelMap.OrderShipGroupTo}</div>
> + </td>
> + </tr>
> +
> + <#assign shipGroupItems =
> shoppingCart.getShipGroupItems(shipGroupIndex)>
> + <#assign shoppingCartItems =
> shipGroupItems.keySet().iterator()>
> + <form method="post"
> action="<@o...@ofbizUrl>"
> name="assignitemtoshipgroup${shipGroupIndex}">
> + <input type="hidden" name="_useRowSubmit" value="N" />
> + <#assign rowCount = 0>
> + <#list shoppingCartItems as shoppingCartItem>
> + <#assign cartLineIndex =
> shoppingCart.getItemIndex(shoppingCartItem)>
> + <#assign shipGroupItemQuantity =
> shipGroupItems.get(shoppingCartItem)>
> + <input type="hidden" name="itemIndex_o_${rowCount}"
> value="${cartLineIndex}"/>
> + <input type="hidden"
> name="clearEmptyGroups_o_${rowCount}" value="false"/>
> + <input type="hidden" name="fromGroupIndex_o_${rowCount}"
> value="${shipGroupIndex}"/>
> + <tr>
> + <td>
> + <div>[${shoppingCartItem.getProductId()}]
> ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div>
> + </td>
> + <td>
> + <div>${shipGroupItemQuantity}</div>
> + </td>
> + <td>
> + <div><input type="text" name="quantity_o_${rowCount}"
> value="${shipGroupItemQuantity}"/></div>
> + </td>
> + <td>
> + <div>
> + <select name="toGroupIndex_o_${rowCount}">
> + <option value="${shipGroupIndex}">---</option>
> + <#list 0..(shoppingCart.getShipGroupSize() - 1) as
> groupIdx>
> + <#assign groupNumber = groupIdx + 1>
> + <option
> value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr}
> ${groupNumber}</option>
> + </#list>
> + </select>
> + </div>
> + </td>
> + </tr>
> + <#assign rowCount = rowCount + 1>
> + </#list>
> + <#if (rowCount > 0)>
> + <tr>
> + <td colspan="3"> </td>
> + <td>
> + <input type="submit" class="smallSubmit"
> value="${uiLabelMap.CommonSubmit}"/>
> + </td>
> + </tr>
> + </#if>
> + </table>
> + <input type="hidden" name="_rowCount" value="${rowCount}" />
> + </form>
> + </#list>
> + </td>
> + </tr>
> + </table>
> + </td>
> + </tr>
> +</table>
> +
> +<br />
> +<#else>
> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
> +</#if>
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/SetItemShipGroups.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/SplitShip.ftl?rev=1736868&view=auto
>
> ==============================================================================
> --- ofbiz/trunk/applications/order/template/entry/SplitShip.ftl (added)
> +++ ofbiz/trunk/applications/order/template/entry/SplitShip.ftl Mon Mar 28
> 11:14:22 2016
> @@ -0,0 +1,263 @@
> +<#--
> +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">
> +//<![CDATA[
> +function submitForm(form, mode, value) {
> + if (mode == "DN") {
> + // done action; payment info
> +
> form.action="<@o...@ofbizUrl>";
> + form.submit();
> + } else if (mode == "CS") {
> + // continue shopping
> +
> form.action="<@o...@ofbizUrl>";
> + form.submit();
> + } else if (mode == "NA") {
> + // new address
> +
> form.action="<@o...@ofbizUrl>";
> + form.submit();
> + } else if (mode == "SV") {
> + // save option; return to current screen
> +
> form.action="<@o...@ofbizUrl>";
> + form.submit();
> + } else if (mode == "SA") {
> + // selected shipping address
> +
> form.action="<@o...@ofbizUrl>";
> + form.submit();
> + }
> +}
> +//]]>
> +</script>
> +
> +<div class="screenlet">
> + <div class="screenlet-title-bar">
> + <div class="h3">${uiLabelMap.OrderItemGroups}</div>
> + </div>
> + <div class="screenlet-body">
> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
> + <#assign shipGroups = cart.getShipGroups()>
> + <#if (shipGroups.size() > 0)>
> + <#assign groupIdx = 0>
> + <#list shipGroups as group>
> + <#assign shipEstimateWrapper =
> Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher,
> cart, groupIdx)>
> + <#assign carrierShipmentMethods =
> shipEstimateWrapper.getShippingMethods()>
> + <#assign groupNumber = groupIdx + 1>
> + <form method="post" action="#"
> name="editgroupform${groupIdx}" style="margin: 0;">
> + <input type="hidden" name="groupIndex"
> value="${groupIdx}"/>
> + <tr>
> + <td>
> + <div class="tabletext"><b>${uiLabelMap.CommonGroup}
> ${groupNumber}:</b></div>
> + <#list group.getShipItems() as item>
> + <#assign groupItem = group.getShipItemInfo(item)>
> + <div
> class="tabletext"> ${item.getName()} -
> (${groupItem.getItemQuantity()})</div>
> + </#list>
> + </td>
> + <td>
> + <div>
> + <span
> class='tabletext'>${uiLabelMap.CommonAdd}:</span>
> + <a
> href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');"
> class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
> + </div>
> + <div>
> + <#assign selectedContactMechId =
> cart.getShippingContactMechId(groupIdx)?default("")>
> + <select name="shippingContactMechId"
> class="selectBox"
> onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA',
> null);">
> + <option
> value="">${uiLabelMap.OrderSelectShippingAddress}</option>
> + <#list shippingContactMechList as
> shippingContactMech>
> + <#assign shippingAddress =
> shippingContactMech.getRelatedOne("PostalAddress", false)>
> + <option
> value="${shippingAddress.contactMechId}" <#if
> (shippingAddress.contactMechId ==
> selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
> + </#list>
> + </select>
> + </div>
> + <#if cart.getShipmentMethodTypeId(groupIdx)??>
> + <#assign selectedShippingMethod =
> cart.getShipmentMethodTypeId(groupIdx) + "@" +
> cart.getCarrierPartyId(groupIdx)>
> + <#else>
> + <#assign selectedShippingMethod = "">
> + </#if>
> + <select name="shipmentMethodString" class="selectBox">
> + <option
> value="">${uiLabelMap.OrderSelectShippingMethod}</option>
> + <#list carrierShipmentMethods as
> carrierShipmentMethod>
> + <#assign shippingEst =
> shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
> + <#assign shippingMethod =
> carrierShipmentMethod.shipmentMethodTypeId + "@" +
> carrierShipmentMethod.partyId>
> + <option value="${shippingMethod}" <#if
> (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
> + <#if carrierShipmentMethod.partyId != "_NA_">
> + ${carrierShipmentMethod.partyId!}
> + </#if>
> + ${carrierShipmentMethod.description!}
> + <#if shippingEst?has_content>
> + -
> + <#if (shippingEst > -1)>
> + <@ofbizCurrency amount=shippingEst
> isoCode=cart.getCurrency()/>
> + <#else>
> + ${uiLabelMap.OrderCalculatedOffline}
> + </#if>
> + </#if>
> + </option>
> + </#list>
> + </select>
> +
> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
> + <textarea class='textAreaBox' cols="35" rows="3"
> wrap="hard"
> name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
> + </td>
> + <td>
> + <div>
> + <select name="maySplit" class="selectBox">
> + <#assign maySplitStr =
> cart.getMaySplit(groupIdx)?default("")>
> + <option
> value="">${uiLabelMap.OrderSplittingPreference}</option>
> + <option value="false" <#if maySplitStr ==
> "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
> + <option value="true" <#if maySplitStr ==
> "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
> + </select>
> + </div>
> + <div>
> + <select name="isGift" class="selectBox">
> + <#assign isGiftStr =
> cart.getIsGift(groupIdx)?default("")>
> + <option value="">${uiLabelMap.OrderIsGift}
> ?</option>
> + <option value="false" <#if isGiftStr ==
> "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
> + <option value="true" <#if isGiftStr ==
> "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
> + </select>
> + </div>
> +
> + <h2>${uiLabelMap.OrderGiftMessage}</h2>
> + <textarea class='textAreaBox' cols="30" rows="3"
> wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
> + </td>
> + <td><input type="button" class="smallSubmit"
> value="${uiLabelMap.CommonSave}"
> onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV',
> null);"/></td>
> + </tr>
> + <#assign groupIdx = groupIdx + 1>
> + <#if group_has_next>
> + <tr>
> + <td colspan="6"><hr /></td>
> + </tr>
> + </#if>
> + </form>
> + </#list>
> + <#else>
> + <div
> class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
> + </#if>
> + </table>
> + </div>
> +</div>
> +
> +<div class="screenlet">
> + <div class="screenlet-title-bar">
> + <div class="h3">${uiLabelMap.OrderAssignItems}</div>
> + </div>
> + <div class="screenlet-body">
> + <table width="100%" cellspacing="0" cellpadding="1" border="0">
> + <tr>
> + <td><div
> class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
> + <td align="center"><div
> class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
> + <td> </td>
> + <td align="center"><div
> class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
> + <td> </td>
> + <td> </td>
> + </tr>
> +
> + <#list cart.items() as cartLine>
> + <#assign cartLineIndex = cart.getItemIndex(cartLine)>
> + <tr>
> + <form method="post"
> action="<@o...@ofbizUrl>" name="editgroupform"
> style="margin: 0;">
> + <input type="hidden" name="itemIndex"
> value="${cartLineIndex}"/>
> + <td>
> + <div class="tabletext">
> + <#if cartLine.getProductId()??>
> + <#-- product item -->
> + <#-- start code to display a small image of the
> product -->
> + <#assign smallImageUrl =
> Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
> "SMALL_IMAGE_URL", locale, dispatcher, "url")!>
> + <#if !smallImageUrl?string?has_content><#assign
> smallImageUrl = "/images/defaultImage.jpg"></#if>
> + <#if smallImageUrl?string?has_content>
> + <a
> href="<@o...@ofbizUrl>">
> + <img
> src="<@o...@ofbizContentUrl>"
> class="cssImgSmall" alt="" />
> + </a>
> + </#if>
> + <#-- end code to display a small image of the
> product -->
> + <a
> href="<@o...@ofbizUrl>"
> class="buttontext">${cartLine.getProductId()} -
> + ${cartLine.getName()!}</a> :
> ${cartLine.getDescription()!}
> +
> + <#-- display the registered ship groups and
> quantity -->
> + <#assign itemShipGroups =
> cart.getShipGroups(cartLine)>
> + <#list itemShipGroups.entrySet() as group>
> + <div class="tabletext">
> + <#assign groupNumber = group.getKey() + 1>
> + <b>Group - </b>${groupNumber} /
> <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
> + </div>
> + </#list>
> +
> + <#-- if inventory is not required check to see if
> it is out of stock and needs to have a message shown about that... -->
> + <#assign itemProduct = cartLine.getProduct()>
> + <#assign isStoreInventoryNotRequiredAndNotAvailable
> =
> Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
> itemProduct, cartLine.getQuantity(), false, false)>
> + <#if isStoreInventoryNotRequiredAndNotAvailable &&
> itemProduct.inventoryMessage?has_content>
> + <b>(${itemProduct.inventoryMessage})</b>
> + </#if>
> +
> + <#else>
> + <#-- this is a non-product item -->
> + <b>${cartLine.getItemTypeDescription()!}</b> :
> ${cartLine.getName()!}
> + </#if>
> + </div>
> +
> + </td>
> + <td align="right">
> + <div
> class="tabletext">${cartLine.getQuantity()?string.number} </div>
> + </td>
> + <td>
> + <div> </div>
> + </td>
> + <td align="center">
> + <input size="6" class="inputBox" type="text"
> name="quantity" value="${cartLine.getQuantity()?string.number}"/>
> + </td>
> + <td>
> + <div> </div>
> + </td>
> + <td>
> + <div class="tabletext">${uiLabelMap.CommonFrom}:
> + <select name="fromGroupIndex" class="selectBox">
> + <#list itemShipGroups.entrySet() as group>
> + <#assign groupNumber = group.getKey() + 1>
> + <option
> value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
> + </#list>
> + </select>
> + </div>
> + </td>
> + <td>
> + <div class="tabletext">${uiLabelMap.CommonTo}:
> + <select name="toGroupIndex" class="selectBox">
> + <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
> + <#assign groupNumber = groupIdx + 1>
> + <option
> value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
> + </#list>
> + <option value="-1">${uiLabelMap.CommonNew}
> ${uiLabelMap.CommonGroup}</option>
> + </select>
> + </div>
> + </td>
> + <td><input type="submit" class="smallSubmit"
> value="${uiLabelMap.CommonSubmit}"/></td>
> + </form>
> + </tr>
> + </#list>
> + </table>
> + </div>
> +</div>
> +
> +<table>
> + <tr valign="top">
> + <td>
> + <a
> href="<@o...@ofbizUrl>"
> class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
> + </td>
> + <td align="right">
> + <a href="<@o...@ofbizUrl>"
> class="buttontextbig">${uiLabelMap.CommonContinue}</a>
> + </td>
> + </tr>
> +</table>
>
> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/trunk/applications/order/template/entry/SplitShip.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added:
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl?rev=1736868&view=auto
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
> (added)
> +++
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
> Mon Mar 28 11:14:22 2016
> @@ -0,0 +1,64 @@
> +<#--
> +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.
> +-->
> +
> +<#-- ==================== Party Listing dialog box
> ========================= -->
> +<#if additionalPartyRoleMap?has_content>
> +<div class="screenlet">
> + <div class="screenlet-title-bar">
> + <div class="h3">${uiLabelMap.PartyAdditionalPartyListing}</div>
> + </div>
> + <div class="screenlet-body">
> + <table border="0" width="100%" cellpadding="0">
> + <#list roleList as role>
> + <tr>
> + <td valign="bottom"><div>${roleData[role].get("description",
> locale)}</div></td>
> + </tr>
> + <tr>
> + <td colspan="4"><hr /></td>
> + </tr>
> + <#list additionalPartyRoleMap[role] as party>
> + <tr>
> + <td><div>${party}</div></td>
> + <td>
> + <div>
> + <#if partyData[party].type == "person">
> + ${partyData[party].firstName!}
> + <#else>
> + ${partyData[party].groupName!}
> + </#if>
> + </div>
> + </td>
> + <td>
> + <div>
> + <#if partyData[party].type == "person">
> + ${partyData[party].lastName!}
> + </#if>
> + </div>
> + </td>
> + <td align="right">
> + <a
> href="<@o...@ofbizUrl>"
> class="buttontext">${uiLabelMap.CommonRemove}</a>
> + </td>
> + </tr>
> + </#list>
> + <tr><td> </td></tr>
> + </#list>
> + </table>
> + </div>
> +</div>
> +</#if>
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/addrsettings.ftl?rev=1736868&view=auto
>
> ==============================================================================
> --- ofbiz/trunk/applications/order/template/entry/addrsettings.ftl (added)
> +++ ofbiz/trunk/applications/order/template/entry/addrsettings.ftl Mon Mar
> 28 11:14:22 2016
> @@ -0,0 +1,80 @@
> +<#--
> +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 security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
> +
> +<form method="post" action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + <input type="hidden" name="finalizeMode" value="ship"/>
> + <table width="100%" border="0" align="center" cellspacing='0'
> cellpadding='0' class='boxoutside'>
> + <tr><td>
> +
> + <#-- header table -->
> +
> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
> class='boxtop'>
> + <tr>
> + <td valign="middle">
> + <div
> class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div>
> + </td>
> + </tr>
> + </table>
> +
> + <table width="100%" border='0' cellspacing='0' cellpadding='0'
> class='boxbottom'>
> + <tr><td colspan="3"><hr /></td></tr>
> +
> + <#-- postal addresses for chosen id -->
> +
> + <#if partyContactMechPurposes??>
> + <#list partyContactMechPurposes as partyContactMechPurpose>
> + <#assign shippingAddress =
> partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
> +
> + <#-- skip non-postal addresses -->
> +
> + <#if shippingAddress.toName??>
> + <tr>
> + <td valign="top" nowrap="nowrap">
> + <input type="radio" name="shipping_contact_mech_id"
> value="${partyContactMechPurpose.contactMechId}" />
> + </td>
> + <td nowrap="nowrap"> </td>
> + <td width="100%">
> + <div>
> + <#if
> shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br
> /></#if>
> + <#if
> shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br
> /></#if>
> + <#if
> shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
> + <#if
> shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
> + <#if
> shippingAddress.city?has_content>${shippingAddress.city}</#if>
> + <#if
> shippingAddress.stateProvinceGeoId?has_content><br
> />${shippingAddress.stateProvinceGeoId}</#if>
> + <#if shippingAddress.postalCode?has_content><br
> />${shippingAddress.postalCode}</#if>
> + <#if shippingAddress.countryGeoId?has_content><br
> />${shippingAddress.countryGeoId}</#if>
> + </div>
> + </td>
> + </tr>
> + <tr><td colspan="3"><hr /></td></tr>
> + </#if>
> + </#list>
> + </#if>
> +
> + </table>
> +
> + </td></tr>
> + </table>
> +</form>
> +
> +<#else>
> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
> +</#if>
>
> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/billsettings.ftl?rev=1736868&view=auto
>
> ==============================================================================
> --- ofbiz/trunk/applications/order/template/entry/billsettings.ftl (added)
> +++ ofbiz/trunk/applications/order/template/entry/billsettings.ftl Mon Mar
> 28 11:14:22 2016
> @@ -0,0 +1,516 @@
> +<#--
> +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 type="text/javascript">
> +//<![CDATA[
> +function shipBillAddr() {
> + if (document.checkoutsetupform.useShipAddr.checked) {
> + window.location =
> "<@o...@ofbizUrl>";
> + } else {
> + window.location =
> "<@o...@ofbizUrl>";
> + }
> +}
> +
> +function makeExpDate() {
> + document.checkoutsetupform.expireDate.value =
> document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value
> + "/" +
> document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value;
> +}
> +//]]>
> +</script>
> +
> +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) ||
> security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
> +<div class="screenlet">
> + <div class="screenlet-body">
> + <#if request.getAttribute("paymentMethodId")?? || (
> (paymentMethodList?has_content || billingAccountList?has_content) &&
> !requestParameters.createNew??)>
> + <#-- initial screen when we have a associated party -->
> + <form method="post"
> action="<@o...@ofbizUrl>" name="checkoutsetupform">
> + <input type="hidden" name="finalizeMode" value="payment"/>
> + <table width="100%" cellpadding="1" cellspacing="0"
> border="0">
> + <tr>
> + <td colspan="2">
> + <a href="<@o...@ofbizUrl>"
> class="buttontext">${uiLabelMap.CommonCreateNew}</a>
> + </td>
> + </tr>
> + <tr><td colspan="3"><hr /></td></tr>
> + <#if billingAccountList?has_content>
> + <tr>
> + <td width="1%">
> + <select name="billingAccountId">
> + <option value=""></option>
> + <#list billingAccountList as billingAccount>
> + <#assign availableAmount =
> billingAccount.accountBalance?double>
> + <#if (billingAccount.accountLimit)??>
> + <#assign accountLimit =
> billingAccount.accountLimit?double />
> + <#else>
> + <#assign accountLimit = 0.00 />
> + </#if>
> + <option
> value="${billingAccount.billingAccountId}" <#if
> billingAccount.billingAccountId ==
> selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
> [${billingAccount.billingAccountId}] Available: <@ofbizCurrency
> amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit:
> <@ofbizCurrency amount=accountLimit
> isoCode=billingAccount.accountCurrencyUomId/></option>
> + </#list>
> + </select>
> + </td>
> + <td width="50%">
> +
> <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
> + </td>
> + <td> </td>
> + </tr>
> + <tr>
> + <td width="1%" align="right">
> + <input type="text" size="5"
> name="billingAccountAmount" value=""/>
> + </td>
> + <td width="50%">
> + ${uiLabelMap.OrderBillUpTo}
> + </td>
> + <td> </td>
> + </tr>
> + <tr><td colspan="3"><hr /></td></tr>
> + </#if>
> + <tr>
> + <td width="1%">
> + <input type="radio" id="checkOutPaymentId_EXT_OFFLINE"
> name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? &&
> checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
> + </td>
> + <td colspan="2" width="50%">
> + <label
> for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
> + </td>
> + </tr>
> + <tr><td colspan="3"><hr /></td></tr>
> + <tr>
> + <td width="1%">
> + <input type="radio" id="checkOutPaymentId_EXT_COD"
> name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? &&
> checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
> + </td>
> + <td colspan="2" width="50%">
> + <label
> for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label>
> + </td>
> + </tr>
> + <tr><td colspan="3"><hr /></td></tr>
> + <#if paymentMethodList?has_content>
> + <#list paymentMethodList as paymentMethod>
> + <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
> + <#assign creditCard =
> paymentMethod.getRelatedOne("CreditCard", false)>
> + <tr>
> + <td width="1%">
> + <input type="radio"
> id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}"
> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
> checkOutPaymentId>checked="checked"</#if>/>
> + </td>
> + <td width="50%">
> + <label
> for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}">
> +
> CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
> + <#if
> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
> + </label>
> + <span>
> + ${uiLabelMap.OrderCardSecurityCode} <input
> type="text" size="5" maxlength="10"
> name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
> + </span>
> + </td>
> + <td align="right"><a
> href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
> + </tr>
> + <#elseif paymentMethod.paymentMethodTypeId ==
> "EFT_ACCOUNT">
> + <#assign eftAccount =
> paymentMethod.getRelatedOne("EftAccount", false)>
> + <tr>
> + <td width="1%">
> + <input type="radio"
> id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}"
> name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if
> checkOutPaymentId?? && paymentMethod.paymentMethodId ==
> checkOutPaymentId>checked="checked"</#if>/>
> + </td>
> + <td width="50%">
> + <label
> for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}">
> + EFT: ${eftAccount.bankName!}:
> ${eftAccount.accountNumber!}
> + <#if
> paymentMethod.description?has_content>(${paymentMethod.description})</#if>
> + </label>
> + </td>
> + <td align="right"><a
> href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}"
> target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
> + </tr>
> + <tr><td colspan="2"><hr /></td></tr>
> + </#if>
> + </#list>
> + <#else>
> + <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
> + </#if>
> + </table>
> + </form>
> + <#elseif paymentMethodType?? || finalizeMode?default("") ==
> "payment">
> + <#-- after initial screen; show detailed screens for selected
> type -->
> + <#if paymentMethodType == "CC">
> + <#if postalAddress?has_content>
> + <form method="post"
> action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + <input type="hidden" name="paymentMethodId"
> value="${creditCard.paymentMethodId!}"/>
> + <input type="hidden" name="contactMechId"
> value="${postalAddress.contactMechId!}"/>
> + <#elseif requestParameters.useShipAddr??>
> + <form method="post"
> action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + <#else>
> + <form method="post"
> action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + </#if>
> + </#if>
> + <#if paymentMethodType == "EFT">
> + <#if postalAddress?has_content>
> + <form method="post"
> action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + <input type="hidden" name="paymentMethodId"
> value="${eftAccount.paymentMethodId!}"/>
> + <input type="hidden" name="contactMechId"
> value="${postalAddress.contactMechId!}"/>
> + <#elseif requestParameters.useShipAddr??>
> + <form method="post"
> action="<@o...@ofbizUrl>" name="checkoutsetupform">
> + <#else>
> + <form method="post"
> action="<@o...@ofbizUrl>"
> name="checkoutsetupform">
> + </#if>
> + </#if>
> +
> + <input type="hidden" name="contactMechTypeId"
> value="POSTAL_ADDRESS"/>
> + <input type="hidden" name="partyId"
> value="${cart.getPartyId()}"/>
> + <input type="hidden" name="paymentMethodType"
> value="${paymentMethodType}"/>
> + <input type="hidden" name="finalizeMode" value="payment"/>
> + <input type="hidden" name="createNew" value="Y"/>
> + <#if requestParameters.useShipAddr??>
> + <input type="hidden" name="contactMechId"
> value="${postalFields.contactMechId}"/>
> + </#if>
> +
> + <table width="100%" border="0" cellpadding="1" cellspacing="0">
> + <#if cart.getShippingContactMechId()??>
> + <tr>
> + <td width="26%" align="right"= valign="top">
> + <input type="checkbox" name="useShipAddr" value="Y"
> onclick="javascript:shipBillAddr();" <#if
> requestParameters.useShipAddr??>checked="checked"</#if>/>
> + </td>
> + <td colspan="2" valign="center">
> +
> <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
> + </td>
> + </tr>
> + <tr>
> + <td colspan="3"><hr /></td>
> + </tr>
> + </#if>
> +
> + <#if orderPerson?has_content>
> + <#assign toName = "">
> + <#if orderPerson.personalTitle?has_content><#assign toName
> = orderPerson.personalTitle + " "></#if>
> + <#assign toName = toName + orderPerson.firstName + " ">
> + <#if orderPerson.middleName?has_content><#assign toName =
> toName + orderPerson.middleName + " "></#if>
> + <#assign toName = toName + orderPerson.lastName>
> + <#if orderPerson.suffix?has_content><#assign toName =
> toName + " " + orderPerson.suffix></#if>
> + <#else>
> + <#assign toName = postalFields.toName?default("")>
> + </#if>
> +
> + <#-- generic address information -->
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonToName}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="60" name="toName"
> value="${toName}" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="60"
> name="attnName" value="${postalFields.attnName!}" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="30"
> name="address1" value="${postalFields.address1!}" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="30"
> name="address2" value="${postalFields.address2!}" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonCity}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="30" name="city"
> value="${postalFields.city!}" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <select name="stateProvinceGeoId" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>>
> + <#if postalFields.stateProvinceGeoId??>
> + <option>${postalFields.stateProvinceGeoId}</option>
> + <option
> value="${postalFields.stateProvinceGeoId}">---</option>
> + </#if>
> + <option value=""></option>
> +
> ${screens.render("component://common/widget/CommonScreens.xml#states")}
> + </select>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="12" maxlength="10"
> name="postalCode" value="${postalFields.postalCode!}" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <select name="countryGeoId" <#if
> requestParameters.useShipAddr??>disabled="disabled"</#if>>
> + <#if postalFields.countryGeoId??>
> + <option>${postalFields.countryGeoId}</option>
> + <option
> value="${postalFields.countryGeoId}">---</option>
> + </#if>
> +
> ${screens.render("component://common/widget/CommonScreens.xml#countries")}
> + </select>
> + *</td>
> + </tr>
> +
> + <#-- credit card fields -->
> + <#if paymentMethodType == "CC">
> + <#if !creditCard?has_content>
> + <#assign creditCard = requestParameters>
> + </#if>
> + <input type="hidden" name="expireDate"
> value="${creditCard.expireDate!}"/>
> + <tr>
> + <td colspan="3"><hr /></td>
> + </tr>
> +
> + <tr>
> + <td width="26%" align="right"
> valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" class='inputBox' size="30"
> maxlength="60" name="companyNameOnCard"
> value="${creditCard.companyNameOnCard!}"/>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="middle"><div>${uiLabelMap.AccountingPrefixCard}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <select name="titleOnCard">
> + <option
> value="">${uiLabelMap.CommonSelectOne}</option>
> + <option<#if ((creditCard.titleOnCard)?default("") ==
> "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
> + <option<#if ((creditCard.titleOnCard)?default("") ==
> "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
> + <option<#if ((creditCard.titleOnCard)?default("") ==
> "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
> + <option<#if ((creditCard.titleOnCard)?default("") ==
> "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
> + </select>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="20" maxlength="60"
> name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="15" maxlength="60"
> name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="20" maxlength="60"
> name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="middle"><div>${uiLabelMap.AccountingSuffixCard}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <select name="suffixOnCard">
> + <option
> value="">${uiLabelMap.CommonSelectOne}</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "Jr.")> checked="checked"</#if>>Jr.</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "Sr.")> checked="checked"</#if>>Sr.</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "I")> checked="checked"</#if>>I</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "II")> checked="checked"</#if>>II</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "III")> checked="checked"</#if>>III</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "IV")> checked="checked"</#if>>IV</option>
> + <option<#if ((creditCard.suffixOnCard)?default("") ==
> "V")> checked="checked"</#if>>V</option>
> + </select>
> + </td>
> + </tr>
> +
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingCardType}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <select name="cardType">
> + <#if creditCard.cartType??>
> + <option>${creditCard.cardType}</option>
> + <option value="${creditCard.cardType}">---</option>
> + </#if>
> +
> ${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
> + </select>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="20" maxlength="30"
> name="cardNumber" value="${creditCard.cardNumber!}"/>
> + *</td>
> + </tr>
> + <#--<tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.OrderCardSecurityCode}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="5" maxlength="10"
> name="cardSecurityCode" value=""/>
> + </td>
> + </tr>-->
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <#assign expMonth = "">
> + <#assign expYear = "">
> + <#if creditCard?? && creditCard.expDate??>
> + <#assign expDate = creditCard.expireDate>
> + <#if (expDate?? && expDate.indexOf("/") > 0)>
> + <#assign expMonth =
> expDate.substring(0,expDate.indexOf("/"))>
> + <#assign expYear =
> expDate.substring(expDate.indexOf("/")+1)>
> + </#if>
> + </#if>
> + <select name="expMonth"
> onchange="javascript:makeExpDate();">
> + <#if creditCard?has_content &&
> expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign
> ccExprMonth = requestParameters.expMonth!></#if>
> + <#if ccExprMonth?has_content>
> + <option
> value="${ccExprMonth!}">${ccExprMonth!}</option>
> + </#if>
> +
> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
> + </select>
> + <select name="expYear"
> onchange="javascript:makeExpDate();">
> + <#if creditCard?has_content &&
> expYear?has_content><#assign ccExprYear = expYear><#else><#assign
> ccExprYear = requestParameters.expYear!></#if>
> + <#if ccExprYear?has_content>
> + <option
> value="${ccExprYear!}">${ccExprYear!}</option>
> + </#if>
> +
> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
> + </select>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="20" maxlength="30"
> name="description" value="${creditCard.description!}"/>
> + </td>
> + </tr>
> + </#if>
> +
> + <#-- eft fields -->
> + <#if paymentMethodType =="EFT">
> + <#if !eftAccount?has_content>
> + <#assign eftAccount = requestParameters>
> + </#if>
> + <tr>
> + <td colspan="3"><hr /></td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="60"
> name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="60"
> name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
> + </td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="60"
> name="bankName" value="${eftAccount.bankName!}"/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="10" maxlength="30"
> name="routingNumber" value="${eftAccount.routingNumber!}"/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <select name="accountType">
> + <option>${eftAccount.accountType!}</option>
> + <option></option>
> + <option>Checking</option>
> + <option>Savings</option>
> + </select>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="20" maxlength="40"
> name="accountNumber" value="${eftAccount.accountNumber!}"/>
> + *</td>
> + </tr>
> + <tr>
> + <td width="26%" align="right"
> valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
> + <td width="5"> </td>
> + <td width="74%">
> + <input type="text" size="30" maxlength="60"
> name="description" value="${eftAccount.description!}"/>
> + </td>
> + </tr>
> + </#if>
> + </table>
> + <#else>
> + <#-- initial screen show a list of options -->
> +
> + <script type="text/javascript">
> +
> + function setCheckoutPaymentId( selectedValue ) {
> + checkoutForm =
> document.getElementById('checkoutsetupform');
> + if( selectedValue.match('^EXT_.*') ) {
> + checkoutForm.action =
> '<@o...@ofbizUrl>?checkOutPaymentId=' + selectedValue ;
> + } else {
> + checkoutForm.action =
> '<@o...@ofbizUrl>?paymentMethodType=' + selectedValue ;
> + }
> + }
> + </script>
> +
> + <form method="post"
> action="<@o...@ofbizUrl>" name="checkoutsetupform"
> id="checkoutsetupform">
> + <input type="hidden" name="finalizeMode" value="payment"/>
> + <input type="hidden" name="createNew"
> value="${(requestParameters.createNew)!}"/>
> + <table width="100%" border="0" cellpadding="1"
> cellspacing="0">
> + <#if "Y" != requestParameters.createNew?default("")>
> + <tr>
> + <td width='1%' nowrap="nowrap"><input type="radio"
> name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId??
> && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>
> onchange="setCheckoutPaymentId(this.value)"
> onclick="setCheckoutPaymentId(this.value)"/></td>
> + <td width='50%'
> nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
> + </tr>
> + <tr><td colspan="2"><hr /></td></tr>
> + <tr>
> + <td width="1%" nowrap="nowrap"><input type="radio"
> name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? &&
> checkOutPaymentId == "EXT_COD">checked="checked"</#if>
> onchange="setCheckoutPaymentId(this.value)"
> onclick="setCheckoutPaymentId(this.value)"/></td>
> + <td width="50%"
> nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
> + </tr>
> + <tr><td colspan="2"><hr /></td></tr>
> + </#if>
> + <tr>
> + <td width='1%' nowrap="nowrap"><input type="radio"
> name="paymentMethodTypeAndId" value="CC"
> onchange="setCheckoutPaymentId(this.value)"
> onclick="setCheckoutPaymentId(this.value)"/>
> + <td width='50%'
> nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
> + </tr>
> + <tr><td colspan="2"><hr /></td></tr>
> + <tr>
> + <td width='1%' nowrap="nowrap"><input type="radio"
> name="paymentMethodTypeAndId" value="EFT"
> onchange="setCheckoutPaymentId(this.value)"
> onclick="setCheckoutPaymentId(this.value)"/>
> + <td width='50%'
> nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
> + </tr>
> + </table>
> + </form>
> + </#if>
> + </div>
> +</div>
> +<#else>
> + <h3>${uiLabelMap.OrderViewPermissionError}</h3>
> +</#if>
>
> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/trunk/applications/order/template/entry/billsettings.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added:
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl?rev=1736868&view=auto
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
> (added)
> +++
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
> Mon Mar 28 11:14:22 2016
> @@ -0,0 +1,61 @@
> +<#--
> +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.
> +-->
> +
> +<!-- Screenlet to add cart to shopping list. The shopping lists are
> presented in a dropdown box. -->
> +
> +<#if (shoppingLists??) && (shoppingCartSize > 0)>
> + <div class="screenlet">
> + <div class="screenlet-title-bar">
> + <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
> + </div>
> + <div class="screenlet-body">
> + <table border="0" cellspacing="0" cellpadding="0">
> + <tr>
> + <td>
> + <form method="post" name="addBulkToShoppingList"
> action="<@o...@ofbizUrl>" style='margin: 0;'>
> + <#assign index = 0/>
> + <#list shoppingCart.items() as cartLine>
> + <#if (cartLine.getProductId()??) &&
> !cartLine.getIsPromo()>
> + <input type="hidden" name="selectedItem"
> value="${index}"/>
> + </#if>
> + <#assign index = index + 1/>
> + </#list>
> + <table border="0">
> + <tr>
> + <td>
> + <div>
> + <select name='shoppingListId'>
> + <#list shoppingLists as shoppingList>
> + <option
> value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
> + </#list>
> + <option value="">---</option>
> + <option
> value="">${uiLabelMap.OrderNewShoppingList}</option>
> + </select>
> + <input type="submit" class="smallSubmit"
> value="${uiLabelMap.OrderAddToShoppingList}"/>
> + </div>
> + </td>
> + </tr>
> + </table>
> + </form>
> + </td>
> + </tr>
> + </table>
> + </div>
> + </div>
> +</#if>
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added:
> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl?rev=1736868&view=auto
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
> (added)
> +++
> ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
> Mon Mar 28 11:14:22 2016
> @@ -0,0 +1,47 @@
> +<#--
> +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 (shoppingCart.getOrderType() == "SALES_ORDER")>
> + <#assign associatedProducts =
> Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request,
> true)!>
> +</#if>
> +
> +<#if associatedProducts?has_content>
> + <div class="screenlet">
> + <div class="screenlet-title-bar">
> + <div class="h3">${uiLabelMap.OrderHelpAlsoInterestedIn}</div>
> + </div>
> + <div class="screenlet-body">
> + <table cellspacing="0" cellpadding="1" border="0">
> + <#-- random complementary products -->
> + <#list associatedProducts as assocProduct>
> + <tr>
> + <td>
> + ${setRequestAttribute("optProduct", assocProduct)}
> + ${setRequestAttribute("listIndex", assocProduct_index)}
> + ${screens.render(productsummaryScreen)}
> + </td>
> + </tr>
> + <#if assocProduct_has_next>
> + <tr><td><hr/></td></tr>
> + </#if>
> + </#list>
> + </table>
> + </div>
> + </div>
> +</#if>
>
>
>
>