Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl Sat Sep 17 
07:17:15 2016
@@ -17,514 +17,662 @@ specific language governing permissions
 under the License.
 -->
 <script type="text/javascript">
-//<![CDATA[
-function toggle(e) {
-    e.checked = !e.checked;
-}
-function checkToggle(e) {
-    var cform = document.cartform;
-    if (e.checked) {
-        var len = cform.elements.length;
-        var allchecked = true;
-        for (var i = 0; i < len; i++) {
-            var element = cform.elements[i];
-            if (element.name == "selectedItem" && !element.checked) {
-                allchecked = false;
+    //<![CDATA[
+        function toggle(e) {
+            e.checked = !e.checked;
+        }
+        function checkToggle(e) {
+            var cform = document.cartform;
+            if (e.checked) {
+                var len = cform.elements.length;
+                var allchecked = true;
+                for (var i = 0; i < len; i++) {
+                    var element = cform.elements[i];
+                    if (element.name == "selectedItem" && !element.checked) {
+                        allchecked = false;
+                    }
+                    cform.selectAll.checked = allchecked;
+                }
+            } else {
+                cform.selectAll.checked = false;
+            }
+        }
+        function toggleAll(e) {
+            var cform = document.cartform;
+            var len = cform.elements.length;
+            for (var i = 0; i < len; i++) {
+                var element = cform.elements[i];
+                if (element.name == "selectedItem" && element.checked != 
e.checked) {
+                    toggle(element);
+                }
             }
-            cform.selectAll.checked = allchecked;
         }
-    } else {
-        cform.selectAll.checked = false;
-    }
-}
-function toggleAll(e) {
-    var cform = document.cartform;
-    var len = cform.elements.length;
-    for (var i = 0; i < len; i++) {
-        var element = cform.elements[i];
-        if (element.name == "selectedItem" && element.checked != e.checked) {
-            toggle(element);
+        function removeSelected() {
+            var cform = document.cartform;
+            cform.removeSelected.value = true;
+            cform.submit();
+        }
+        function addToList() {
+            var cform = document.cartform;
+            cform.action = "<@ofbizUrl>addBulkToShoppingList</@ofbizUrl>";
+            cform.submit();
         }
-    }
-}
-function removeSelected() {
-    var cform = document.cartform;
-    cform.removeSelected.value = true;
-    cform.submit();
-}
-function addToList() {
-    var cform = document.cartform;
-    cform.action = "<@ofbizUrl>addBulkToShoppingList</@ofbizUrl>";
-    cform.submit();
-}
-function gwAll(e) {
-    var cform = document.cartform;
-    var len = cform.elements.length;
-    var selectedValue = e.value;
-    if (selectedValue == "") {
-        return;
-    }
-
-    var cartSize = ${shoppingCartSize};
-    var passed = 0;
-    for (var i = 0; i < len; i++) {
-        var element = cform.elements[i];
-        var ename = element.name;
-        var sname = ename.substring(0,16);
-        if (sname == "option^GIFT_WRAP") {
-            var options = element.options;
-            var olen = options.length;
-            var matching = -1;
-            for (var x = 0; x < olen; x++) {
-                var thisValue = element.options[x].value;
-                if (thisValue == selectedValue) {
-                    element.selectedIndex = x;
-                    passed++;
+        function gwAll(e) {
+            var cform = document.cartform;
+            var len = cform.elements.length;
+            var selectedValue = e.value;
+            if (selectedValue == "") {
+                return;
+            }
+
+            var cartSize = ${shoppingCartSize};
+            var passed = 0;
+            for (var i = 0; i < len; i++) {
+                var element = cform.elements[i];
+                var ename = element.name;
+                var sname = ename.substring(0,16);
+                if (sname == "option^GIFT_WRAP") {
+                    var options = element.options;
+                    var olen = options.length;
+                    var matching = -1;
+                    for (var x = 0; x < olen; x++) {
+                        var thisValue = element.options[x].value;
+                        if (thisValue == selectedValue) {
+                            element.selectedIndex = x;
+                            passed++;
+                        }
+                    }
                 }
             }
+            if (cartSize > passed && selectedValue != "NO^") {
+                
showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.EcommerceSelectedGiftWrap}");
+            }
+            cform.submit();
         }
-    }
-    if (cartSize > passed && selectedValue != "NO^") {
-        
showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.EcommerceSelectedGiftWrap}");
-    }
-    cform.submit();
-}
-//]]>
+    //]]>
 </script>
 
 <script type="text/javascript">
-//<![CDATA[
-function setAlternateGwp(field) {
-  window.location=field.value;
-};
-//]]>
+    //<![CDATA[
+        function setAlternateGwp(field) {
+            window.location=field.value;
+        };
+    //]]>
 </script>
-<#assign fixedAssetExist = shoppingCart.containAnyWorkEffortCartItems() /> 
<#-- change display format when rental items exist in the shoppingcart -->
+<#assign fixedAssetExist = shoppingCart.containAnyWorkEffortCartItems() />
+<#-- change display format when rental items exist in the shoppingcart -->
 <div>
-    <h2>
-        <#if ((sessionAttributes.lastViewedProducts)?has_content && 
sessionAttributes.lastViewedProducts?size > 0)>
-          <#assign continueLink = "/product?product_id=" + 
sessionAttributes.lastViewedProducts.get(0) />
-        <#else>
-          <#assign continueLink = "/main" />
-        </#if>
-        <a href="<@ofbizUrl>${continueLink}</@ofbizUrl>" 
class="submenutext">${uiLabelMap.EcommerceContinueShopping}</a>
-        <#if (shoppingCartSize > 0)><a 
href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" 
class="submenutext">${uiLabelMap.OrderCheckout}</a><#else><span 
class="submenutextrightdisabled">${uiLabelMap.OrderCheckout}</span></#if>
-        ${uiLabelMap.CommonQuickAdd}
-    </h2>
+  <h2>
+    <#if ((sessionAttributes.lastViewedProducts)?has_content && 
sessionAttributes.lastViewedProducts?size > 0)>
+      <#assign continueLink = "/product?product_id=" + 
sessionAttributes.lastViewedProducts.get(0) />
+    <#else>
+      <#assign continueLink = "/main" />
+    </#if>
+    <a href="<@ofbizUrl>${continueLink}</@ofbizUrl>" class="submenutext">
+      ${uiLabelMap.EcommerceContinueShopping}
+    </a>
+    <#if (shoppingCartSize > 0)>
+      <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="submenutext">
+        ${uiLabelMap.OrderCheckout}
+      </a>
+    <#else>
+      <span class="submenutextrightdisabled">
+        ${uiLabelMap.OrderCheckout}
+      </span>
+    </#if>
+    ${uiLabelMap.CommonQuickAdd}
+  </h2>
+  <div>
     <div>
-        <div>
-            <form method="post" action="<@ofbizUrl>additem<#if 
requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"
 name="quickaddform">
-                <fieldset>
-                ${uiLabelMap.EcommerceProductNumber}<input type="text" 
class="inputBox" name="add_product_id" 
value="${requestParameters.add_product_id!}" />
-                <#-- check if rental data present  insert extra fields in 
Quick Add-->
-                <#if (product?? && product.getString("productTypeId") == 
"ASSET_USAGE") || (product?? && product.getString("productTypeId") == 
"ASSET_USAGE_OUT_IN")>
-                    ${uiLabelMap.EcommerceStartDate}: <input type="text" 
class="inputBox" size="10" name="reservStart" 
value="${requestParameters.reservStart?default("")}" />
-                    ${uiLabelMap.EcommerceLength}: <input type="text" 
class="inputBox" size="2" name="reservLength" 
value="${requestParameters.reservLength?default("")}" />
-                    </div>
-                    <div>
-                    &nbsp;&nbsp;${uiLabelMap.OrderNbrPersons}: <input 
type="text" class="inputBox" size="3" name="reservPersons" 
value="${requestParameters.reservPersons?default("1")}" />
-                </#if>
-                ${uiLabelMap.CommonQuantity}: <input type="text" 
class="inputBox" size="5" name="quantity" 
value="${requestParameters.quantity?default("1")}" />
-                <input type="submit" class="smallSubmit" 
value="${uiLabelMap.OrderAddToCart}" />
-                <#-- <a href="javascript:document.quickaddform.submit()" 
class="button"><span>[${uiLabelMap.OrderAddToCart}]</span></a> -->
-                </fieldset>
-            </form>
-        </div>
+      <form method="post"
+          action="<@ofbizUrl>additem<#if 
requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"
+          name="quickaddform">
+        <fieldset>
+          ${uiLabelMap.EcommerceProductNumber}
+          <input type="text" class="inputBox" name="add_product_id" 
value="${requestParameters.add_product_id!}" />
+          <#-- check if rental data present  insert extra fields in Quick 
Add-->
+          <#if (product?? && product.getString("productTypeId") == 
"ASSET_USAGE"
+              ) || (product?? && product.getString("productTypeId") == 
"ASSET_USAGE_OUT_IN")>
+            ${uiLabelMap.EcommerceStartDate}:
+            <input type="text" class="inputBox" size="10" name="reservStart"
+                value="${requestParameters.reservStart?default("")}" />
+            ${uiLabelMap.EcommerceLength}:
+            <input type="text" class="inputBox" size="2" name="reservLength"
+                value="${requestParameters.reservLength?default("")}" />
+            </div>
+            <div>
+            &nbsp;&nbsp;${uiLabelMap.OrderNbrPersons}:
+            <input type="text" class="inputBox" size="3" name="reservPersons"
+                value="${requestParameters.reservPersons?default("1")}" />
+          </#if>
+          ${uiLabelMap.CommonQuantity}:
+          <input type="text" class="inputBox" size="5" name="quantity"
+              value="${requestParameters.quantity?default("1")}" />
+          <input type="submit" class="smallSubmit" 
value="${uiLabelMap.OrderAddToCart}" />
+          <#-- <a href="javascript:document.quickaddform.submit()" 
class="button">
+                 <span>[${uiLabelMap.OrderAddToCart}]</span>
+               </a> -->
+        </fieldset>
+      </form>
     </div>
+  </div>
 </div>
 
 <script type="text/javascript">
-//<![CDATA[
-  document.quickaddform.add_product_id.focus();
-//]]>
+    //<![CDATA[
+        document.quickaddform.add_product_id.focus();
+    //]]>
 </script>
 
 <div>
+  <div>
     <div>
-        <div>
-            <div class="lightbuttontextdisabled">
-              <#--<a href="<@ofbizUrl>main</@ofbizUrl>" 
class="lightbuttontext">[${uiLabelMap.EcommerceContinueShopping}]</a>-->
-              <#if (shoppingCartSize > 0)>
-                <a href="javascript:document.cartform.submit();" 
class="submenutext">${uiLabelMap.EcommerceRecalculateCart}</a>
-                <a href="<@ofbizUrl>emptycart</@ofbizUrl>" 
class="submenutext">${uiLabelMap.EcommerceEmptyCart}</a>
-                <a href="javascript:removeSelected();" 
class="submenutext">${uiLabelMap.EcommerceRemoveSelected}</a>
-              <#else>
-                <span 
class="submenutextdisabled">${uiLabelMap.EcommerceRecalculateCart}</span>
-                <span 
class="submenutextdisabled">${uiLabelMap.EcommerceEmptyCart}</span>
-                <span 
class="submenutextdisabled">${uiLabelMap.EcommerceRemoveSelected}</span>
-              </#if>
-              <#if (shoppingCartSize > 0)><a 
href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.OrderCheckout}</a><#else><span 
class="submenutextrightdisabled">${uiLabelMap.OrderCheckout}</span></#if>
-            </div>
-        </div>
-        <br />
-        <h2>&nbsp;${uiLabelMap.OrderShoppingCart}</h2>
+      <div class="lightbuttontextdisabled">
+        <#--<a href="<@ofbizUrl>main</@ofbizUrl>" class="lightbuttontext">
+              [${uiLabelMap.EcommerceContinueShopping}]
+            </a>-->
+        <#if (shoppingCartSize > 0)>
+          <a href="javascript:document.cartform.submit();" class="submenutext">
+            ${uiLabelMap.EcommerceRecalculateCart}
+          </a>
+          <a href="<@ofbizUrl>emptycart</@ofbizUrl>" class="submenutext">
+            ${uiLabelMap.EcommerceEmptyCart}
+          </a>
+          <a href="javascript:removeSelected();" class="submenutext">
+            ${uiLabelMap.EcommerceRemoveSelected}
+          </a>
+        <#else>
+          <span 
class="submenutextdisabled">${uiLabelMap.EcommerceRecalculateCart}</span>
+          <span 
class="submenutextdisabled">${uiLabelMap.EcommerceEmptyCart}</span>
+          <span 
class="submenutextdisabled">${uiLabelMap.EcommerceRemoveSelected}</span>
+        </#if>
+        <#if (shoppingCartSize > 0)>
+          <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" 
class="submenutextright">
+            ${uiLabelMap.OrderCheckout}
+          </a>
+        <#else>
+          <span 
class="submenutextrightdisabled">${uiLabelMap.OrderCheckout}</span>
+        </#if>
+      </div>
     </div>
-    <div>
-
-  <#if (shoppingCartSize > 0)>
-    <form method="post" action="<@ofbizUrl>modifycart</@ofbizUrl>" 
name="cartform">
-      <fieldset>
-      <input type="hidden" name="removeSelected" value="false" />
-      <table>
-        <thead>
-            <tr>
-              <th></th>
-              <th scope="row">${uiLabelMap.OrderProduct}</th>
-              <#if asslGiftWraps?has_content && 
productStore.showCheckoutGiftOptions! != "N">>
-                <th scope="row">
-                  <select class="selectBox" name="GWALL" 
onchange="javascript:gwAll(this);">
-                    <option 
value="">${uiLabelMap.EcommerceGiftWrapAllItems}</option>
-                    <option 
value="NO^">${uiLabelMap.EcommerceNoGiftWrap}</option>
-                    <#list allgiftWraps as option>
-                      <option 
value="${option.productFeatureId}">${option.description} : 
${option.defaultAmount?default(0)}</option>
-                    </#list>
-                  </select>
-              <#else>
-                <th scope="row">&nbsp;</th>
-              </#if>
-              <#if fixedAssetExist == true>
-                <td>
+    <br />
+    <h2>&nbsp;${uiLabelMap.OrderShoppingCart}</h2>
+  </div>
+  <div>
+    <#if (shoppingCartSize > 0)>
+      <form method="post" action="<@ofbizUrl>modifycart</@ofbizUrl>" 
name="cartform">
+        <fieldset>
+          <input type="hidden" name="removeSelected" value="false" />
+          <table>
+            <thead>
+              <tr>
+                <th></th>
+                <th scope="row">${uiLabelMap.OrderProduct}</th>
+                <#if asslGiftWraps?has_content && 
productStore.showCheckoutGiftOptions! != "N">>
+                  <th scope="row">
+                    <select class="selectBox" name="GWALL" 
onchange="javascript:gwAll(this);">
+                      <option 
value="">${uiLabelMap.EcommerceGiftWrapAllItems}</option>
+                      <option 
value="NO^">${uiLabelMap.EcommerceNoGiftWrap}</option>
+                      <#list allgiftWraps as option>
+                        <option value="${option.productFeatureId}">
+                          ${option.description} : 
${option.defaultAmount?default(0)}
+                        </option>
+                      </#list>
+                    </select>
+                <#else>
+                  <th scope="row">&nbsp;</th>
+                </#if>
+                <#if fixedAssetExist == true>
+                  <td>
                     <table>
-                        <tr>
-                            <td>- ${uiLabelMap.EcommerceStartDate} -</td>
-                            <td>- ${uiLabelMap.EcommerceNbrOfDays} -</td>
-                        </tr>
-                        <tr>
-                            <td >- ${uiLabelMap.EcommerceNbrOfPersons} -</td>
-                            <td >- ${uiLabelMap.CommonQuantity} -</td>
-                        </tr>
+                      <tr>
+                        <td>- ${uiLabelMap.EcommerceStartDate} -</td>
+                        <td>- ${uiLabelMap.EcommerceNbrOfDays} -</td>
+                      </tr>
+                      <tr>
+                        <td >- ${uiLabelMap.EcommerceNbrOfPersons} -</td>
+                        <td >- ${uiLabelMap.CommonQuantity} -</td>
+                      </tr>
                     </table>
-                </td>
-              <#else>
-                <th scope="row">${uiLabelMap.CommonQuantity}</th>
-              </#if>
-              <th scope="row">${uiLabelMap.EcommerceUnitPrice}</th>
-              <th scope="row">${uiLabelMap.EcommerceAdjustments}</th>
-              <th scope="row">${uiLabelMap.EcommerceItemTotal}</th>
-              <th scope="row"><input type="checkbox" name="selectAll" 
value="0" onclick="javascript:toggleAll(this);" /></th>
-            </tr>
-        </thead>
-        <tbody>
-        <#assign itemsFromList = false />
-        <#assign promoItems = false />
-        <#list shoppingCart.items() as cartLine>
-
-          <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine) />
-          <#assign lineOptionalFeatures = 
cartLine.getOptionalProductFeatures() />
-          <#-- show adjustment info -->
-          <#list cartLine.getAdjustments() as cartLineAdjustment>
-            <!-- cart line ${cartLineIndex} adjustment: ${cartLineAdjustment} 
-->
-          </#list>
-
-          <tr id="cartItemDisplayRow_${cartLineIndex}">
-            <td>
-                <#if cartLine.getShoppingListId()??>
-                  <#assign itemsFromList = true />
-                  <a 
href="<@ofbizUrl>editShoppingList?shoppingListId=${cartLine.getShoppingListId()}</@ofbizUrl>"
 class="linktext">L</a>&nbsp;&nbsp;
-                <#elseif cartLine.getIsPromo()>
-                  <#assign promoItems = true />
-                  <a href="<@ofbizUrl>view/showcart</@ofbizUrl>" 
class="button">P</a>&nbsp;&nbsp;
+                  </td>
                 <#else>
-                  &nbsp;
+                  <th scope="row">${uiLabelMap.CommonQuantity}</th>
                 </#if>
-            </td>
-            <td>
-                  <#if cartLine.getProductId()??>
-                    <#-- product item -->
-                    <#-- start code to display a small image of the product -->
-                    <#if cartLine.getParentProductId()??>
-                      <#assign parentProductId = cartLine.getParentProductId() 
/>
+                <th scope="row">${uiLabelMap.EcommerceUnitPrice}</th>
+                <th scope="row">${uiLabelMap.EcommerceAdjustments}</th>
+                <th scope="row">${uiLabelMap.EcommerceItemTotal}</th>
+                <th scope="row">
+                  <input type="checkbox" name="selectAll" value="0" 
onclick="javascript:toggleAll(this);" />
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <#assign itemsFromList = false />
+              <#assign promoItems = false />
+              <#list shoppingCart.items() as cartLine>
+                <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine) />
+                <#assign lineOptionalFeatures = 
cartLine.getOptionalProductFeatures() />
+                <#-- show adjustment info -->
+                <#list cartLine.getAdjustments() as cartLineAdjustment>
+                  <!-- cart line ${cartLineIndex} adjustment: 
${cartLineAdjustment} -->
+                </#list>
+                <tr id="cartItemDisplayRow_${cartLineIndex}">
+                  <td>
+                    <#if cartLine.getShoppingListId()??>
+                      <#assign itemsFromList = true />
+                      <a 
href="<@ofbizUrl>editShoppingList?shoppingListId=${cartLine.getShoppingListId()}</@ofbizUrl>"
+                          class="linktext">L</a>&nbsp;&nbsp;
+                    <#elseif cartLine.getIsPromo()>
+                      <#assign promoItems = true />
+                      <a href="<@ofbizUrl>view/showcart</@ofbizUrl>" 
class="button">P</a>&nbsp;&nbsp;
                     <#else>
-                      <#assign parentProductId = cartLine.getProductId() />
-                    </#if>
-                    <#assign smallImageUrl = 
Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
 "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
-                    <#if !smallImageUrl?string?has_content><#assign 
smallImageUrl = "/images/defaultImage.jpg" /></#if>
-                    <#if smallImageUrl?string?has_content>
-                      <a href="<@ofbizCatalogAltUrl 
productId=parentProductId/>">
-                        <img 
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
 alt="Product Image" class="imageborder" />
-                      </a>
+                      &nbsp;
                     </#if>
-                    <#-- end code to display a small image of the product -->
-                    <#-- ${cartLineIndex} - -->
-                    <a href="<@ofbizCatalogAltUrl productId=parentProductId/>" 
class="linktext">${cartLine.getProductId()} -
-                    ${cartLine.getName()!}</a> : ${cartLine.getDescription()!}
-                    <#-- For configurable products, the selected options are 
shown -->
-                    <#if cartLine.getConfigWrapper()??>
-                      <#assign selectedOptions = 
cartLine.getConfigWrapper().getSelectedOptions()! />
-                      <#if selectedOptions??>
-                        <div>&nbsp;</div>
-                        <#list selectedOptions as option>
-                          <div>
-                            ${option.getDescription()}
-                          </div>
-                        </#list>
+                  </td>
+                  <td>
+                    <#if cartLine.getProductId()??>
+                      <#-- product item -->
+                      <#-- start code to display a small image of the product 
-->
+                      <#if cartLine.getParentProductId()??>
+                        <#assign parentProductId = 
cartLine.getParentProductId() />
+                      <#else>
+                        <#assign parentProductId = cartLine.getProductId() />
+                      </#if>
+                      <#assign smallImageUrl =
+                          
Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(
+                          cartLine.getProduct(), "SMALL_IMAGE_URL", locale, 
dispatcher, "url")! />
+                      <#if !smallImageUrl?string?has_content>
+                        <#assign smallImageUrl = "/images/defaultImage.jpg" />
+                      </#if>
+                      <#if smallImageUrl?string?has_content>
+                        <a href="<@ofbizCatalogAltUrl 
productId=parentProductId/>">
+                          <img 
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
+                              alt="Product Image" class="imageborder" />
+                        </a>
+                      </#if>
+                      <#-- end code to display a small image of the product -->
+                      <#-- ${cartLineIndex} - -->
+                      <a href="<@ofbizCatalogAltUrl 
productId=parentProductId/>"
+                          class="linktext">${cartLine.getProductId()} -
+                        ${cartLine.getName()!}
+                      </a> : ${cartLine.getDescription()!}
+                      <#-- For configurable products, the selected options are 
shown -->
+                      <#if cartLine.getConfigWrapper()??>
+                        <#assign selectedOptions = 
cartLine.getConfigWrapper().getSelectedOptions()! />
+                        <#if selectedOptions??>
+                          <div>&nbsp;</div>
+                          <#list selectedOptions as option>
+                            <div>
+                              ${option.getDescription()}
+                            </div>
+                          </#list>
+                        </#if>
                       </#if>
-                    </#if>
 
-                    <#-- if inventory is not required check to see if it is 
out of stock and needs to have a message shown about that... -->
-                    <#assign itemProduct = cartLine.getProduct() />
-                    <#assign isStoreInventoryNotRequiredAndNotAvailable = 
Static["org.apache.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request,
 itemProduct, cartLine.getQuantity(), false, false) />
-                    <#if isStoreInventoryNotRequiredAndNotAvailable && 
itemProduct.inventoryMessage?has_content>
+                      <#-- if inventory is not required check to see if it is 
out
+                       of stock and needs to have a message shown about 
that... -->
+                      <#assign itemProduct = cartLine.getProduct() />
+                      <#assign isStoreInventoryNotRequiredAndNotAvailable =
+                          
Static["org.apache.ofbiz.product.store.ProductStoreWorker"]
+                          .isStoreInventoryRequiredAndAvailable(request, 
itemProduct,
+                          cartLine.getQuantity(), false, false) />
+                      <#if isStoreInventoryNotRequiredAndNotAvailable && 
itemProduct.inventoryMessage?has_content>
                         (${itemProduct.inventoryMessage})
+                      </#if>
+
+                    <#else>
+                      <#-- this is a non-product item -->
+                      ${cartLine.getItemTypeDescription()!}: 
${cartLine.getName()!}
                     </#if>
 
-                  <#else>
-                    <#-- this is a non-product item -->
-                    ${cartLine.getItemTypeDescription()!}: 
${cartLine.getName()!}
-                  </#if>
-                  <#assign attrs = cartLine.getOrderItemAttributes()/>
-                  <#if attrs?has_content>
-                    <#assign attrEntries = attrs.entrySet()/>
-                    <ul>
-                    <#list attrEntries as attrEntry>
-                        <li>
+                    <#assign attrs = cartLine.getOrderItemAttributes()/>
+                    <#if attrs?has_content>
+                      <#assign attrEntries = attrs.entrySet()/>
+                      <ul>
+                        <#list attrEntries as attrEntry>
+                          <li>
                             ${attrEntry.getKey()} : ${attrEntry.getValue()}
+                          </li>
+                        </#list>
+                      </ul>
+                    </#if>
+                    <#if (cartLine.getIsPromo() && 
cartLine.getAlternativeOptionProductIds()?has_content)>
+                      <#-- Show alternate gifts if there are any... -->
+                      <div 
class="tableheadtext">${uiLabelMap.OrderChooseFollowingForGift}:</div>
+                      <select name="dummyAlternateGwpSelect${cartLineIndex}"
+                          onchange="setAlternateGwp(this);" class="selectBox">
+                        <option value="">- 
${uiLabelMap.OrderChooseAnotherGift} -</option>
+                        <#list cartLine.getAlternativeOptionProductIds() as 
alternativeOptionProductId>
+                          <#assign alternativeOptionName =
+                            
Static["org.apache.ofbiz.product.product.ProductWorker"].getGwpAlternativeOptionName(
+                            dispatcher, delegator, alternativeOptionProductId, 
requestAttributes.locale) />
+                          <option
+                              
value="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>">
+                            
${alternativeOptionName?default(alternativeOptionProductId)}
+                          </option>
+                        </#list>
+                      </select>
+                      <#-- this is the old way, it lists out the options and 
is not as nice as the drop-down
+                      <ul>
+                      <#list cartLine.getAlternativeOptionProductIds() as 
alternativeOptionProductId>
+                        <#assign alternativeOptionName = 
Static["org.apache.ofbiz.product.product.ProductWorker"]
+                            .getGwpAlternativeOptionName(delegator, 
alternativeOptionProductId,
+                            requestAttributes.locale) />
+                        <li>
+                          <a 
href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>"
+                              class="button">Select: 
${alternativeOptionName?default(alternativeOptionProductId)}</a>
                         </li>
-                    </#list>
-                    </ul>
-                  </#if>
-                <#if (cartLine.getIsPromo() && 
cartLine.getAlternativeOptionProductIds()?has_content)>
-                  <#-- Show alternate gifts if there are any... -->
-                  <div 
class="tableheadtext">${uiLabelMap.OrderChooseFollowingForGift}:</div>
-                  <select name="dummyAlternateGwpSelect${cartLineIndex}" 
onchange="setAlternateGwp(this);" class="selectBox">
-                  <option value="">- ${uiLabelMap.OrderChooseAnotherGift} 
-</option>
-                  <#list cartLine.getAlternativeOptionProductIds() as 
alternativeOptionProductId>
-                    <#assign alternativeOptionName = 
Static["org.apache.ofbiz.product.product.ProductWorker"].getGwpAlternativeOptionName(dispatcher,
 delegator, alternativeOptionProductId, requestAttributes.locale) />
-                    <option 
value="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>">${alternativeOptionName?default(alternativeOptionProductId)}</option>
-                  </#list>
-                  </select>
-                  <#-- this is the old way, it lists out the options and is 
not as nice as the drop-down
-                  <ul>
-                  <#list cartLine.getAlternativeOptionProductIds() as 
alternativeOptionProductId>
-                    <#assign alternativeOptionName = 
Static["org.apache.ofbiz.product.product.ProductWorker"].getGwpAlternativeOptionName(delegator,
 alternativeOptionProductId, requestAttributes.locale) />
-                    <li><a 
href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>"
 class="button">Select: 
${alternativeOptionName?default(alternativeOptionProductId)}</a></li>
-                  </#list>
-                  </ul>
-                  -->
-                </#if>
-            </td>
+                      </#list>
+                      </ul>
+                      -->
+                    </#if>
+                  </td>
 
-            <#-- gift wrap option -->
-            <#assign showNoGiftWrapOptions = false />
-            <td >
-              <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP! />
-              <#assign selectedOption = 
cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")! />
-              <#if giftWrapOption?has_content>
-                <select class="selectBox" 
name="option^GIFT_WRAP_${cartLineIndex}" 
onchange="javascript:document.cartform.submit()">
-                  <option 
value="NO^">${uiLabelMap.EcommerceNoGiftWrap}</option>
-                  <#list giftWrapOption as option>
-                    <option value="${option.productFeatureId}" <#if 
((selectedOption.productFeatureId)?? && selectedOption.productFeatureId == 
option.productFeatureId)>selected="selected"</#if>>${option.description} : 
${option.amount?default(0)}</option>
-                  </#list>
-                </select>
-              <#elseif showNoGiftWrapOptions>
-                <select class="selectBox" 
name="option^GIFT_WRAP_${cartLineIndex}" 
onchange="javascript:document.cartform.submit()">
-                  <option value="">${uiLabelMap.EcommerceNoGiftWrap}</option>
-                </select>
-              <#else>
-                &nbsp;
-              </#if>
-            </td>
-            <#-- end gift wrap option -->
+                  <#-- gift wrap option -->
+                  <#assign showNoGiftWrapOptions = false />
+                  <td >
+                    <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP! 
/>
+                    <#assign selectedOption = 
cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")! />
+                    <#if giftWrapOption?has_content>
+                      <select class="selectBox" 
name="option^GIFT_WRAP_${cartLineIndex}"
+                          onchange="javascript:document.cartform.submit()">
+                        <option 
value="NO^">${uiLabelMap.EcommerceNoGiftWrap}</option>
+                        <#list giftWrapOption as option>
+                          <option value="${option.productFeatureId}"
+                              <#if ((selectedOption.productFeatureId)?? && 
selectedOption.productFeatureId ==
+                              
option.productFeatureId)>selected="selected"</#if>>
+                            ${option.description} : ${option.amount?default(0)}
+                          </option>
+                        </#list>
+                      </select>
+                    <#elseif showNoGiftWrapOptions>
+                      <select class="selectBox" 
name="option^GIFT_WRAP_${cartLineIndex}"
+                          onchange="javascript:document.cartform.submit()">
+                        <option 
value="">${uiLabelMap.EcommerceNoGiftWrap}</option>
+                      </select>
+                    <#else>
+                      &nbsp;
+                    </#if>
+                  </td>
+                  <#-- end gift wrap option -->
 
-            <td>
-                <#if cartLine.getIsPromo() || cartLine.getShoppingListId()??>
-                       <#if fixedAssetExist == true>
+                  <td>
+                    <#if cartLine.getIsPromo() || 
cartLine.getShoppingListId()??>
+                      <#if fixedAssetExist == true>
                         <#if cartLine.getReservStart()??>
-                            <table >
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    
<td>${cartLine.getReservStart()?string("yyyy-mm-dd")}</td>
-                                    
<td>${cartLine.getReservLength()?string.number}</td></tr>
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    
<td>${cartLine.getReservPersons()?string.number}</td>
-                                    <td>
+                          <table >
+                            <tr>
+                              <td>&nbsp;</td>
+                              
<td>${cartLine.getReservStart()?string("yyyy-mm-dd")}</td>
+                              
<td>${cartLine.getReservLength()?string.number}</td></tr>
+                            <tr>
+                              <td>&nbsp;</td>
+                              
<td>${cartLine.getReservPersons()?string.number}</td>
+                              <td>
                         <#else>
-                            <table >
-                                <tr>
-                                    <td >--</td>
-                                    <td>--</td>
-                                </tr>
-                                <tr>
-                                    <td>--</td>
-                                    <td>    
+                          <table >
+                            <tr>
+                              <td >--</td>
+                              <td>--</td>
+                            </tr>
+                            <tr>
+                              <td>--</td>
+                              <td>
                         </#if>
                         
${cartLine.getQuantity()?string.number}</td></tr></table>
-                    <#else><#-- fixedAssetExist -->
+                      <#else><#-- fixedAssetExist -->
                         ${cartLine.getQuantity()?string.number}
+                      </#if>
+                    <#else><#-- Is Promo or Shoppinglist -->
+                      <#if fixedAssetExist == true>
+                        <#if cartLine.getReservStart()??>
+                          <table>
+                            <tr>
+                              <td>&nbsp;</td>
+                              <td>
+                                <input type="text" class="inputBox" size="10" 
name="reservStart_${cartLineIndex}"
+                                    value=${cartLine.getReservStart()?string}/>
+                              </td>
+                              <td>
+                                <input type="text" class="inputBox" size="2" 
name="reservLength_${cartLineIndex}"
+                                    
value="${cartLine.getReservLength()?string.number}"/>
+                              </td>
+                            </tr>
+                            <tr>
+                              <td>&nbsp;</td>
+                              <td>
+                                <input type="text" class="inputBox" size="3" 
name="reservPersons_${cartLineIndex}"
+                                    
value=${cartLine.getReservPersons()?string.number} />
+                              </td>
+                              <td>
+                        <#else>
+                          <table>
+                            <tr>
+                              <td>--</td>
+                              <td>--</td>
+                            </tr>
+                            <tr>
+                              <td>--</td>
+                              <td>
+                        </#if>
+                              <input size="6" class="inputBox" type="text" 
name="update_${cartLineIndex}"
+                                  
value="${cartLine.getQuantity()?string.number}" />
+                              </td>
+                            </tr>
+                          </table>
+                        <#else><#-- fixedAssetExist -->
+                          <input size="6" class="inputBox" type="text" 
name="update_${cartLineIndex}"
+                              value="${cartLine.getQuantity()?string.number}" 
/>
+                        </#if>
                     </#if>
-                <#else><#-- Is Promo or Shoppinglist -->
-                       <#if fixedAssetExist == true><#if 
cartLine.getReservStart()??><table><tr><td>&nbsp;</td><td><input type="text" 
class="inputBox" size="10" name="reservStart_${cartLineIndex}" 
value=${cartLine.getReservStart()?string}/></td><td><input type="text" 
class="inputBox" size="2" name="reservLength_${cartLineIndex}" 
value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td>&nbsp;</td><td><input
 type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" 
value=${cartLine.getReservPersons()?string.number} /></td><td><#else>
-                           
<table><tr><td>--</td><td>--</td></tr><tr><td>--</td><td></#if>
-                        <input size="6" class="inputBox" type="text" 
name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" 
/></td></tr></table>
-                    <#else><#-- fixedAssetExist -->
-                        <input size="6" class="inputBox" type="text" 
name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" 
/>
+                  </td>
+                  <td><@ofbizCurrency amount=cartLine.getDisplayPrice() 
isoCode=shoppingCart.getCurrency()/></td>
+                  <td><@ofbizCurrency amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency()/></td>
+                  <td><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() 
isoCode=shoppingCart.getCurrency()/></td>
+                  <td>
+                    <#if !cartLine.getIsPromo()>
+                      <input type="checkbox" name="selectedItem" 
value="${cartLineIndex}"
+                             onclick="javascript:checkToggle(this);" />
+                    <#else>
+                      &nbsp;
                     </#if>
-                </#if>
-            </td>
-            <td><@ofbizCurrency amount=cartLine.getDisplayPrice() 
isoCode=shoppingCart.getCurrency()/></td>
-            <td><@ofbizCurrency amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency()/></td>
-            <td><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() 
isoCode=shoppingCart.getCurrency()/></td>
-            <td><#if !cartLine.getIsPromo()><input type="checkbox" 
name="selectedItem" value="${cartLineIndex}" 
onclick="javascript:checkToggle(this);" /><#else>&nbsp;</#if></td>
-          </tr>
-        </#list>
-    </tbody>
-    </table>
-    <table>
-        <#if shoppingCart.getAdjustments()?has_content>
+                  </td>
+                </tr>
+              </#list>
+            </tbody>
+          </table>
+          <table>
+            <#if shoppingCart.getAdjustments()?has_content>
+              <tr>
+                <th>${uiLabelMap.CommonSubTotal}:</th>
+                <td>
+                  <@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() 
isoCode=shoppingCart.getCurrency()/>
+                </td>
+                <td>&nbsp;</td>
+              </tr>
+              <#if (shoppingCart.getDisplayTaxIncluded() > 0.0)>
+                <tr>
+                  <th>${uiLabelMap.OrderSalesTaxIncluded}:</th>
+                  <td>
+                    <@ofbizCurrency 
amount=shoppingCart.getDisplayTaxIncluded() isoCode=shoppingCart.getCurrency()/>
+                  </td>
+                  <td>&nbsp;</td>
+                </tr>
+              </#if>
+              <#list shoppingCart.getAdjustments() as cartAdjustment>
+                <#assign adjustmentType = 
cartAdjustment.getRelatedOne("OrderAdjustmentType", true) />
+                <tr>
+                  <th>
+                    ${uiLabelMap.EcommerceAdjustment} - 
${adjustmentType.get("description",locale)!}
+                    <#if cartAdjustment.productPromoId?has_content>
+                      <a 
href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>"
+                          class="button">
+                        ${uiLabelMap.CommonDetails}
+                      </a>
+                    </#if>:
+                  </th>
+                  <td>
+                    <@ofbizCurrency 
amount=Static["org.apache.ofbiz.order.order.OrderReadHelper"]
+                        .calcOrderAdjustment(cartAdjustment,
+                        shoppingCart.getSubTotal()) 
isoCode=shoppingCart.getCurrency()/>
+                  </td>
+                  <td>&nbsp;</td>
+                </tr>
+              </#list>
+            </#if>
             <tr>
-              <th>${uiLabelMap.CommonSubTotal}:</th>
-              <td><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() 
isoCode=shoppingCart.getCurrency()/></td>
-              <td>&nbsp;</td>
+              <th>${uiLabelMap.EcommerceCartTotal}:</th>
+              <td>
+                <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() 
isoCode=shoppingCart.getCurrency()/>
+              </td>
             </tr>
-            <#if (shoppingCart.getDisplayTaxIncluded() > 0.0)>
+            <#if itemsFromList>
               <tr>
-                <th>${uiLabelMap.OrderSalesTaxIncluded}:</th>
-                <td><@ofbizCurrency 
amount=shoppingCart.getDisplayTaxIncluded() 
isoCode=shoppingCart.getCurrency()/></td>
-                <td>&nbsp;</td>
+                <td>L - ${uiLabelMap.EcommerceItemsfromShopingList}.</td>
               </tr>
             </#if>
-            <#list shoppingCart.getAdjustments() as cartAdjustment>
-              <#assign adjustmentType = 
cartAdjustment.getRelatedOne("OrderAdjustmentType", true) />
+            <#if promoItems>
+              <tr>
+                <td>P - ${uiLabelMap.EcommercePromotionalItems}.</td>
+              </tr>
+            </#if>
+            <#if !itemsFromList && !promoItems>
               <tr>
-                <th>
-                    ${uiLabelMap.EcommerceAdjustment} - 
${adjustmentType.get("description",locale)!}
-                    <#if cartAdjustment.productPromoId?has_content><a 
href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>"
 class="button">${uiLabelMap.CommonDetails}</a></#if>:
-                </th>
-                <td><@ofbizCurrency 
amount=Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment,
 shoppingCart.getSubTotal()) isoCode=shoppingCart.getCurrency()/></td>
                 <td>&nbsp;</td>
               </tr>
-            </#list>
-        </#if>
-        <tr>
-          <th>${uiLabelMap.EcommerceCartTotal}:</th>
-          <td><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() 
isoCode=shoppingCart.getCurrency()/></td>
-        </tr>
-        <#if itemsFromList>
-        <tr>
-          <td>L - ${uiLabelMap.EcommerceItemsfromShopingList}.</td>
-        </tr>
-        </#if>
-        <#if promoItems>
-        <tr>
-          <td>P - ${uiLabelMap.EcommercePromotionalItems}.</td>
-        </tr>
-        </#if>
-        <#if !itemsFromList && !promoItems>
-        <tr>
-          <td>&nbsp;</td>
-        </tr>
-        </#if>
-        <tr>
-          <td>
-              <#if sessionAttributes.userLogin?has_content && 
sessionAttributes.userLogin.userLoginId != "anonymous">
-              <select name="shoppingListId" class="selectBox">
-                <#if shoppingLists?has_content>
-                  <#list shoppingLists as shoppingList>
-                    <option 
value="${shoppingList.shoppingListId}">${shoppingList.listName}</option>
-                  </#list>
+            </#if>
+            <tr>
+              <td>
+                <#if sessionAttributes.userLogin?has_content && 
sessionAttributes.userLogin.userLoginId != "anonymous">
+                  <select name="shoppingListId" class="selectBox">
+                    <#if shoppingLists?has_content>
+                      <#list shoppingLists as shoppingList>
+                        <option 
value="${shoppingList.shoppingListId}">${shoppingList.listName}</option>
+                      </#list>
+                    </#if>
+                    <option value="">---</option>
+                    <option 
value="">${uiLabelMap.OrderNewShoppingList}</option>
+                  </select>
+                  &nbsp;&nbsp;
+                  <a href="javascript:addToList();" class="button">
+                    ${uiLabelMap.EcommerceAddSelectedtoList}
+                  </a>&nbsp;&nbsp;
+                <#else>
+                  ${uiLabelMap.OrderYouMust}
+                  <a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" 
class="button">
+                    ${uiLabelMap.CommonBeLogged}
+                  </a>
+                  ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.&nbsp;
                 </#if>
-                <option value="">---</option>
-                <option value="">${uiLabelMap.OrderNewShoppingList}</option>
-              </select>
-              &nbsp;&nbsp;
-              <a href="javascript:addToList();" 
class="button">${uiLabelMap.EcommerceAddSelectedtoList}</a>&nbsp;&nbsp;
-              <#else>
-               ${uiLabelMap.OrderYouMust} <a 
href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" 
class="button">${uiLabelMap.CommonBeLogged}</a>
-                ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.&nbsp;
-              </#if>
-          </td>
-        </tr>
-        <tr>
-          <td>
-              <#if sessionAttributes.userLogin?has_content && 
sessionAttributes.userLogin.userLoginId != "anonymous">
-              &nbsp;&nbsp;
-              <a href="<@ofbizUrl>createCustRequestFromCart</@ofbizUrl>" 
class="button">${uiLabelMap.OrderCreateCustRequestFromCart}</a>&nbsp;&nbsp;
-              &nbsp;&nbsp;
-              <a href="<@ofbizUrl>createQuoteFromCart</@ofbizUrl>" 
class="button">${uiLabelMap.OrderCreateQuoteFromCart}</a>&nbsp;&nbsp;
-              <#else>
-               ${uiLabelMap.OrderYouMust} <a 
href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" 
class="button">${uiLabelMap.CommonBeLogged}</a>
-                ${uiLabelMap.EcommerceToOrderCreateCustRequestFromCart}.&nbsp;
-              </#if>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <input type="checkbox" 
onclick="javascript:document.cartform.submit()" name="alwaysShowcart" <#if 
shoppingCart.viewCartOnAdd()>checked="checked"</#if>/>${uiLabelMap.EcommerceAlwaysViewCartAfterAddingAnItem}.
-          </td>
-        </tr>
-      </table>
-      </fieldset>
-    </form>
-  <#else>
-    <h2>${uiLabelMap.EcommerceYourShoppingCartEmpty}.</h2>
-  </#if>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <#if sessionAttributes.userLogin?has_content && 
sessionAttributes.userLogin.userLoginId != "anonymous">
+                  &nbsp;&nbsp;
+                  <a href="<@ofbizUrl>createCustRequestFromCart</@ofbizUrl>" 
class="button">
+                    ${uiLabelMap.OrderCreateCustRequestFromCart}
+                  </a>&nbsp;&nbsp;&nbsp;&nbsp;
+                  <a href="<@ofbizUrl>createQuoteFromCart</@ofbizUrl>" 
class="button">
+                    ${uiLabelMap.OrderCreateQuoteFromCart}</a>&nbsp;&nbsp;
+                <#else>
+                  ${uiLabelMap.OrderYouMust}
+                  <a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" 
class="button">
+                    ${uiLabelMap.CommonBeLogged}
+                  </a>
+                  
${uiLabelMap.EcommerceToOrderCreateCustRequestFromCart}.&nbsp;
+                </#if>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <input type="checkbox" 
onclick="javascript:document.cartform.submit()"
+                    name="alwaysShowcart" <#if 
shoppingCart.viewCartOnAdd()>checked="checked"</#if>/>
+                ${uiLabelMap.EcommerceAlwaysViewCartAfterAddingAnItem}.
+              </td>
+            </tr>
+          </table>
+        </fieldset>
+      </form>
+    <#else>
+      <h2>${uiLabelMap.EcommerceYourShoppingCartEmpty}.</h2>
+    </#if>
 <#-- Copy link bar to bottom to include a link bar at the bottom too -->
     </div>
 </div>
 
 <div>
+  <div>
+    <h2>${uiLabelMap.ProductPromoCodes}</h2>
+  </div>
+  <div>
     <div>
-        <h2>${uiLabelMap.ProductPromoCodes}</h2>
-    </div>
-    <div>
-        <div>
-            <form method="post" action="<@ofbizUrl>addpromocode<#if 
requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"
 name="addpromocodeform">
-                <fieldset>
-                <input type="text" class="inputBox" size="15" 
name="productPromoCodeId" value="" />
-                <input type="submit" class="smallSubmit" 
value="${uiLabelMap.OrderAddCode}" />
-                <#assign productPromoCodeIds = 
(shoppingCart.getProductPromoCodesEntered())! />
-                <#if productPromoCodeIds?has_content>
-                    ${uiLabelMap.ProductPromoCodesEntered}
-                    <ul>
-                    <#list productPromoCodeIds as productPromoCodeId>
-                        <li>${productPromoCodeId}</li>
-                    </#list>
-                    </ul>
-                </#if>
-                </fieldset>
-            </form>
-        </div>
+      <form method="post"
+          action="<@ofbizUrl>addpromocode<#if 
requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"
 name="addpromocodeform">
+        <fieldset>
+          <input type="text" class="inputBox" size="15" 
name="productPromoCodeId" value="" />
+          <input type="submit" class="smallSubmit" 
value="${uiLabelMap.OrderAddCode}" />
+          <#assign productPromoCodeIds = 
(shoppingCart.getProductPromoCodesEntered())! />
+          <#if productPromoCodeIds?has_content>
+            ${uiLabelMap.ProductPromoCodesEntered}
+            <ul>
+              <#list productPromoCodeIds as productPromoCodeId>
+                <li>${productPromoCodeId}</li>
+              </#list>
+            </ul>
+          </#if>
+        </fieldset>
+      </form>
     </div>
+  </div>
 </div>
 
 <#if showPromoText?? && showPromoText>
-<div>
+  <div>
     <div>
-        <h2>${uiLabelMap.OrderSpecialOffers}</h2>
+      <h2>${uiLabelMap.OrderSpecialOffers}</h2>
     </div>
     <div>
-        <#-- show promotions text -->
-        <ul>
+      <#-- show promotions text -->
+      <ul>
         <#list productPromos as productPromo>
-            <li><a 
href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>"
 
class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText!)}</li>
+          <li>
+            <a 
href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>"
+                class="linktext">[${uiLabelMap.CommonDetails}]</a>
+              ${StringUtil.wrapString(productPromo.promoText!)}
+          </li>
         </#list>
-        </ul>
-        <div><a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" 
class="button">${uiLabelMap.OrderViewAllPromotions}</a></div>
+      </ul>
+      <div>
+        <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" 
class="button">${uiLabelMap.OrderViewAllPromotions}</a>
+      </div>
     </div>
-</div>
+  </div>
 </#if>
 
 <#if associatedProducts?has_content>
-<div>
+  <div>
     <div>
-        <h2>${uiLabelMap.EcommerceYouMightAlsoIntrested}:</h2>
+      <h2>${uiLabelMap.EcommerceYouMightAlsoIntrested}:</h2>
     </div>
     <div>
-        <#-- random complementary products -->
-        <#list associatedProducts as assocProduct>
-            <div>
-                ${setRequestAttribute("optProduct", assocProduct)}
-                ${setRequestAttribute("listIndex", assocProduct_index)}
-                
${screens.render("component://ecommerce/widget/CatalogScreens.xml#productsummary")}
-            </div>
-        </#list>
+      <#-- random complementary products -->
+      <#list associatedProducts as assocProduct>
+        <div>
+          ${setRequestAttribute("optProduct", assocProduct)}
+          ${setRequestAttribute("listIndex", assocProduct_index)}
+          
${screens.render("component://ecommerce/widget/CatalogScreens.xml#productsummary")}
+        </div>
+      </#list>
     </div>
-</div>
+  </div>
 </#if>
 
 <#if (shoppingCartSize?default(0) > 0)>
   
${screens.render("component://ecommerce/widget/CartScreens.xml#promoUseDetailsInline")}
 </#if>
 
-<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()!} 
locale=${shoppingCart.getLocale()!} currencyUom=${shoppingCart.getCurrency()!} 
userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))!} 
autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))!} -->
+<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()!}
+       locale=${shoppingCart.getLocale()!} 
currencyUom=${shoppingCart.getCurrency()!}
+       userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))!}
+       
autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))!} -->

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/UpdateCart.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/UpdateCart.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/cart/UpdateCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/UpdateCart.ftl Sat Sep 
17 07:17:15 2016
@@ -35,27 +35,40 @@ under the License.
       <tfoot>
         <tr id="completedCartSubtotalRow">
           <th id="subTotal" scope="row" 
colspan="5">${uiLabelMap.CommonSubtotal}</th>
-          <td headers="subTotal" id="completedCartSubTotal"><@ofbizCurrency 
amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /></td>
+          <td headers="subTotal" id="completedCartSubTotal">
+            <@ofbizCurrency amount=shoppingCart.getSubTotal() 
isoCode=shoppingCart.getCurrency() />
+          </td>
         </tr>
         <#assign orderAdjustmentsTotal = 0 />
         <#list shoppingCart.getAdjustments() as cartAdjustment>
-          <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + 
Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment,
 shoppingCart.getSubTotal()) />
+          <#assign orderAdjustmentsTotal = orderAdjustmentsTotal +
+              Static["org.apache.ofbiz.order.order.OrderReadHelper"]
+              .calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) 
/>
         </#list>
         <tr id="completedCartDiscountRow">
           <th id="productDiscount" scope="row" 
colspan="5">${uiLabelMap.ProductDiscount}</th>
-          <td headers="productDiscount" id="completedCartDiscount"><input 
type="hidden" value="${orderAdjustmentsTotal}" 
id="initializedCompletedCartDiscount" /><@ofbizCurrency 
amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() /></td>
+          <td headers="productDiscount" id="completedCartDiscount">
+            <input type="hidden" value="${orderAdjustmentsTotal}" 
id="initializedCompletedCartDiscount" />
+            <@ofbizCurrency amount=orderAdjustmentsTotal 
isoCode=shoppingCart.getCurrency() />
+          </td>
         </tr>
         <tr>
           <th id="shippingAndHandling" scope="row" 
colspan="5">${uiLabelMap.OrderShippingAndHandling}</th>
-          <td headers="shippingAndHandling" 
id="completedCartTotalShipping"><@ofbizCurrency 
amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() 
/></td>
+          <td headers="shippingAndHandling" id="completedCartTotalShipping">
+            <@ofbizCurrency amount=shoppingCart.getTotalShipping() 
isoCode=shoppingCart.getCurrency() />
+          </td>
         </tr>
         <tr>
           <th id="salesTax" scope="row" 
colspan="5">${uiLabelMap.OrderSalesTax}</th>
-          <td headers="salesTax" 
id="completedCartTotalSalesTax"><@ofbizCurrency 
amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() 
/></td>
+          <td headers="salesTax" id="completedCartTotalSalesTax">
+            <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() 
isoCode=shoppingCart.getCurrency() />
+          </td>
         </tr>
         <tr>
           <th id="grandTotal" scope="row" 
colspan="5">${uiLabelMap.OrderGrandTotal}</th>
-          <td headers="grandTotal" 
id="completedCartDisplayGrandTotal"><@ofbizCurrency 
amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() 
/></td>
+          <td headers="grandTotal" id="completedCartDisplayGrandTotal">
+            <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() 
isoCode=shoppingCart.getCurrency() />
+          </td>
         </tr>
       </tfoot>
       <tbody>
@@ -66,16 +79,29 @@ under the License.
             <#else>
               <#assign parentProductId = cartLine.getProductId() />
             </#if>
-            <#assign smallImageUrl = 
Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
 "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
+            <#assign smallImageUrl = 
Static["org.apache.ofbiz.product.product.ProductContentWrapper"]
+                .getProductContentAsText(cartLine.getProduct(), 
"SMALL_IMAGE_URL", locale, dispatcher, "url")! />
             <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" 
/></#if>
           </#if>
           <tr id="cartItemDisplayRow_${cartLine_index}">
-            <td headers="orderItem"><img 
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
 alt = "Product Image" /></td>
+            <td headers="orderItem">
+              <img 
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
+                  alt = "Product Image" /></td>
             <td headers="description">${cartLine.getName()!}</td>
             <td headers="unitPrice">${cartLine.getDisplayPrice()}</td>
-            <td headers="quantity"><span 
id="completedCartItemQty_${cartLine_index}">${cartLine.getQuantity()?string.number}</span></td>
-            <td headers="adjustment"><span 
id="completedCartItemAdjustment_${cartLine_index}"><@ofbizCurrency 
amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() 
/></span></td>
-            <td headers="itemTotal" align="right"><span 
id="completedCartItemSubTotal_${cartLine_index}"><@ofbizCurrency 
amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() 
/></span></td>
+            <td headers="quantity">
+              <span 
id="completedCartItemQty_${cartLine_index}">${cartLine.getQuantity()?string.number}</span>
+            </td>
+            <td headers="adjustment">
+              <span id="completedCartItemAdjustment_${cartLine_index}">
+                <@ofbizCurrency amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency() />
+              </span>
+            </td>
+            <td headers="itemTotal" align="right">
+              <span id="completedCartItemSubTotal_${cartLine_index}">
+                <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() 
isoCode=shoppingCart.getCurrency() />
+              </span>
+            </td>
           </tr>
         </#list>
       </tbody>
@@ -101,29 +127,39 @@ under the License.
           <tfoot>
             <tr>
               <th scope="row" colspan="6">${uiLabelMap.CommonSubtotal}</th>
-              <td id="cartSubTotal"><@ofbizCurrency 
amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /></td>
+              <td id="cartSubTotal">
+                <@ofbizCurrency amount=shoppingCart.getSubTotal() 
isoCode=shoppingCart.getCurrency() />
+              </td>
             </tr>
             <tr>
               <th scope="row" colspan="6">${uiLabelMap.ProductDiscount}</th>
               <td id="cartDiscountValue">
                 <#assign orderAdjustmentsTotal = 0  />
                 <#list shoppingCart.getAdjustments() as cartAdjustment>
-                  <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + 
Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment,
 shoppingCart.getSubTotal()) />
+                  <#assign orderAdjustmentsTotal = orderAdjustmentsTotal +
+                      Static["org.apache.ofbiz.order.order.OrderReadHelper"]
+                      .calcOrderAdjustment(cartAdjustment, 
shoppingCart.getSubTotal()) />
                 </#list>
                 <@ofbizCurrency amount=orderAdjustmentsTotal 
isoCode=shoppingCart.getCurrency() />
               </td>
             </tr>
             <tr>
               <th scope="row" 
colspan="6">${uiLabelMap.OrderShippingAndHandling}</th>
-              <td id="cartTotalShipping"><@ofbizCurrency 
amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() 
/></td>
+              <td id="cartTotalShipping">
+                <@ofbizCurrency amount=shoppingCart.getTotalShipping() 
isoCode=shoppingCart.getCurrency() />
+              </td>
             </tr>
             <tr>
               <th scope="row" colspan="6">${uiLabelMap.OrderSalesTax}</th>
-              <td id="cartTotalSalesTax"><@ofbizCurrency 
amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() 
/></td>
+              <td id="cartTotalSalesTax">
+                <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() 
isoCode=shoppingCart.getCurrency() />
+              </td>
             </tr>
             <tr>
               <th scope="row" colspan="6">${uiLabelMap.OrderGrandTotal}</th>
-              <td id="cartDisplayGrandTotal"><@ofbizCurrency 
amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() 
/></td>
+              <td id="cartDisplayGrandTotal">
+                <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() 
isoCode=shoppingCart.getCurrency() />
+              </td>
             </tr>
           </tfoot>
           <tbody id="updateBody">
@@ -136,33 +172,56 @@ under the License.
                     <#else>
                       <#assign parentProductId = cartLine.getProductId() />
                     </#if>
-                    <#assign smallImageUrl = 
Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
 "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
+                    <#assign smallImageUrl = 
Static["org.apache.ofbiz.product.product.ProductContentWrapper"]
+                        .getProductContentAsText(cartLine.getProduct(), 
"SMALL_IMAGE_URL",
+                        locale, dispatcher, "url")! />
                     <#if !smallImageUrl?string?has_content><#assign 
smallImageUrl = "" /></#if>
                     <#if smallImageUrl?string?has_content>
-                      <img 
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
 alt="Product Image" />
+                      <img 
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
+                          alt="Product Image" />
                     </#if>
                   </#if>
                 </td>
                 <td headers="editDescription">${cartLine.getName()!}</td>
-                <td headers="editUnitPrice" 
id="itemUnitPrice_${cartLine_index}"><@ofbizCurrency 
amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency() /></td>
+                <td headers="editUnitPrice" 
id="itemUnitPrice_${cartLine_index}">
+                  <@ofbizCurrency amount=cartLine.getDisplayPrice() 
isoCode=shoppingCart.getCurrency() />
+                </td>
                 <td headers="editQuantity">
                   <#if cartLine.getIsPromo()>
                     ${cartLine.getQuantity()?string.number}
                   <#else>
-                    <input type="hidden" name="cartLineProductId" 
id="cartLineProductId_${cartLine_index}" value="${cartLine.getProductId()}" />
-                    <input type="text" name="update${cartLine_index}" 
id="qty_${cartLine_index}" value="${cartLine.getQuantity()?string.number}" 
class="required validate-number" />
-                    <span id="advice-required-qty_${cartLine_index}" 
style="display:none;" class="errorMessage"> 
(${uiLabelMap.CommonRequired})</span>
-                    <span id="advice-validate-number-qty_${cartLine_index}" 
style="display:none;" class="errorMessage"> 
(${uiLabelMap.CommonPleaseEnterValidNumberInThisField}) </span>
+                    <input type="hidden" name="cartLineProductId" 
id="cartLineProductId_${cartLine_index}"
+                        value="${cartLine.getProductId()}" />
+                    <input type="text" name="update${cartLine_index}" 
id="qty_${cartLine_index}"
+                        value="${cartLine.getQuantity()?string.number}" 
class="required validate-number" />
+                    <span id="advice-required-qty_${cartLine_index}" 
style="display:none;" class="errorMessage">
+                      (${uiLabelMap.CommonRequired})
+                    </span>
+                    <span id="advice-validate-number-qty_${cartLine_index}" 
style="display:none;" class="errorMessage">
+                      (${uiLabelMap.CommonPleaseEnterValidNumberInThisField})
+                    </span>
                   </#if>
                 </td>
                 <#if !cartLine.getIsPromo()>
-                  <td headers="editAdjustment" 
id="addPromoCode_${cartLine_index}"><@ofbizCurrency 
amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></td>
+                  <td headers="editAdjustment" 
id="addPromoCode_${cartLine_index}">
+                    <@ofbizCurrency amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency() />
+                  </td>
                 <#else>
-                  <td headers="editAdjustment"><@ofbizCurrency 
amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></td>
+                  <td headers="editAdjustment">
+                    <@ofbizCurrency amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency() />
+                  </td>
                 </#if>
-                <td headers="editItemTotal" 
id="displayItem_${cartLine_index}"><@ofbizCurrency 
amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() 
/></td>
+                <td headers="editItemTotal" id="displayItem_${cartLine_index}">
+                  <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() 
isoCode=shoppingCart.getCurrency() />
+                </td>
                 <#if !cartLine.getIsPromo()>
-                  <td><a id="removeItemLink_${cartLine_index}" 
href="javascript:void(0);"><img id="remove_${cartLine_index}" 
src="<@ofbizContentUrl>/ecommerce/images/remove.png</@ofbizContentUrl>" 
alt="Remove Item Image" /></a></td>
+                  <td>
+                    <a id="removeItemLink_${cartLine_index}" 
href="javascript:void(0);">
+                      <img id="remove_${cartLine_index}"
+                          
src="<@ofbizContentUrl>/ecommerce/images/remove.png</@ofbizContentUrl>"
+                          alt="Remove Item Image" />
+                    </a>
+                  </td>
                 </#if>
               </tr>
             </#list>
@@ -176,9 +235,13 @@ under the License.
         </div>
       </fieldset>
       <fieldset>
-        <a href="javascript:void(0);" class="button" id="updateShoppingCart" 
>${uiLabelMap.EcommerceContinueToStep} 2</a>
-        <a style="display: none" class="button" href="javascript:void(0);" 
id="processingShipping">${uiLabelMap.EcommercePleaseWait}....</a>
+        <a href="javascript:void(0);" class="button" id="updateShoppingCart" >
+          ${uiLabelMap.EcommerceContinueToStep} 2
+        </a>
+        <a style="display: none" class="button" href="javascript:void(0);" 
id="processingShipping">
+          ${uiLabelMap.EcommercePleaseWait}....
+        </a>
       </fieldset>
     </form>
   </div>
-</#if>
\ No newline at end of file
+</#if>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl 
Sat Sep 17 07:17:15 2016
@@ -16,44 +16,57 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign searchOptionsHistoryList = 
Static["org.apache.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
-<#assign currentCatalogId = 
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
+<#assign searchOptionsHistoryList =
+    
Static["org.apache.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
+<#assign currentCatalogId =
+    
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
 <h2>${uiLabelMap.ProductAdvancedSearchInCategory}</h2>
 <form id="advtokeywordsearchform" method="post" 
action="<@ofbizUrl>keywordsearch</@ofbizUrl>">
   <fieldset class="inline">
-    <input type="hidden" name="VIEW_SIZE" value="10" />
-    <input type="hidden" name="PAGING" value="Y" />
-    <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" 
/>
-    <#if searchCategory?has_content>
-      <input type="hidden" name="SEARCH_CATEGORY_ID" 
value="${searchCategoryId?if_exists}" />
-      <label>${uiLabelMap.ProductCategory}</label>
-      <p>${(searchCategory.description)?if_exists}</p>
-      <div>
-        <label>${uiLabelMap.ProductIncludeSubCategories}</label>
-        <label for="SEARCH_SUB_CATEGORIES_YES">${uiLabelMap.CommonYes}</label> 
<input type="radio" name="SEARCH_SUB_CATEGORIES" id="SEARCH_SUB_CATEGORIES_YES" 
value="Y" checked="checked" />
-        <label for="SEARCH_SUB_CATEGORIES_NO">${uiLabelMap.CommonNo}</label> 
<input type="radio" name="SEARCH_SUB_CATEGORIES" id="SEARCH_SUB_CATEGORIES_NO" 
value="N" />
-      </div>
-    </#if>
+    <input type="hidden" name="VIEW_SIZE" value="10"/>
+    <input type="hidden" name="PAGING" value="Y"/>
+    <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}"/>
+  <#if searchCategory?has_content>
+    <input type="hidden" name="SEARCH_CATEGORY_ID" 
value="${searchCategoryId?if_exists}"/>
+    <label>${uiLabelMap.ProductCategory}</label>
+    <p>${(searchCategory.description)?if_exists}</p>
+    <div>
+      <label>${uiLabelMap.ProductIncludeSubCategories}</label>
+      <label for="SEARCH_SUB_CATEGORIES_YES">${uiLabelMap.CommonYes}</label>
+      <input type="radio" name="SEARCH_SUB_CATEGORIES" 
id="SEARCH_SUB_CATEGORIES_YES" value="Y"
+          checked="checked"/>
+      <label for="SEARCH_SUB_CATEGORIES_NO">${uiLabelMap.CommonNo}</label>
+      <input type="radio" name="SEARCH_SUB_CATEGORIES" 
id="SEARCH_SUB_CATEGORIES_NO" value="N"/>
+    </div>
+  </#if>
     <div>
       <label for="SEARCH_STRING">${uiLabelMap.ProductKeywords}</label>
-      <input type="text" name="SEARCH_STRING" id="SEARCH_STRING"  size="20" 
value="${requestParameters.SEARCH_STRING?if_exists}" />
-      <label for="SEARCH_OPERATOR_ANY">${uiLabelMap.CommonAny}</label> <input 
type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ANY" value="OR" <#if 
searchOperator == "OR">checked="checked"</#if> />
-      <label for="SEARCH_OPERATOR_ALL">${uiLabelMap.CommonAll}</label> <input 
type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ALL" value="AND" <#if 
searchOperator == "AND">checked="checked"</#if> />
-    </div>
-    <#list productFeatureTypeIdsOrdered as productFeatureTypeId>
-      <#assign findPftMap = 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", 
productFeatureTypeId)>
-      <#assign productFeatureType = delegator.findOne("ProductFeatureType", 
findPftMap, true)>
-      <#assign productFeatures = 
productFeaturesByTypeMap[productFeatureTypeId]>
-      <div>
-        <label 
for="pft_${productFeatureTypeId}">${(productFeatureType.get("description",locale))?if_exists}</label>
-        <select name="pft_${productFeatureTypeId}" 
id="pft_${productFeatureTypeId}">
-          <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
-          <#list productFeatures as productFeature>
-            <option 
value="${productFeature.productFeatureId}">${productFeature.description?default(productFeature.productFeatureId)}</option>
-          </#list>
-        </select>
-      </div>
-    </#list>
+      <input type="text" name="SEARCH_STRING" id="SEARCH_STRING" size="20"
+          value="${requestParameters.SEARCH_STRING?if_exists}"/>
+      <label for="SEARCH_OPERATOR_ANY">${uiLabelMap.CommonAny}</label>
+      <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ANY"
+          value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>
+      <label for="SEARCH_OPERATOR_ALL">${uiLabelMap.CommonAll}</label>
+      <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ALL"
+          value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>
+    </div>
+  <#list productFeatureTypeIdsOrdered as productFeatureTypeId>
+    <#assign findPftMap =
+        
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", 
productFeatureTypeId)>
+    <#assign productFeatureType = delegator.findOne("ProductFeatureType", 
findPftMap, true)>
+    <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
+    <div>
+      <label 
for="pft_${productFeatureTypeId}">${(productFeatureType.get("description",locale))?if_exists}</label>
+      <select name="pft_${productFeatureTypeId}" 
id="pft_${productFeatureTypeId}">
+        <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
+        <#list productFeatures as productFeature>
+          <option value="${productFeature.productFeatureId}">
+            
${productFeature.description?default(productFeature.productFeatureId)}
+          </option>
+        </#list>
+      </select>
+    </div>
+  </#list>
     <div>
       <label for="sortOrder">${uiLabelMap.ProductSortedBy}</label>
       <select name="sortOrder" id="sortOrder">
