svn commit: r1759144 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: ashish
Date: Sun Sep 4 06:28:52 2016 New Revision: 1759144 URL: http://svn.apache.org/viewvc?rev=1759144&view=rev Log: Applied patch from jira issue - OFBIZ-8066 - Clean up commented out code in Free Marker Template for Product. Thanks Aman for the contribution. Modified: ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl ofbiz/trunk/applications/product/template/facility/PickMoveStockSimple.fo.ftl ofbiz/trunk/applications/product/template/facility/Picklist.fo.ftl ofbiz/trunk/applications/product/template/imagemanagement/ImageGallery.ftl ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl ofbiz/trunk/applications/product/template/shipment/EditShipmentPackages.ftl ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl Modified: ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl (original) +++ ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl Sun Sep 4 06:28:52 2016 @@ -56,18 +56,6 @@ under the License. <#if hasExpired><#assign class="alert"></#if> <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)!}"/> - <#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created - <select name="prodCatalogCategoryTypeId" size="1"> - <#if (prodCatalogCategory.prodCatalogCategoryTypeId)??> - <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"><#if curProdCatalogCategoryType??>${(curProdCatalogCategoryType.description)!}<#else> [${(prodCatalogCategory.prodCatalogCategoryTypeId)}]</#if></option> - <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"></option> - <#else> - <option value=""> </option> - </#if> - <#list prodCatalogCategoryTypes as prodCatalogCategoryType> - <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)!}">${(prodCatalogCategoryType.get("description",locale))!}</option> - </#list> - </select> --> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> </form> </td> Modified: ofbiz/trunk/applications/product/template/facility/PickMoveStockSimple.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PickMoveStockSimple.fo.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/facility/PickMoveStockSimple.fo.ftl (original) +++ ofbiz/trunk/applications/product/template/facility/PickMoveStockSimple.fo.ftl Sun Sep 4 06:28:52 2016 @@ -56,7 +56,6 @@ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))!> <#assign totalQuantity = moveByOisgirInfo.totalQuantity> <fo:table-row> - <#-- <tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> --> <fo:table-cell> <fo:block>${product.productId}</fo:block> </fo:table-cell> @@ -87,7 +86,6 @@ <fo:table-cell> <fo:block>${targetProductFacilityLocation.moveQuantity!}</fo:block> </fo:table-cell> - <#-- </tr> --> </fo:table-row> <#assign rowCount = rowCount + 1> <#-- toggle the row color --> @@ -101,7 +99,6 @@ <#assign targetProductFacilityLocation = moveByPflInfo.targetProductFacilityLocation> <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))!> <#assign totalQuantity = moveByPflInfo.totalQuantity> - <#-- <tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> --> <fo:table-row> <fo:table-cell> <fo:block>${product.productId}</fo:block> @@ -134,7 +131,6 @@ <fo:block>${targetProductFacilityLocation.moveQuantity!}</fo:block> </fo:table-cell> </fo:table-row> - <#-- </tr> --> <#assign rowCount = rowCount + 1> </#list> </#if> Modified: ofbiz/trunk/applications/product/template/facility/Picklist.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/Picklist.fo.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/facility/Picklist.fo.ftl (original) +++ ofbiz/trunk/applications/product/template/facility/Picklist.fo.ftl Sun Sep 4 06:28:52 2016 @@ -245,7 +245,7 @@ under the License. <#assign orderItemShipGrpInvRes = picklistItemInfo.orderItemShipGrpInvRes!> <fo:table-row> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block><#--${picklistItem.orderId}:${picklistItem.shipGroupSeqId}:-->${picklistItem.orderItemSeqId}</fo:block> + <fo:block>${picklistItem.orderItemSeqId}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> <fo:block> Modified: ofbiz/trunk/applications/product/template/imagemanagement/ImageGallery.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/imagemanagement/ImageGallery.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/imagemanagement/ImageGallery.ftl (original) +++ ofbiz/trunk/applications/product/template/imagemanagement/ImageGallery.ftl Sun Sep 4 06:28:52 2016 @@ -23,8 +23,6 @@ under the License. <#if product?has_content> <h1><b>${product.productId}</b></h1> </#if> - <#-- <#assign productName = productTextData > - <#assign seoUrl = productName.replaceAll(" ", "-") > --> <#assign alt_row = false> <#list productImageList as productImage> <#if imageIndex < 5> @@ -32,11 +30,9 @@ under the License. <table> <tbody> <tr valign="middle"> - <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@ofbizContentUrl>${(contentDataResourceView.drObjectInfo)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> --> <td align="center"><a href="<@ofbizContentUrl>${(productImage.productImage)!}</@ofbizContentUrl>" target="_blank"><img src="<@ofbizContentUrl>${(productImage.productImageThumb)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> </tr> <tr valign="middle"> - <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> --> <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productImage.contentId}&dataResourceId=${productImage.dataResourceId}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> </tr> <br/> @@ -51,11 +47,9 @@ under the License. <table> <tbody> <tr valign="middle"> - <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@ofbizContentUrl>${(contentDataResourceView.drObjectInfo)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> --> <td align="center"><a href="<@ofbizContentUrl>${(productImage.productImage)!}</@ofbizContentUrl>" target="_blank"><img src="<@ofbizContentUrl>${(productImage.productImageThumb)!}</@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> </tr> <tr valign="middle"> - <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> --> <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productImage.contentId}&dataResourceId=${productImage.dataResourceId}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> </tr> <br/> Modified: ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl Sun Sep 4 06:28:52 2016 @@ -199,7 +199,6 @@ under the License. <td width="6%"> </td> <td width="74%"> <input type="text" name="datetimeReceived" size="24" value="${nowTimestamp}" /> - <#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> --> </td> </tr> Modified: ofbiz/trunk/applications/product/template/shipment/EditShipmentPackages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/EditShipmentPackages.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/shipment/EditShipmentPackages.ftl (original) +++ ofbiz/trunk/applications/product/template/shipment/EditShipmentPackages.ftl Sun Sep 4 06:28:52 2016 @@ -154,50 +154,9 @@ under the License. <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentPackageRouteSeg.shipmentRouteSegmentId}"/> </form> </#list> - <#-- - <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <form action="<@ofbizUrl>createShipmentPackageRouteSeg</@ofbizUrl>" name="createShipmentPackageRouteSegForm${shipmentPackageData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> - <td> </td> - <td> - <div><span class="label">${uiLabelMap.ProductAddRouteSegmentInfo}</span> - <select name="shipmentRouteSegmentId"> - <#list shipmentRouteSegments as shipmentRouteSegment> - <option>${shipmentRouteSegment.shipmentRouteSegmentId}</option> - </#list> - </select> - </div> - </td> - <td><span class="label">Track ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode"/></td> - <td><span class="label">Box ${uiLabelMap.CommonNbr}</span><input type="text" size="5" name="boxNumber"/></td> - <td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentPackageData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> - <td> </td> - </form> - </tr> - --> <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> - <#-- - <form action="<@ofbizUrl>createShipmentPackage</@ofbizUrl>" name="createShipmentPackageForm"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <tr> - <td><span class="label">${uiLabelMap.ProductNewPackage}</span></td> - <td> </td> - <td><span class="label">${uiLabelMap.ProductWeight}</span> <input type="text" size="5" name="weight"/></td> - <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> - <select name="weightUomId"> - <#list weightUoms as weightUomOption> - <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option> - </#list> - </select> - </td> - <td><a href="javascript:document.createShipmentPackageForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a></td> - <td> </td> - </tr> - </form> - --> </table> </div> </div> Modified: ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl Sun Sep 4 06:28:52 2016 @@ -340,28 +340,6 @@ under the License. <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentPackageRouteSeg.shipmentRouteSegmentId}"/> </form> </#list> - <#-- - <tr> - <form action="<@ofbizUrl>createRouteSegmentShipmentPackage</@ofbizUrl>" name="createShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> - <td> </td> - <td> - <div>${uiLabelMap.ProductAddPackageInfo} : - <select name="shipmentPackageSeqId"> - <#list shipmentPackages as shipmentPackage> - <option>${shipmentPackage.shipmentPackageSeqId}</option> - </#list> - </select> - </div> - </td> - <td><span class="label">Track#:</span><input type="text" size="22" name="trackingCode"/></td> - <td><span class="label">Box#:</span><input type="text" size="5" name="boxNumber"/></td> - <td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> - <td> </td> - </form> - </tr> - --> <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> Modified: ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl?rev=1759144&r1=1759143&r2=1759144&view=diff ============================================================================== --- ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl Sun Sep 4 06:28:52 2016 @@ -273,19 +273,11 @@ under the License. <#if (itemInfos?has_content)> <#assign rowKey = 1> <#list itemInfos as itemInfo> - <#-- <#list itemInfos as orderItem> --> <#assign orderItem = itemInfo.orderItem/> <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)!> <#assign orderItemQuantity = itemInfo.quantity/> <#assign orderProduct = orderItem.getRelatedOne("Product", false)!/> <#assign product = Static["org.apache.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)!/> - <#-- - <#if orderItem.cancelQuantity?exists> - <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity> - <#else> - <#assign orderItemQuantity = orderItem.quantity> - </#if> - --> <#assign inputQty = orderItemQuantity - packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId)> <tr> <td><input type="checkbox" name="sel_${rowKey}" value="Y" <#if (inputQty >0)>checked=""</#if>/></td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |