Author: surajk
Date: Sat May 25 05:08:07 2019
New Revision: 1859908
URL: http://svn.apache.org/viewvc?rev=1859908&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/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAddSummary.ftl
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 25 05:08:07 2019
@@ -11,4 +11,4 @@
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
/ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl?rev=1859908&r1=1859907&r2=1859908&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
(original)
+++
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
Sat May 25 05:08:07 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/release17.12/ecommerce/template/order/QuickAddSummary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAddSummary.ftl?rev=1859908&r1=1859907&r2=1859908&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAddSummary.ftl
(original)
+++
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAddSummary.ftl
Sat May 25 05:08:07 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}
