This is an automated email from the ASF dual-hosted git repository.
akashjain pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5d011d3 Improvement: Quantity and Add to Cart button showing twice on
Compare Products page (OFBIZ-10665)
new 6013472 Merge branch 'trunk' of
https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
5d011d3 is described below
commit 5d011d3226a533974c05848bacd4ba45dc38f6cb
Author: akash <akash.j...@hotwaxsystems.com>
AuthorDate: Sat Feb 22 11:26:29 2020 +0530
Improvement: Quantity and Add to Cart button showing twice on Compare
Products page
(OFBIZ-10665)
Thanks, Ritesh Kumar and Dikpal Kanungo for your contribution.
---
.../template/entry/catalog/CompareProducts.ftl | 39 ----------------------
1 file changed, 39 deletions(-)
diff --git a/applications/order/template/entry/catalog/CompareProducts.ftl
b/applications/order/template/entry/catalog/CompareProducts.ftl
index 03f8d03..dbb0955 100644
--- a/applications/order/template/entry/catalog/CompareProducts.ftl
+++ b/applications/order/template/entry/catalog/CompareProducts.ftl
@@ -46,45 +46,6 @@ under the License.
<#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom}
</#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price
isoCode=price.currencyUsed/></span>
</#if>
</#if>
- <div class="productbuy">
- <#-- check to see if introductionDate hasn't passed yet -->
- <#if product.introductionDate?? &&
nowTimestamp.before(product.introductionDate)>
- <div style="color:
red;">${uiLabelMap.ProductNotYetAvailable}</div>
- <#-- check to see if salesDiscontinuationDate has passed -->
- <#elseif product.salesDiscontinuationDate?? &&
nowTimestamp.after(product.salesDiscontinuationDate)/>
- <div style="color:
red;">${uiLabelMap.ProductNoLongerAvailable}</div>
- <#-- check to see if it is a rental item; will enter parameters on the
detail screen-->
- <#elseif "ASSET_USAGE" == product.productTypeId!/>
- <a href="javascript:doGetViaParent('${productUrl}');"
class="buttontext">${uiLabelMap.OrderMakeBooking}...</a>
- <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!/>
- <a href="javascript:doGetViaParent('${productUrl}');"
class="buttontext">${uiLabelMap.OrderRent}...</a>
- <#-- check to see if it is an aggregated or configurable product; will
enter parameters on the detail screen-->
- <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" ==
product.productTypeId!/>
- <a href="javascript:doGetViaParent('${productUrl}');"
class="buttontext">${uiLabelMap.OrderConfigure}...</a>
- <#-- check to see if the product is a virtual product -->
- <#elseif product.isVirtual?? && "Y" == product.isVirtual/>
- <a href="javascript:doGetViaParent('${productUrl}');"
class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
- <#-- check to see if the product requires an amount -->
- <#elseif product.requireAmount?? && "Y" == product.requireAmount/>
- <a href="javascript:doGetViaParent('${productUrl}');"
class="buttontext">${uiLabelMap.OrderChooseAmount}...</a>
- <#else>
- <form method="post" action="<@ofbizUrl
secure="${request.isSecure()?string}">additem</@ofbizUrl>"
name="compareFormAdd${product_index}">
- <input type="hidden" name="add_product_id"
value="${product.productId}"/>
- <input type="text" size="5" name="quantity" value="1"/>
- <input type="hidden" name="clearSearch" value="N"/>
- </form>
- <a
href="javascript:doPostViaParent('compareFormAdd${product_index}');"
class="buttontext">${uiLabelMap.OrderAddToCart}</a>
-
- <#if prodCatMem?? && prodCatMem.quantity?? && 0.00 <
prodCatMem.quantity?double>
- <form method="post" action="<@ofbizUrl
secure="${request.isSecure()?string}">additem</@ofbizUrl>"
name="compareFormAddDefault${product_index}" style="margin: 0;">
- <input type="hidden" name="add_product_id"
value="${prodCatMem.productId!}"/>
- <input type="hidden" name="quantity"
value="${prodCatMem.quantity!}"/>
- <input type="hidden" name="clearSearch" value="N"/>
- </form>
- <a
href="javascript:doPostViaParent('compareFormAddDefault${product_index}');"
class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number})
${uiLabelMap.OrderToCart}</a>
- </#if>
- </#if>
- </div>
</td>
</#list>
</tr>
