svn commit: r1857121 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ecommerce/template/catalog/ProductDetail.ftl ecommerce/webapp/ecommerce/css/custom.css

[Deepak Dixit-5]

Author: deepak
Date: Mon Apr  8 16:53:30 2019
New Revision: 1857121

URL: http://svn.apache.org/viewvc?rev=1857121&view=rev
Log:
Applied fix from trunk for revision: 1857120
===

Improved: Amount field is editable at Product Detail Page
(OFBIZ-10663)
Added mising css and js code to show/hide the amount field based on Product.requireAmount field.
Thanks  Dikpal Kanungo for reporting the issue.

Modified:
    ofbiz/ofbiz-plugins/branches/release18.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/catalog/ProductDetail.ftl
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/css/custom.css

Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  8 16:53:30 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
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/catalog/ProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/catalog/ProductDetail.ftl?rev=1857121&r1=1857120&r2=1857121&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/catalog/ProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/catalog/ProductDetail.ftl Mon Apr  8 16:53:30 2019
@@ -124,10 +124,12 @@ ${virtualVariantJavaScript!}
     function toggleAmt(toggle) {
         if (toggle == 'Y') {
             changeObjectVisibility("add_amount", "visible");
+            document.getElementById("add_amount").style.height = "auto";
         }
 
         if (toggle == 'N') {
             changeObjectVisibility("add_amount", "hidden");
+            document.getElementById("add_amount").style.height = "0px";
         }
     }
 
@@ -669,7 +671,6 @@ $(function(){
         </#if>
         <#-- Variant Selection -->
         <div class="form-group">
-        <label>${uiLabelMap.CommonAmount}:</label>
         <#if "Y" == product.isVirtual!?upper_case>
           <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
             <#list featureLists as featureList>
@@ -769,6 +770,7 @@ $(function(){
               <#assign hiddenStyle = "hidden"/>
             </#if>
             <div id="add_amount" class="${hiddenStyle} form-group">
+              <label>${uiLabelMap.CommonAmount}:</label>
               <input type="text" class="form-control" name="add_amount" value=""/>
             </div>
             <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/css/custom.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/css/custom.css?rev=1857121&r1=1857120&r2=1857121&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/css/custom.css (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/css/custom.css Mon Apr  8 16:53:30 2019
@@ -113,4 +113,9 @@ label.required:after {
 }
 button.jGrowl-close {
     float: right;
+}
+
+.hidden {
+    height: 0;
+    visibility: hidden;
 }
\ No newline at end of file