[ofbiz-plugins] branch release17.12 updated: Fixed: Unable to remove items from onePageCheckout screen of e-commerce. (OFBIZ-10800)

[surajk]

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

surajk pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release17.12 by this push:
     new 0d05685  Fixed: Unable to remove items from onePageCheckout screen of e-commerce. (OFBIZ-10800)
0d05685 is described below

commit 0d05685ad4c99424b54183891cd2201f84d56a00
Author: Suraj Khurana <[hidden email]>
AuthorDate: Mon Mar 2 12:21:34 2020 +0530

    Fixed: Unable to remove items from onePageCheckout screen of e-commerce.
    (OFBIZ-10800)
   
    Thanks Arpit Mor for reporting and Dhaval Wagela for the patch.
---
 ecommerce/template/cart/UpdateCart.ftl               | 4 ++--
 ecommerce/webapp/ecommerce/images/checkoutProcess.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ecommerce/template/cart/UpdateCart.ftl b/ecommerce/template/cart/UpdateCart.ftl
index 9fc4af2..5b0689e 100644
--- a/ecommerce/template/cart/UpdateCart.ftl
+++ b/ecommerce/template/cart/UpdateCart.ftl
@@ -86,7 +86,7 @@ under the License.
           </#if>
           <tr id="cartItemDisplayRow_${cartLine_index}">
             <td headers="orderItem">
-              <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
+              <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${StringUtil.wrapString(smallImageUrl!)!}</@ofbizContentUrl>"
                   alt = "Product Image" /></td>
             <td headers="description">${cartLine.getName(dispatcher)!}</td>
             <td class="amount" headers="unitPrice">${cartLine.getDisplayPrice()}</td>
@@ -184,7 +184,7 @@ under the License.
                         locale, dispatcher, "url")! />
                     <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" /></#if>
                     <#if smallImageUrl?string?has_content>
-                      <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
+                      <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${StringUtil.wrapString(smallImageUrl!)!}</@ofbizContentUrl>"
                           alt="Product Image" />
                     </#if>
                   </#if>
diff --git a/ecommerce/webapp/ecommerce/images/checkoutProcess.js b/ecommerce/webapp/ecommerce/images/checkoutProcess.js
index c415f8d..32539e1 100644
--- a/ecommerce/webapp/ecommerce/images/checkoutProcess.js
+++ b/ecommerce/webapp/ecommerce/images/checkoutProcess.js
@@ -595,7 +595,11 @@ function updateShippingSummary() {
     jQuery('#completedShippingContactNumber').html(shippingContactPhoneNumber);
     jQuery('#completedEmailAddress').html(jQuery('#emailAddress').val());
     jQuery('#completedShipToAddress1').html(jQuery('#shipToAddress1').val());
-    jQuery('#completedShipToAddress2').html(jQuery('#shipToAddress2').val());
+    if (jQuery('#shipToAddress2').val()) {
+        jQuery('#completedShipToAddress2').show().html(jQuery('#shipToAddress2').val());
+    } else {
+        jQuery('#completedShipToAddress2').hide();
+    }
     if (jQuery('#shipToStateProvinceGeoId').val() == "_NA_") {
         var shipToGeo = jQuery('#shipToCity').val()+", "+jQuery('#shipToCountryGeoId').val()+" "+jQuery('#shipToPostalCode').val();
     }