[ofbiz-framework] branch release18.12 updated: Fixed: display/selection of unit of measure is broken (OFBIZ-11955)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new d670f36  Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
d670f36 is described below

commit d670f3671301825f3bdc0bab7ae3592e0c9d3519
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Aug 31 10:44:46 2020 +0200

    Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
   
    Fixes UOM dropdown for products like WG-9943
   
    Thanks: Alex
---
 applications/order/template/entry/catalog/ProductDetail.ftl    | 10 +++++-----
 .../order/template/entry/catalog/ProductUomDropDownOnly.ftl    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/order/template/entry/catalog/ProductDetail.ftl b/applications/order/template/entry/catalog/ProductDetail.ftl
index 9e80183..f02194c 100644
--- a/applications/order/template/entry/catalog/ProductDetail.ftl
+++ b/applications/order/template/entry/catalog/ProductDetail.ftl
@@ -483,13 +483,13 @@ ${variantInfoJavaScript!}
                 </select>
               </div>
             </#list>
-            <span id="product_uom"></span>
+            <span id="product_uom"></span><br/>
+            <div class="variant-price" style="display: none;">
+                <strong><span class="product_id_display"> </span></strong>
+                <strong><span class="variant_price_display"> </span></strong>
+            </div>
             <input type="hidden" name="product_id" value="${product.productId}"/>
             <input type="hidden" name="add_product_id" value="NULL"/>
-            <div>
-              <b><span id="product_id_display"> </span></b>
-              <b><div id="variant_price_display"> </div></b>
-            </div>
           <#else>
             <input type="hidden" name="product_id" value="${product.productId}"/>
             <input type="hidden" name="add_product_id" value="NULL"/>
diff --git a/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl b/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
index e0fa658..7cf0f40 100644
--- a/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
+++ b/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <#if product?? && mainProducts??>
-    <select name="parentProductId" onchange="javascript:displayProductVirtualVariantId(this.value);">
+    <select name="parentProductId" onchange="javascript:variantUomSelection(this);">
         <option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
         <#list mainProducts as mainProduct>
             <option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>