svn commit: r1763013 - in /ofbiz: branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/ branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/order/ branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/order/ trunk...

Author: jleroux
Date: Sat Oct  1 13:54:39 2016
New Revision: 1763013

URL: http://svn.apache.org/viewvc?rev=1763013&view=rev
Log:
Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

Found an issue due to changes at r1761431. We should only show the
addCommonToCartForm when in status mode, ie when maySelectItems="y"

Modified:
    ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
    ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
    ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl

Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1763013&r1=1763012&r2=1763013&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Sat Oct  1 13:54:39 2016
@@ -21,9 +21,11 @@ under the License.
 <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
 <#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
 <div class="screenlet">
-  <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
-    <input type="hidden" name="add_all" value="false" />
-    <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    <#if maySelectItems?default("N") == "Y" >
+      <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
+        <input type="hidden" name="add_all" value="false" />    
+            <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    </#if>
   <h3>
     <#assign numColumns = 8>
     ${uiLabelMap.OrderOrderItems}
@@ -301,5 +303,7 @@ under the License.
     <tr><td colspan="${numColumns}"></td></tr>
     </tbody>
   </table>
-  </form>
-</div>
+    <#if maySelectItems?default("N") == "Y" >
+        </form>
+     </#if>
+</div>
\ No newline at end of file

Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1763013&r1=1763012&r2=1763013&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Sat Oct  1 13:54:39 2016
@@ -21,9 +21,11 @@ under the License.
 <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
 <#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
 <div class="screenlet">
-  <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
-    <input type="hidden" name="add_all" value="false" />
-    <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    <#if maySelectItems?default("N") == "Y" >
+      <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
+        <input type="hidden" name="add_all" value="false" />    
+            <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    </#if>
   <h3>
     <#assign numColumns = 8>
     ${uiLabelMap.OrderOrderItems}
@@ -301,5 +303,7 @@ under the License.
     <tr><td colspan="${numColumns}"></td></tr>
     </tbody>
   </table>
-  </form>
-</div>
+    <#if maySelectItems?default("N") == "Y" >
+        </form>
+     </#if>
+</div>
\ No newline at end of file

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1763013&r1=1763012&r2=1763013&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Sat Oct  1 13:54:39 2016
@@ -21,9 +21,11 @@ under the License.
 <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
 <#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
 <div class="screenlet">
-  <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
-    <input type="hidden" name="add_all" value="false" />
-    <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    <#if maySelectItems?default("N") == "Y" >
+      <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
+        <input type="hidden" name="add_all" value="false" />    
+            <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    </#if>
   <h3>
     <#assign numColumns = 8>
     ${uiLabelMap.OrderOrderItems}
@@ -301,5 +303,7 @@ under the License.
     <tr><td colspan="${numColumns}"></td></tr>
     </tbody>
   </table>
-  </form>
-</div>
+    <#if maySelectItems?default("N") == "Y" >
+        </form>
+     </#if>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl?rev=1763013&r1=1763012&r2=1763013&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl Sat Oct  1 13:54:39 2016
@@ -21,9 +21,11 @@ under the License.
 <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
 <#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
 <div class="screenlet">
-  <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
-    <input type="hidden" name="add_all" value="false" />
-    <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    <#if maySelectItems?default("N") == "Y" >
+      <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
+        <input type="hidden" name="add_all" value="false" />    
+            <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
+    </#if>
   <h3>
     <#assign numColumns = 8>
     ${uiLabelMap.OrderOrderItems}
@@ -340,5 +342,7 @@ under the License.
       </tr>
     </tbody>
   </table>
-  </form>
-</div>
+    <#if maySelectItems?default("N") == "Y" >
+        </form>
+     </#if>
+</div>
\ No newline at end of file