@@ -64,52 +77,61 @@ under the License.
         <option 
value="SortProductField:averageCustomerRating">${uiLabelMap.ProductCustomerRating}</option>
         <option 
value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option>
         <option 
value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option>
-        <#if productFeatureTypes?? && productFeatureTypes?has_content>
-          <#list productFeatureTypes as productFeatureType>
-            <option 
value="SortProductFeature:${productFeatureType.productFeatureTypeId}">${productFeatureType.description?default(productFeatureType.productFeatureTypeId)}</option>
-          </#list>
-        </#if>
+      <#if productFeatureTypes?? && productFeatureTypes?has_content>
+        <#list productFeatureTypes as productFeatureType>
+          <option 
value="SortProductFeature:${productFeatureType.productFeatureTypeId}">
+            
${productFeatureType.description?default(productFeatureType.productFeatureTypeId)}
+          </option>
+        </#list>
+      </#if>
       </select>
-      <label for="sortAscendingHigh">${uiLabelMap.EcommerceLowToHigh}</label> 
<input type="radio" name="sortAscending" id="sortAscendingHigh" value="Y" 
checked="checked" />
-      <label for="sortAscendingLow">${uiLabelMap.EcommerceHighToLow}</label> 
<input type="radio" name="sortAscending" id="sortAscendingLow" value="N" />
+      <label for="sortAscendingHigh">${uiLabelMap.EcommerceLowToHigh}</label>
+      <input type="radio" name="sortAscending" id="sortAscendingHigh" 
value="Y" checked="checked"/>
+      <label for="sortAscendingLow">${uiLabelMap.EcommerceHighToLow}</label>
+      <input type="radio" name="sortAscending" id="sortAscendingLow" 
value="N"/>
     </div>
-    <#if searchConstraintStrings?has_content>
+  <#if searchConstraintStrings?has_content>
+    <div>
+      <label>${uiLabelMap.ProductLastSearch}</label>
+      <#list searchConstraintStrings as searchConstraintString>
+        <p>${searchConstraintString}</p>
+      </#list>
+      <p>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</p>
       <div>
-        <label>${uiLabelMap.ProductLastSearch}</label>
-          <#list searchConstraintStrings as searchConstraintString>
-            <p>${searchConstraintString}</p>
-          </#list>
-          <p>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</p>
-          <div>
-            <label 
for="clearSearchNew">${uiLabelMap.ProductNewSearch}</label><input type="radio" 
name="clearSearch" id="clearSearchNew" value="Y" checked="checked" />
-            <label 
for="clearSearchRefine">${uiLabelMap.ProductRefineSearch}</label><input 
type="radio" name="clearSearch" id="clearSearchRefine" value="N" />
-          </div>
+        <label for="clearSearchNew">${uiLabelMap.ProductNewSearch}</label>
+        <input type="radio" name="clearSearch" id="clearSearchNew" value="Y" 
checked="checked"/>
+        <label 
for="clearSearchRefine">${uiLabelMap.ProductRefineSearch}</label>
+        <input type="radio" name="clearSearch" id="clearSearchRefine" 
value="N"/>
       </div>
-    </#if>
+    </div>
+  </#if>
+    <div>
+      <input type="submit" name="submit" class="button" 
value="${uiLabelMap.CommonFind}"/>
+    </div>
+  <#if searchOptionsHistoryList?has_content>
+    <h2>${uiLabelMap.OrderLastSearches}...</h2>
     <div>
-      <input type="submit" name="submit" class="button" 
value="${uiLabelMap.CommonFind}" />
+      <a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" 
class="button">
+        ${uiLabelMap.OrderClearSearchHistory}
+      </a>
+      <h3>${uiLabelMap.OrderClearSearchHistoryNote}</h3>
     </div>
-    <#if searchOptionsHistoryList?has_content>
-      <h2>${uiLabelMap.OrderLastSearches}...</h2>
+    <#list searchOptionsHistoryList as searchOptions>
+    <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
       <div>
-        <a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" 
class="button">${uiLabelMap.OrderClearSearchHistory}</a>
-        <h3>${uiLabelMap.OrderClearSearchHistoryNote}</h3>
+        <p>${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1}</p>
+        <a 
href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&amp;clearSearch=N</@ofbizUrl>"
+           class="button">${uiLabelMap.CommonSearch}</a>
+        <a 
href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>"
+           class="button">${uiLabelMap.CommonRefine}</a>
       </div>
-      <#list searchOptionsHistoryList as searchOptions>
-      <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
-        <div>
-          <p>${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1}</p>
-          <a 
href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&amp;clearSearch=N</@ofbizUrl>"
 class="button">${uiLabelMap.CommonSearch}</a>
-          <a 
href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>"
 class="button">${uiLabelMap.CommonRefine}</a>
-        </div>
-        <#assign constraintStrings = 
searchOptions.searchGetConstraintStrings(false, delegator, locale)>
-        <#list constraintStrings as constraintString>
-          <p> - ${constraintString}</p>
-        </#list>
-        <#if searchOptions_has_next>
-          
-        </#if>
+      <#assign constraintStrings = 
searchOptions.searchGetConstraintStrings(false, delegator, locale)>
+      <#list constraintStrings as constraintString>
+        <p> - ${constraintString}</p>
       </#list>
-    </#if>
+      <#if searchOptions_has_next>
+      </#if>
+    </#list>
+  </#if>
   </fieldset>
 </form>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl 
Sat Sep 17 07:17:15 2016
@@ -18,53 +18,45 @@ under the License.
 -->
 
 <div class="breadcrumbs">
-<#assign isDefaultTheme = 
!layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")>        
-<#if isDefaultTheme>
-  <a href="<@ofbizUrl>main</@ofbizUrl>" 
class="linktext">${uiLabelMap.CommonMain}</a> &gt;
-<#else>
+  <#assign isDefaultTheme = 
!layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")>
+  <#if isDefaultTheme>
+    <a href="<@ofbizUrl>main</@ofbizUrl>" 
class="linktext">${uiLabelMap.CommonMain}</a> &gt;
+  <#else>
   <ul>
     <li>
       <a href="<@ofbizUrl>main</@ofbizUrl>" 
class="linktext">${uiLabelMap.CommonMain}</a>
     </li>
-</#if>    
-    <#-- Show the category branch -->
-    <#if productCategoryTrail??>
-        <#list productCategoryTrail as trail>
-          <#if !isDefaultTheme>                 
-            <li>
-              <a href="<@ofbizCatalogAltUrl 
productCategoryId=trail.productCategoryId 
previousCategoryId=trail.parentCategory!""/>" class="linktext">
-                <#if trail.title??>
-                  ${trail.title}
-                <#else>
-                  ${trail.productCategoryId}
-                </#if>
-              </a>
-            </li>
+  </#if>
+  <#-- Show the category branch -->
+  <#if productCategoryTrail??>
+    <#list productCategoryTrail as trail>
+      <#if !isDefaultTheme>
+        <li>
+          <a href="<@ofbizCatalogAltUrl 
productCategoryId=trail.productCategoryId 
previousCategoryId=trail.parentCategory!""/>"
+              class="linktext">
+            <#if trail.title??>
+              ${trail.title}
+            <#else>
+              ${trail.productCategoryId}
+            </#if>
+          </a>
+        </li>
+      <#else>
+        <a href="<@ofbizCatalogAltUrl 
productCategoryId=trail.productCategoryId 
previousCategoryId=trail.parentCategory!""/>"
+            class="linktext">
+          <#if trail.title??>
+            ${trail.title} >
           <#else>
-            <a href="<@ofbizCatalogAltUrl 
productCategoryId=trail.productCategoryId 
previousCategoryId=trail.parentCategory!""/>" class="linktext">
-              <#if trail.title??>
-                ${trail.title} >
-              <#else>
-                ${trail.productCategoryId} >
-              </#if>
-            </a>
-          </#if>
-        </#list>
-    </#if>
-    <#if !isDefaultTheme>                 
-      <li>
-        <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId 
previousCategoryId=parameters.parentCategoryStr/>" class="linktext">
-          <#if currentCategoryName??>
-            ${currentCategoryName}
-          <#elseif currentCategoryDescription??>
-            ${currentCategoryDescription}
-          <#else>
-            ${currentCategoryId}
+            ${trail.productCategoryId} >
           </#if>
         </a>
-      </li>
-    <#else>
-      <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId 
previousCategoryId=parameters.parentCategoryStr/>" class="linktext">
+      </#if>
+    </#list>
+  </#if>
+  <#if !isDefaultTheme>
+    <li>
+      <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId 
previousCategoryId=parameters.parentCategoryStr/>"
+          class="linktext">
         <#if currentCategoryName??>
           ${currentCategoryName}
         <#elseif currentCategoryDescription??>
@@ -73,8 +65,20 @@ under the License.
           ${currentCategoryId}
         </#if>
       </a>
-    </#if>
+    </li>
+  <#else>
+    <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId 
previousCategoryId=parameters.parentCategoryStr/>"
+        class="linktext">
+      <#if currentCategoryName??>
+        ${currentCategoryName}
+      <#elseif currentCategoryDescription??>
+        ${currentCategoryDescription}
+      <#else>
+        ${currentCategoryId}
+      </#if>
+    </a>
+  </#if>
   </ul>
 </div>
-<br />
+<br/>
 


Reply via email to