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 [5/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...
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,63 @@
+<#--
+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 product??>
+ <span class="pid">
+ <div>
+ <b>${product.productId}</b>
+ </div>
+ </span>
+ <span class="name">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME", "html")!}</a>
+ </span>
+ <span class="listPrice">
+ <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double>
+ ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+ <#else>
+
+ </#if>
+ </span>
+ <span class="totalPrice">
+ <#if totalPrice??>
+ <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
+ <#else>
+ <div class="<#if price.isSale?? && price.isSale>salePrice<#else>normalPrice</#if>">
+ <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
+ </div>
+ </#if>
+ </span>
+ <span class="qty">
+ <#-- check to see if introductionDate hasn't passed yet -->
+ <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
+ ${uiLabelMap.ProductNotYetAvailable}
+ <#-- check to see if salesDiscontinuationDate has passed -->
+ <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)>
+ ${uiLabelMap.ProductNoLongerAvailable}
+ <#-- check to see if the product is a virtual product -->
+ <#elseif product.isVirtual?default("N") == "Y">
+ <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&</#...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
+ <#else>
+ <input type="text" size="5" name="quantity_${product.productId}" value="" />
+ </#if>
+ </span>
+<#else>
+ <h1>${uiLabelMap.ProductErrorProductNotFound}.</h1>
+</#if>
+
+
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,100 @@
+<#--
+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.
+-->
+<#-- variable setup and worker calls -->
+<#if (requestAttributes.topLevelList)??><#assign topLevelList = requestAttributes.topLevelList></#if>
+<#if (requestAttributes.curCategoryId)??><#assign curCategoryId = requestAttributes.curCategoryId></#if>
+
+<#-- looping macro -->
+<#macro categoryList parentCategory category>
+ <#-- jleroux: This whole block does not make sense to me -->
+ <#--if parentCategory.productCategoryId != category.productCategoryId>
+ <#local pStr = "/~pcategory=" + parentCategory.productCategoryId>
+ </#if-->
+ <#if curCategoryId?? && curCategoryId == category.productCategoryId>
+ <div class="browsecategorytext">
+ <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")?has_content>
+ <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")}</a>
+ </#if>
+ <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")?has_content>
+ <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")}</a>
+ </#if>
+ <#else>
+ <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName!}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
+ </#if>
+ </#if>
+ </div>
+ <#else>
+ <div class="browsecategorytext">
+ <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")?has_content>
+ <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")}</a>
+ </#if>
+ <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")?has_content>
+ <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")}</a>
+ </#if>
+ <#else>
+ <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName!}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
+ </#if>
+ </#if>
+ </div>
+ </#if>
+
+ <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)>
+ <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)>
+ <#if subCatList??>
+ <#list subCatList as subCat>
+ <div class="browsecategorylist">
+ <@categoryList parentCategory=category category=subCat/>
+ </div>
+ </#list>
+ </#if>
+ </#if>
+</#macro>
+
+<#if topLevelList?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.ProductBrowseCategories}</div>
+ </div>
+ <div class="screenlet-body">
+ <div class="browsecategorylist">
+ <#list topLevelList as category>
+ <@categoryList parentCategory=category category=category/>
+ </#list>
+ </div>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,84 @@
+<#--
+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.
+-->
+
+<h1>${uiLabelMap.ProductProductTaggedWith} "${parameters.SEARCH_STRING}"</h1>
+
+<#if !productIds?has_content>
+ <h2> ${uiLabelMap.ProductNoResultsFound}.</h2>
+</#if>
+
+<#if productIds?has_content>
+ <div class="product-prevnext">
+ <#-- Start Page Select Drop-Down -->
+ <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
+ <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
+ <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int + 1} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
+ <#list 0..viewIndexMax as curViewNum>
+ <option value="<@o...@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
+ </#list>
+ </select>
+ <#-- End Page Select Drop-Down -->
+ <b>
+ <#if (viewIndex?int > 0)>
+ <a href="<@ofbizUrl>keywordsearch/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}/~clearSearch=N</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
+ </#if>
+ <#if (listSize?int > 0)>
+ <span>${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+ </#if>
+ <#if highIndex?int < listSize?int>
+ | <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
+ </#if>
+ </b>
+ </div>
+</#if>
+
+<#if productIds?has_content>
+ <div class="productsummary-container">
+ <#list productIds as productId> <#-- note that there is no boundary range because that is being done before the list is put in the content -->
+ ${setRequestAttribute("optProductId", productId)}
+ ${setRequestAttribute("listIndex", productId_index)}
+ ${screens.render(productsummaryScreen)}
+ </#list>
+ </div>
+</#if>
+
+<#if productIds?has_content>
+ <div class="product-prevnext">
+ <#-- Start Page Select Drop-Down -->
+ <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
+ <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
+ <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int + 1} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
+ <#list 0..viewIndexMax as curViewNum>
+ <option value="<@o...@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
+ </#list>
+ </select>
+ <#-- End Page Select Drop-Down -->
+ <b>
+ <#if (viewIndex?int > 0)>
+ <a href="<@ofbizUrl>keywordsearch/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}/~clearSearch=N</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
+ </#if>
+ <#if (listSize?int > 0)>
+ <span>${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+ </#if>
+ <#if highIndex?int < listSize?int>
+ | <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
+ </#if>
+ </b>
+ </div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/checkinits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/checkinits.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/checkinits.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/checkinits.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,195 @@
+<#--
+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.
+-->
+
+<#assign shoppingCartOrderType = "">
+<#assign shoppingCartProductStore = "NA">
+<#assign shoppingCartChannelType = "">
+<#if shoppingCart??>
+ <#assign shoppingCartOrderType = shoppingCart.getOrderType()>
+ <#assign shoppingCartProductStore = shoppingCart.getProductStoreId()?default("NA")>
+ <#assign shoppingCartChannelType = shoppingCart.getChannelType()?default("")>
+<#else>
+<#-- allow the order type to be set in parameter, so only the appropriate section (Sales or Purchase Order) shows up -->
+ <#if parameters.orderTypeId?has_content>
+ <#assign shoppingCartOrderType = parameters.orderTypeId>
+ </#if>
+</#if>
+<!-- Sales Order Entry -->
+<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
+<#if shoppingCartOrderType != "PURCHASE_ORDER">
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li>
+ <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" name="salesentryform" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="originOrderId" value="${parameters.originOrderId!}"/>
+ <input type="hidden" name="finalizeMode" value="type"/>
+ <input type="hidden" name="orderMode" value="SALES_ORDER"/>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td > </td>
+ <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td>
+ <td > </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <select name="productStoreId"<#if sessionAttributes.orderMode??> disabled</#if>>
+ <#assign currentStore = shoppingCartProductStore>
+ <#if defaultProductStore?has_content>
+ <option value="${defaultProductStore.productStoreId}">${defaultProductStore.storeName!}</option>
+ <option value="${defaultProductStore.productStoreId}">----</option>
+ </#if>
+ <#list productStores as productStore>
+ <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected="selected"</#if>>${productStore.storeName!}</option>
+ </#list>
+ </select>
+ <#if sessionAttributes.orderMode??>${uiLabelMap.OrderCannotBeChanged}</#if>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="4"> </td></tr>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderSalesChannel}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <select name="salesChannelEnumId">
+ <#assign currentChannel = shoppingCartChannelType>
+ <#if defaultSalesChannel?has_content>
+ <option value="${defaultSalesChannel.enumId}">${defaultSalesChannel.description!}</option>
+ <option value="${defaultSalesChannel.enumId}"> ---- </option>
+ </#if>
+ <option value="">${uiLabelMap.OrderNoChannel}</option>
+ <#list salesChannels as salesChannel>
+ <option value="${salesChannel.enumId}" <#if (salesChannel.enumId == currentChannel)>selected="selected"</#if>>${salesChannel.get("description",locale)}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="4"> </td></tr>
+ <#if partyId??>
+ <#assign thisPartyId = partyId>
+ <#else>
+ <#assign thisPartyId = requestParameters.partyId!>
+ </#if>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.CommonUserLoginId}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <@htmlTemplate.lookupField value="${parameters.userLogin.userLoginId}" formName="salesentryform" name="userLoginId" id="userLoginId_sales" fieldFormName="LookupUserLoginAndPartyDetails"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderCustomer}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <@htmlTemplate.lookupField value='${thisPartyId!}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
+</#if>
+</#if>
+<br />
+<!-- Purchase Order Entry -->
+<#if security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
+ <#if shoppingCartOrderType != "SALES_ORDER">
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li>
+ <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" name="poentryform" action="<@o...@ofbizUrl>">
+ <input type='hidden' name='finalizeMode' value='type'/>
+ <input type='hidden' name='orderMode' value='PURCHASE_ORDER'/>
+ <table width="100%" border='0' cellspacing='0' cellpadding='0'>
+ <#if partyId??>
+ <#assign thisPartyId = partyId>
+ <#else>
+ <#assign thisPartyId = requestParameters.partyId!>
+ </#if>
+ <tr>
+ <td> </td>
+ <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderOrderEntryInternalOrganization}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <select name="billToCustomerPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
+ <#list organizations as organization>
+ <#assign organizationName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(organization, true)/>
+ <#if (organizationName.length() != 0)>
+ <option value="${organization.partyId}">${organization.partyId} - ${organizationName}</option>
+ </#if>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="4"> </td></tr>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.CommonUserLoginId}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <@htmlTemplate.lookupField value='${parameters.userLogin.userLoginId}'formName="poentryform" name="userLoginId" id="userLoginId_purchase" fieldFormName="LookupUserLoginAndPartyDetails"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartySupplier}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <select name="supplierPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
+ <option value="">${uiLabelMap.OrderSelectSupplier}</option>
+ <#list suppliers as supplier>
+ <option value="${supplier.partyId}"<#if supplier.partyId == thisPartyId> selected="selected"</#if>>[${supplier.partyId}] - ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </#if>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/checkinits.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/checkinits.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/checkinits.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,534 @@
+<#--
+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 submitForm(form, mode, value) {
+ if (mode == "DN") {
+ // done action; checkout
+ 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 == "EA") {
+ // edit address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NC") {
+ // new credit card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "EC") {
+ // edit credit card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "GC") {
+ // edit gift card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NE") {
+ // new eft account
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "EE") {
+ // edit eft account
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SP") {
+ // split payment
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SA") {
+ // selected shipping address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SC") {
+ // selected ship to party
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ }
+}
+//]]>
+</script>
+
+<#assign shipping = !shoppingCart.containAllWorkEffortCartItems()> <#-- contains items which need shipping? -->
+<form method="post" name="checkoutInfoForm" style="margin:0;">
+ <input type="hidden" name="checkoutpage" value="quick"/>
+ <input type="hidden" name="BACK_PAGE" value="quickcheckout"/>
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr valign="top">
+ <td height="100%">
+ <div class="screenlet" style="height: 100%;">
+ <div class="screenlet-title-bar">
+ <#if shipping == true>
+ <div class="h3">1) ${uiLabelMap.OrderWhereShallWeShipIt}?</div>
+ <#else>
+ <div class="h3">1) ${uiLabelMap.OrderInformationAboutYou}</div>
+ </#if>
+ </div>
+ <div class="screenlet-body" style="height: 100%;">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td colspan="2">
+ <span>${uiLabelMap.OrderShipToParty}:</span>
+ <select name="shipToCustomerPartyId" onchange="javascript:submitForm(document.checkoutInfoForm, 'SC', null);">
+ <#list cartParties as cartParty>
+ <option value="${cartParty}">${cartParty}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <span>${uiLabelMap.CommonAdd}:</span>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
+ </td>
+ </tr>
+ <#if (shoppingCart.getTotalQuantity() > 1) && !shoppingCart.containAllWorkEffortCartItems()> <#-- no splitting when only rental items -->
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td colspan="2" align="center">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitIntoMultipleShipments}</a>
+ <#if (shoppingCart.getShipGroupSize() > 1)>
+ <div style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}.</div>
+ </#if>
+ </td>
+ </tr>
+ </#if>
+ <#if shippingContactMechList?has_content>
+ <tr><td colspan="2"><hr /></td></tr>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <tr>
+ <td valign="top" width="1%">
+ <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/>
+ </td>
+ <td valign="top" width="99%">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</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>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ </div>
+ </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="2"><hr /></td></tr>
+ </#if>
+ </#list>
+ </#if>
+ </table>
+
+ <#-- Party Tax Info -->
+ <#-- commented out by default because the TaxAuthority drop-down is just too wide...
+ <hr />
+ <div> ${uiLabelMap.PartyTaxIdentification}</div>
+ ${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
+ -->
+ </div>
+ </div>
+ </td>
+ <td bgcolor="white" width="1"> </td>
+ <td height="100%">
+ <div class="screenlet" style="height: 100%;">
+ <div class="screenlet-title-bar">
+ <#if shipping == true>
+ <div class="h3">2) ${uiLabelMap.OrderHowShallWeShipIt}?</div>
+ <#else>
+ <div class="h3">2) ${uiLabelMap.OrderOptions}?</div>
+ </#if>
+ </div>
+ <div class="screenlet-body" style="height: 100%;">
+ <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
+ <#if shipping == true>
+ <#list carrierShipmentMethodList as carrierShipmentMethod>
+ <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
+ <tr>
+ <td width="1%" valign="top">
+ <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
+ </td>
+ <td valign="top">
+ <div>
+ <#if shoppingCart.getShippingContactMechId()??>
+ <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
+ </#if>
+ <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!}
+ <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
+ </div>
+ </td>
+ </tr>
+ </#list>
+ <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
+ <tr>
+ <td width="1%" valign="top">
+ <input type="radio" name="shipping_method" value="Default" checked="checked"/>
+ </td>
+ <td valign="top">
+ <div>${uiLabelMap.OrderUseDefault}.</div>
+ </td>
+ </tr>
+ </#if>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td colspan="2">
+ <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <input type="radio" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/>
+ </td>
+ <td valign="top">
+ <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type="radio" name="may_split" value="true"/>
+ </td>
+ <td valign="top">
+ <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <#else/>
+ <input type="hidden" name="shipping_method" value="NO_SHIPPING@_NA_"/>
+ <input type="hidden" name="may_split" value="false"/>
+ <input type="hidden" name="is_gift" value="false"/>
+ </#if>
+ <tr>
+ <td colspan="2">
+ <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <textarea cols="30" rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
+ </td>
+ </tr>
+ <#if shipping == true>
+ <#if productStore.showCheckoutGiftOptions! != "N" && giftEnable! != "N">
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td colspan="2">
+ <div>
+ <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span>
+ <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"><span>${uiLabelMap.CommonYes}</span>
+ <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"><span>${uiLabelMap.CommonNo}</span>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td colspan="2">
+ <h2>${uiLabelMap.OrderGiftMessage}</h2>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <textarea cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
+ </td>
+ </tr>
+ <#else/>
+ <input type="hidden" name="is_gift" value="false"/>
+ </#if>
+ </#if>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td colspan="2">
+ <h2>${uiLabelMap.PartyEmailAddresses}</h2>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
+ <div>
+ <b>
+ <#list emailList as email>
+ ${email.infoString!}<#if email_has_next>,</#if>
+ </#list>
+ </b>
+ </div>
+ <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink??>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr"
+ <#e...@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
+ <br />
+ <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
+ <input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()!}"/>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ </td>
+ <td bgcolor="white" width="1"> </td>
+ <td height="100%">
+ <#-- Payment Method Selection -->
+
+ <div class="screenlet" style="height: 100%;">
+ <div class="screenlet-title-bar">
+ <div class="h3">3)${uiLabelMap.OrderHowShallYouPay}?</div>
+ </div>
+ <div class="screenlet-body" style="height: 100%;">
+ <table width="100%" cellpadding="1" cellspacing="0" border="0">
+ <tr>
+ <td colspan="2">
+ <span>${uiLabelMap.CommonAdd}:</span>
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'NC', '');" class="buttontext">${uiLabelMap.AccountingCreditCard}</a>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'NE', '');" class="buttontext">${uiLabelMap.AccountingEFTAccount}</a>
+ </#if>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td colspan="2" align="center">
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'SP', '');" class="buttontext">${uiLabelMap.AccountingSplitPayment}</a>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.OrderMoneyOrder}</span>
+ </td>
+ </tr>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_COD??>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.OrderCOD}</span>
+ </td>
+ </tr>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.AccountingPayWithWorldPay}</span>
+ </td>
+ </tr>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.AccountingPayWithPayPal}</span>
+ </td>
+ </tr>
+ </#if>
+ <tr><td colspan="2"><hr /></td></tr>
+
+ <#-- financial accounts -->
+ <#list finAccounts as finAccount>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.AccountingFinAccount} #${finAccount.finAccountId}</span>
+ </td>
+ </tr>
+ </#list>
+
+ <#if !paymentMethodList?has_content>
+ <#if (!finAccounts?has_content)>
+ <tr>
+ <td colspan="2">
+ <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
+ </td>
+ </tr>
+ </#if>
+ <#else>
+ <#list paymentMethodList as paymentMethod>
+ <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
+ ${uiLabelMap.OrderCardSecurityCode} <input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
+ </td>
+ </tr>
+ </#if>
+ <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
+ <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}</span>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
+ </td>
+ </tr>
+ </#if>
+ <#elseif paymentMethod.paymentMethodTypeId == "GIFT_CARD">
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
+ <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>
+
+ <#if giftCard?has_content && giftCard.cardNumber?has_content>
+ <#assign giftCardNumber = "">
+ <#assign pcardNumber = giftCard.cardNumber>
+ <#if pcardNumber?has_content>
+ <#assign psize = pcardNumber?length - 4>
+ <#if 0 < psize>
+ <#list 0 .. psize-1 as foo>
+ <#assign giftCardNumber = giftCardNumber + "*">
+ </#list>
+ <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]>
+ <#else>
+ <#assign giftCardNumber = pcardNumber>
+ </#if>
+ </#if>
+ </#if>
+
+ <tr>
+ <td width="1%">
+ <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.AccountingGift}: ${giftCardNumber}</span>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
+ <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
+ </td>
+ </tr>
+ </#if>
+ </#if>
+ </#list>
+ </#if>
+
+ <#-- special billing account functionality to allow use w/ a payment method -->
+ <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??>
+ <#if billingAccountList?has_content>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td width="1%">
+ <select name="billingAccountId">
+ <option value=""></option>
+ <#list billingAccountList as billingAccount>
+ <#assign availableAmount = billingAccount.accountBalance?double>
+ <#assign accountLimit = billingAccount.accountLimit?double>
+ <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>
+ </tr>
+ <tr>
+ <td width="1%" align="right">
+ <input type="text" size="5" name="billingAccountAmount" value=""/>
+ </td>
+ <td width="50%">
+ ${uiLabelMap.OrderBillUpTo}
+ </td>
+ </tr>
+ </#if>
+ </#if>
+ <#-- end of special billing account functionality -->
+
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td width="1%">
+ <input type="checkbox" name="addGiftCard" value="Y"/>
+ </td>
+ <td width="50%">
+ <span>${uiLabelMap.AccountingUseGiftCardNotOnFile}</span>
+ </td>
+ </tr>
+ <tr>
+ <td width="1%">
+ <div>${uiLabelMap.AccountingNumber}</div>
+ </td>
+ <td width="50%">
+ <input type="text" size="15" name="giftCardNumber" value="${(requestParameters.giftCardNumber)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
+ </td>
+ </tr>
+ <#if shoppingCart.isPinRequiredForGC(delegator)>
+ <tr>
+ <td width="1%">
+ <div>${uiLabelMap.AccountingPIN}</div>
+ </td>
+ <td width="50%">
+ <input type="text" size="10" name="giftCardPin" value="${(requestParameters.giftCardPin)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td width="1%">
+ <div>${uiLabelMap.AccountingAmount}</div>
+ </td>
+ <td width="50%">
+ <input type="text" size="6" name="giftCardAmount" value="${(requestParameters.giftCardAmount)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
+ </td>
+ </tr>
+ </#if>
+ </table>
+ </div>
+ </div>
+ <#-- End Payment Method Selection -->
+ </td>
+ </tr>
+ </table>
+</form>
+
+<table width="100%">
+ <tr valign="top">
+ <td>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
+ </td>
+ <td align="right">
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" class="buttontextbig">${uiLabelMap.OrderContinueToFinalOrderReview}</a>
+ </td>
+ </tr>
+</table>
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,268 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+<!-- TODO : Need formatting -->
+<script type="text/javascript">
+//<![CDATA[
+function submitForm(form, mode, value) {
+ if (mode == "DN") {
+ // done action; checkout
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "CS") {
+ // continue shopping
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NC") {
+ // new credit card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "EC") {
+ // edit credit card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "GC") {
+ // edit gift card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NE") {
+ // new eft account
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "EE") {
+ // edit eft account
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ }else if(mode = "EG")
+ //edit gift card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+}
+//]]>
+$(document).ready(function(){
+var issuerId = "";
+ if ($('#checkOutPaymentId_IDEAL').attr('checked') == true) {
+ $('#issuers').show();
+ issuerId = $('#issuer').val();
+ $('#issuerId').val(issuerId);
+ } else {
+ $('#issuers').hide();
+ $('#issuerId').val('');
+ }
+ $('input:radio').click(function(){
+ if ($(this).val() == "EXT_IDEAL") {
+ $('#issuers').show();
+ issuerId = $('#issuer').val();
+ $('#issuerId').val(issuerId);
+ } else {
+ $('#issuers').hide();
+ $('#issuerId').val('');
+ }
+ });
+ $('#issuer').change(function(){
+ issuerId = $(this).val();
+ $('#issuerId').val(issuerId);
+ });
+});
+</script>
+
+
+<#assign cart = shoppingCart! />
+
+<form method="post" id="checkoutInfoForm" action="">
+ <fieldset>
+ <input type="hidden" name="checkoutpage" value="payment" />
+ <input type="hidden" name="BACK_PAGE" value="checkoutoptions" />
+ <input type="hidden" name="issuerId" id="issuerId" value="" />
+
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>3)${uiLabelMap.OrderHowShallYouPay}?</h3>
+ </div>
+ <div class="screenlet-body inline">
+ <#-- Payment Method Selection -->
+ <div>
+ <label>${uiLabelMap.CommonAdd}:</label>
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'NC', '');" class="button">${uiLabelMap.AccountingCreditCard}</a>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'NE', '');" class="button">${uiLabelMap.AccountingEFTAccount}</a>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
+ </div>
+ <div>
+ <input type="radio" id="checkOutPaymentId_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPaymentId_OFFLINE">${uiLabelMap.OrderMoneyOrder}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_COD??>
+ <div>
+ <input type="radio" id="checkOutPaymentId_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPaymentId_COD">${uiLabelMap.OrderCOD}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??>
+ <div>
+ <input type="radio" id="checkOutPaymentId_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPaymentId_WORLDPAY">${uiLabelMap.AccountingPayWithWorldPay}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
+ <div>
+ <input type="radio" id="checkOutPaymentId_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPaymentId_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_IDEAL??>
+ <div>
+ <input type="radio" id="checkOutPaymentId_IDEAL" name="checkOutPaymentId" value="EXT_IDEAL" <#if "EXT_IDEAL" == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPaymentId_IDEAL">${uiLabelMap.AccountingPayWithiDEAL}</label>
+ </div>
+
+ <div id="issuers">
+ <div><label >${uiLabelMap.AccountingBank}</label></div>
+ <select name="issuer" id="issuer">
+ <#if issuerList?has_content>
+ <#list issuerList as issuer>
+ <option value="${issuer.getIssuerID()}" >${issuer.getIssuerName()}</option>
+ </#list>
+ </#if>
+ </select>
+ </div>
+ </#if>
+ <#if !paymentMethodList?has_content>
+ <div>
+ <strong>${uiLabelMap.AccountingNoPaymentMethods}.</strong>
+ </div>
+ <#else>
+ <#list paymentMethodList as paymentMethod>
+ <#if paymentMethod.paymentMethodTypeId == "GIFT_CARD">
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
+ <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false) />
+
+ <#if giftCard?has_content && giftCard.cardNumber?has_content>
+ <#assign giftCardNumber = "" />
+ <#assign pcardNumber = giftCard.cardNumber />
+ <#if pcardNumber?has_content>
+ <#assign psize = pcardNumber?length - 4 />
+ <#if 0 < psize>
+ <#list 0 .. psize-1 as foo>
+ <#assign giftCardNumber = giftCardNumber + "*" />
+ </#list>
+ <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3] />
+ <#else>
+ <#assign giftCardNumber = pcardNumber />
+ </#if>
+ </#if>
+ </#if>
+
+ <div>
+ <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
+ <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingGift}:${giftCardNumber}</label>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EG', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
+ <strong>${uiLabelMap.OrderBillUpTo}:</strong> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>" />
+ </div>
+ </#if>
+ <#elseif paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false) />
+ <div>
+ <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
+ <label for="checkOutPayment_${paymentMethod.paymentMethodId}">CC:${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EC', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
+ <label for="amount_${paymentMethod.paymentMethodId}"><strong>${uiLabelMap.OrderBillUpTo}:</strong></label><input type="text" size="5" class="inputBox" id="amount_${paymentMethod.paymentMethodId}" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>" />
+ </div>
+ </#if>
+ <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
+ <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) />
+ <div>
+ <input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label>
+ <#if paymentMethod.description?has_content><p>(${paymentMethod.description})</p></#if>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EE', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
+ </div>
+ </#if>
+ </#if>
+ </#list>
+ </#if>
+
+ <#-- special billing account functionality to allow use w/ a payment method -->
+ <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??>
+ <#if billingAccountList?has_content>
+ <div>
+ <select name="billingAccountId" id="billingAccountId">
+ <option value=""></option>
+ <#list billingAccountList as billingAccount>
+ <#assign availableAmount = billingAccount.accountBalance>
+ <#assign accountLimit = billingAccount.accountLimit>
+ <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] ${uiLabelMap.EcommerceAvailable} <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> ${uiLabelMap.EcommerceLimit} <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
+ </#list>
+ </select>
+ <label for="billingAccountId">${uiLabelMap.FormFieldTitle_billingAccountId}</label>
+ </div>
+ <div>
+ <input type="text" size="5" id="billingAccountAmount" name="billingAccountAmount" value="" />
+ <label for="billingAccountAmount">${uiLabelMap.OrderBillUpTo}</label>
+ </div>
+ </#if>
+ </#if>
+ <#-- end of special billing account functionality -->
+
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
+ <div>
+ <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" />
+ <input type="hidden" name="singleUseGiftCard" value="Y" />
+ <label for="addGiftCard">${uiLabelMap.AccountingUseGiftCardNotOnFile}</label>
+ </div>
+ <div>
+ <label for="giftCardNumber">${uiLabelMap.AccountingNumber}</label>
+ <input type="text" size="15" class="inputBox" id="giftCardNumber" name="giftCardNumber" value="${(requestParameters.giftCardNumber)!}" onfocus="document.getElementById('addGiftCard').checked=true;" />
+ </div>
+ <#if cart.isPinRequiredForGC(delegator)>
+ <div>
+ <label for="giftCardPin">${uiLabelMap.AccountingPIN}</label>
+ <input type="text" size="10" class="inputBox" id="giftCardPin" name="giftCardPin" value="${(requestParameters.giftCardPin)!}" onfocus="document.getElementById('addGiftCard').checked=true;" />
+ </div>
+ </#if>
+ <div>
+ <label for="giftCardAmount">${uiLabelMap.AccountingAmount}</label>
+ <input type="text" size="6" class="inputBox" id="giftCardAmount" name="giftCardAmount" value="${(requestParameters.giftCardAmount)!}" onfocus="document.getElementById('addGiftCard').checked=true;" />
+ </div>
+ </#if>
+
+ <div>
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseCreditCard}</a></#if>
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseGiftCard}</a></#if>
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseEFTAccount}</a></#if>
+ </div>
+ <#-- End Payment Method Selection -->
+ </div>
+ </div>
+ </fieldset>
+</form>
+
+<div>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'CS', '');" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
+ <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'DN', '');" class="buttontextbig">${uiLabelMap.OrderContinueToFinalOrderReview}</a>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,149 @@
+<#--
+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 submitForm(form, mode, value) {
+ if (mode == "DN") {
+ // done action; checkout
+ 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 == "EA") {
+ // edit address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ }
+}
+
+function toggleBillingAccount(box) {
+ var amountName = box.value + "_amount";
+ box.checked = true;
+ box.form.elements[amountName].disabled = false;
+
+ for (var i = 0; i < box.form.elements[box.name].length; i++) {
+ if (!box.form.elements[box.name][i].checked) {
+ box.form.elements[box.form.elements[box.name][i].value + "_amount"].disabled = true;
+ }
+ }
+}
+
+//]]>
+</script>
+<#assign cart = shoppingCart!/>
+<form method="post" name="checkoutInfoForm" style="margin:0;">
+ <fieldset>
+ <input type="hidden" name="checkoutpage" value="shippingaddress"/>
+ <div class="screenlet" style="height: 100%;">
+ <div class="screenlet-title-bar">
+ <div class="h3">1) ${uiLabelMap.OrderWhereShallWeShipIt}?</div>
+ </div>
+ <div class="screenlet-body" style="height: 100%;">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td colspan="2">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitShipment}</a>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
+ <#if (cart.getShipGroupSize() > 1)>
+ <div style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}</div>
+ </#if>
+ </td>
+ </tr>
+ <#if shippingContactMechList?has_content>
+ <tr><td colspan="2"><hr /></td></tr>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/>
+ <tr>
+ <td valign="top" width="1%" nowrap="nowrap">
+ <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked="checked"</#if> />
+ </td>
+ <td valign="top" width="99%" nowrap="nowrap">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</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>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ </#list>
+ </#if>
+ </table>
+ <div> ${uiLabelMap.AccountingAgreementInformation}</div>
+ <table>
+ <#if agreements??>
+ <#if agreements.size()!=1>
+ <tr>
+ <td> </td>
+ <td align='left' valign='top' nowrap="nowrap">
+ <div class='tableheadtext'>
+ ${uiLabelMap.OrderSelectAgreement}
+ </div>
+ </td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext' valign='top'>
+ <select name="agreementId">
+ <#list agreements as agreement>
+ <option value='${agreement.agreementId!}'>${agreement.agreementId} - ${agreement.description!}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <#else>
+ <#list agreements as agreement>
+ <input type="radio" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description!} will be used for this order.
+ </#list>
+ </#if>
+ </#if>
+ </table>
+ <br />
+ <#-- Party Tax Info -->
+ <div> ${uiLabelMap.PartyTaxIdentification}</div>
+ ${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
+ </div>
+ </div>
+ </fieldset>
+</form>
+
+<table width="100%">
+ <tr valign="top">
+ <td>
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
+ </td>
+ <td align="right">
+ <a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" class="buttontextbig">${uiLabelMap.CommonNext}</a>
+ </td>
+ </tr>
+</table>
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,42 @@
+<#--
+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 partyTaxAuthInfoAndDetailList??>
+ <#list partyTaxAuthInfoAndDetailList as partyTaxAuthInfoAndDetail>
+ <div>
+ <a href="<@o...@ofbizUrl>" class="buttontext">X</a>
+ [${partyTaxAuthInfoAndDetail.geoCode}] ${partyTaxAuthInfoAndDetail.geoName} (${partyTaxAuthInfoAndDetail.groupName!}): ${uiLabelMap.PartyTaxId} [${partyTaxAuthInfoAndDetail.partyTaxId?default("N/A")}], ${uiLabelMap.PartyTaxIsExempt} [${partyTaxAuthInfoAndDetail.isExempt?default("N")}]
+ </div>
+ </#list>
+ <div>
+ <span>${uiLabelMap.PartyTaxAddInfo}:</span>
+ <select name="taxAuthPartyGeoIds">
+ <option></option>
+ <#list taxAuthorityAndDetailList as taxAuthorityAndDetail>
+ <option value="${taxAuthorityAndDetail.taxAuthPartyId}::${taxAuthorityAndDetail.taxAuthGeoId}">[${taxAuthorityAndDetail.geoCode}] ${taxAuthorityAndDetail.geoName} (${taxAuthorityAndDetail.groupName!})</option>
+ </#list>
+ </select>
+ <span>${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/>
+
+ <#if productStore.showTaxIsExempt?default("Y") == "Y">
+ <span>${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/>
+ <#else/>
+ <input type="hidden" name="isExempt" value="N"/>
+ </#if>
+ </div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain