svn commit: r1859907 - in /ofbiz/ofbiz-plugins/branches/
Locked
 
|
Author: surajk
Date: Sat May 25 05:07:01 2019 New Revision: 1859907 URL: http://svn.apache.org/viewvc?rev=1859907&view=rev Log: Applied fix from trunk for revision: 1859906 === Fixed: Unable to find any product in Quick Add functionality. (OFBIZ-10978) Thanks Vivek Bisen for providing the patch, Pawan Verma and Jacques Le Roux for review. Modified: ofbiz/ofbiz-plugins/branches/release18.12/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl Propchange: ofbiz/ofbiz-plugins/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 25 05:07:01 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900 /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 -/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893 +/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906 Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl?rev=1859907&r1=1859906&r2=1859907&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl Sat May 25 05:07:01 2019 @@ -16,51 +16,54 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<div class="card m-3"> -<#if product??> - <div class="card-header"> - <strong> - ${product.productId} - </strong> - </div> - <div class="card-body"> - <div class="row"> - <div class="col-sm-10"> - <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" >${productContentWrapper.get("PRODUCT_NAME", "html")!}</a> - </div> - <div class="col-sm-10"> - <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> - ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/> - <#else> - - </#if> - </div> - <div class="col-sm-10"> - <#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> - </div> - <div class="col-sm-10"> - <#-- 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 "Y" == product.isVirtual?default("N")> - <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>">${uiLabelMap.OrderChooseVariations}...</a> - <#else> - <input type="text" size="5" class="form-control form-control-sm" name="quantity_${product.productId}" value=""/> - </#if> - </div> - </div> -<#else> - <div class="alert alert-light" role="alert">${uiLabelMap.ProductErrorProductNotFound}.</div> + +<#if productCategory?has_content> +<h2>${productCategory.categoryName!}</h2> +<form name="choosequickaddform" method="post" action="<@ofbizUrl>quickadd</@ofbizUrl>" style='margin: 0;'> + <select name='category_id'> + <option value='${productCategory.productCategoryId}'>${productCategory.categoryName!}</option> + <option value='${productCategory.productCategoryId}'>--</option> + <#list quickAddCats as quickAddCatalogId> + <#assign loopCategory = delegator.findOne("ProductCategory", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", quickAddCatalogId), true)> + <#if loopCategory?has_content> + <option value='${quickAddCatalogId}'>${loopCategory.categoryName!}</option> + </#if> +</#list> +</select> +<div><a href="javascript:document.choosequickaddform.submit()" class="buttontext">${uiLabelMap.ProductChooseQuickAddCategory}</a></div> +</form> +<#if productCategory.categoryImageUrl?? || productCategory.longDescription??> +<div> + <#if productCategory.categoryImageUrl??> + <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgLarge" alt="" /> </#if> +${productCategory.longDescription!} </div> -</div> \ No newline at end of file +</#if> +</#if> + +<#if productCategoryMembers?? && 0 < productCategoryMembers?size> +<form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform"> + <fieldset> + <input type='hidden' name='category_id' value='${categoryId}' /> + <div class="quickaddall"> + <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a> + </div> + <div class="quickaddtable"> + <#list productCategoryMembers as productCategoryMember> + <#assign product = productCategoryMember.getRelatedOne("Product", true)> + <p> + ${setRequestAttribute("optProductId", productCategoryMember.productId)} + ${screens.render(quickaddsummaryScreen)} + </p> + </#list> + </div> + <div class="quickaddall"> + <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a> + </div> + </fieldset> +</form> +<#else> +<label>${uiLabelMap.ProductNoProductsInThisCategory}.</label> +</#if> + Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl?rev=1859907&r1=1859906&r2=1859907&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl Sat May 25 05:07:01 2019 @@ -25,17 +25,17 @@ under the License. </div> <div class="card-body"> <div class="row"> - <div class="col-sm-10"> + <div class="col-sm-3"> <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" >${productContentWrapper.get("PRODUCT_NAME", "html")!}</a> </div> - <div class="col-sm-10"> + <div class="col-sm-3"> <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/> <#else> </#if> </div> - <div class="col-sm-10"> + <div class="col-sm-3"> <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> @@ -44,7 +44,7 @@ under the License. </div> </#if> </div> - <div class="col-sm-10"> + <div class="col-sm-3"> <#-- check to see if introductionDate hasn't passed yet --> <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> ${uiLabelMap.ProductNotYetAvailable} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |