svn commit: r1758023 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: ashish
Date: Sat Aug 27 13:08:18 2016 New Revision: 1758023 URL: http://svn.apache.org/viewvc?rev=1758023&view=rev Log: Applied patch from jira issue - OFBIZ-8035 - Clean up commented out code in Free Marker Template for Order. Thanks Aman for the contribution. Modified: ofbiz/trunk/applications/order/template/entry/BillSettings.ftl ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl ofbiz/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl ofbiz/trunk/applications/order/template/entry/catalog/SideDeepCategory.ftl ofbiz/trunk/applications/order/template/order/FindOrders.ftl ofbiz/trunk/applications/order/template/order/OrderContactInfo.ftl ofbiz/trunk/applications/order/template/order/OrderList.ftl ofbiz/trunk/applications/order/template/order/OrderPaymentInfo.ftl ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/trunk/applications/order/template/return/QuickReturn.ftl Modified: ofbiz/trunk/applications/order/template/entry/BillSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/BillSettings.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/BillSettings.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/BillSettings.ftl Sat Aug 27 13:08:18 2016 @@ -347,13 +347,6 @@ function makeExpDate() { <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> Modified: ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl Sat Aug 27 13:08:18 2016 @@ -147,12 +147,6 @@ function submitForm(form, mode, value) { </#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> Modified: ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl Sat Aug 27 13:08:18 2016 @@ -683,7 +683,6 @@ ${setRequestAttribute("productValue", pr ${setRequestAttribute("optProductId", commonFeatureResultId)} ${setRequestAttribute("listIndex", commonFeatureResultId_index)} ${setRequestAttribute("formNamePrefix", "cfeatcssl")} - <#-- ${setRequestAttribute("targetRequestName", targetRequestName)} --> ${screens.render(productsummaryScreen)} </div> <#if commonFeatureResultId_has_next> Modified: ofbiz/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl Sat Aug 27 13:08:18 2016 @@ -268,7 +268,6 @@ ${virtualJavaScript!} </#if> </td> <td align="right" valign="top" width="100%"> - <#-- <h2>${productContentWrapper.get("PRODUCT_NAME", "html")!}</h2> --> <#assign inStock = true> <#if product.isVirtual!?upper_case == "Y"> <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content> @@ -353,39 +352,6 @@ ${virtualJavaScript!} <script language="JavaScript" type="text/javascript">eval("list"+ "${inlineCounter}" + "${featureOrderFirst}" + "()");</script> </#if> - <#-- Swatches (virtual products only) . For now commented out, before fixing a bug - <#if variantSample?? && 0 < variantSample.size()> - <#assign imageKeys = variantSample.keySet()> - <#assign imageMap = variantSample> - <p> </p> - <table cellspacing="0" cellpadding="0"> - <tr> - <#assign maxIndex = 7> - <#assign indexer = 0> - <#list imageKeys as key> - <#assign swatchProduct = imageMap.get(key)> - <#if swatchProduct?has_content && indexer < maxIndex> - <#assign imageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request, "url")!> - <#if !imageUrl?string?has_content> - <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL", "url")!> - </#if> - <#if !imageUrl?string?has_content> - <#assign imageUrl = "/images/defaultImage.jpg"> - </#if> - <td align="center" valign="bottom"> - <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix!}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> - <br /> - <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> - </td> - </#if> - <#assign indexer = indexer + 1> - </#list> - <#if (indexer > maxIndex)> - <div><b>${uiLabelMap.ProductMoreOptions}</b></div> - </#if> - </tr> - </table> - </#if> --> </td> </tr> </table> Modified: ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl Sat Aug 27 13:08:18 2016 @@ -534,7 +534,6 @@ ${virtualJavaScript!} <@htmlTemplate.renderDateTimeField name="reservStart" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="startDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <@htmlTemplate.renderDateTimeField name="reservEnd" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="endDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <tr> - <#--td nowrap="nowrap" align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td--> <#if (product.reservMaxPersons!)?is_number> <td nowrap="nowrap" align="right">Number of persons</td> <td><input type="text" size="4" name="reservPersons" value="2"/></td> Modified: 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=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/SideDeepCategory.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/SideDeepCategory.ftl Sat Aug 27 13:08:18 2016 @@ -22,10 +22,6 @@ under the License. <#-- 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> Modified: ofbiz/trunk/applications/order/template/order/FindOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/FindOrders.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/FindOrders.ftl (original) +++ ofbiz/trunk/applications/order/template/order/FindOrders.ftl Sat Aug 27 13:08:18 2016 @@ -651,28 +651,6 @@ document.lookuporder.orderId.focus(); ${uiLabelMap.CommonNA} </#if> </div> - <#-- - <div> - <#if placingParty?has_content> - <#assign partyId = placingParty.partyId> - <#if placingParty.getEntityName() == "Person"> - <#if placingParty.lastName??> - ${placingParty.lastName}<#if placingParty.firstName??>, ${placingParty.firstName}</#if> - <#else> - ${uiLabelMap.CommonNA} - </#if> - <#else> - <#if placingParty.groupName??> - ${placingParty.groupName} - <#else> - ${uiLabelMap.CommonNA} - </#if> - </#if> - <#else> - ${uiLabelMap.CommonNA} - </#if> - </div> - --> </td> <td align="right">${orh.hasSurvey()?string.number}</td> <td align="right">${orh.getTotalOrderItemsQuantity()?string.number}</td> Modified: ofbiz/trunk/applications/order/template/order/OrderContactInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderContactInfo.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderContactInfo.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderContactInfo.ftl Sat Aug 27 13:08:18 2016 @@ -127,7 +127,6 @@ under the License. <div> ${telecomNumber.countryCode!} <#if telecomNumber.areaCode??>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber} - <#--<#if partyContactMech.extension??>ext ${partyContactMech.extension}</#if>--> <#if !telecomNumber.countryCode?? || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1"> <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a> <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a> Modified: ofbiz/trunk/applications/order/template/order/OrderList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderList.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderList.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderList.ftl Sat Aug 27 13:08:18 2016 @@ -93,7 +93,6 @@ under the License. <label><input type="checkbox" name="viewapproved" value="Y" class="statuscheck" <#if state.hasStatus('viewapproved')>checked="checked"</#if> />${uiLabelMap.CommonApproved}</label> <label><input type="checkbox" name="viewhold" value="Y" class="statuscheck" <#if state.hasStatus('viewhold')>checked="checked"</#if> />${uiLabelMap.CommonHeld}</label> <label><input type="checkbox" name="viewcompleted" value="Y" class="statuscheck" <#if state.hasStatus('viewcompleted')>checked="checked"</#if> />${uiLabelMap.CommonCompleted}</label> - <#--input type="checkbox" name="viewsent" value="Y" <#if state.hasStatus('viewsent')>checked="checked"</#if> />${uiLabelMap.CommonSent}--> <label><input type="checkbox" name="viewrejected" value="Y" class="statuscheck" <#if state.hasStatus('viewrejected')>checked="checked"</#if> />${uiLabelMap.CommonRejected}</label> <label><input type="checkbox" name="viewcancelled" value="Y" class="statuscheck" <#if state.hasStatus('viewcancelled')>checked="checked"</#if> />${uiLabelMap.CommonCancelled}</label> </div> @@ -194,7 +193,6 @@ under the License. <#if billToParty?has_content> <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> <#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/> - <#-- <#assign billTo = Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)!> --> <#else> <#assign billTo = ''/> </#if> Modified: ofbiz/trunk/applications/order/template/order/OrderPaymentInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderPaymentInfo.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderPaymentInfo.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderPaymentInfo.ftl Sat Aug 27 13:08:18 2016 @@ -273,10 +273,6 @@ under the License. </#if> <br /> [<#if oppStatusItem??>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] </div> - <#-- - <div><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())!}</div> - <div> <#if orderPaymentPreference.authRefNum??>(${uiLabelMap.OrderReference}: ${orderPaymentPreference.authRefNum})</#if></div> - --> </td> <#else> <td align="right" width="60%"> Modified: ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl Sat Aug 27 13:08:18 2016 @@ -169,9 +169,6 @@ under the License. <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED"> <#if orderHeader.statusId != "ORDER_SENT" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED" && orderHeader.statusId != "ORDER_CANCELLED"> - <#-- - <li><a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCancelAllItems}</a></li> - --> <li><a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderEditItems}</a></li> <li> <form name="createOrderItemShipGroup" method="post" action="<@ofbizUrl>AddOrderItemShipGroup</@ofbizUrl>"> Modified: ofbiz/trunk/applications/order/template/return/QuickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/QuickReturn.ftl?rev=1758023&r1=1758022&r2=1758023&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/return/QuickReturn.ftl (original) +++ ofbiz/trunk/applications/order/template/return/QuickReturn.ftl Sat Aug 27 13:08:18 2016 @@ -89,7 +89,6 @@ under the License. <#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="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> </span> </label> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |